Imported from /home/lorry/working-area/delta_nano-tarball/nano-2.4.0.tar.gz.HEADnano-2.4.0master

178 files changed, 58820 insertions, 39384 deletions

diff --git a/AUTHORS b/AUTHORS
index 1a6a0a3..59ea86b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,10 +1,10 @@
-$Id: AUTHORS 4210 2007-12-20 18:41:04Z dolorous $
+$Id: AUTHORS 4586 2014-02-07 14:57:49Z astyanax $
 This file lists people who have made significant contribution to the
 nano editor.  Please see the ChangeLog for specific changes by author.
 -------------------------------------------------------------------------
 
 Chris Allegretta <chrisa@asty.org>
-	* Original program author, former stable series maintainer.
+	* Original program author, former and current maintainer.
 
 David Lawrence Ramsey <pooka109@gmail.com>
 	* Former stable series maintainer.  Multiple buffer support,
diff --git a/BUGS b/BUGS
deleted file mode 100644
index 509fa84..0000000
--- a/BUGS
+++ /dev/null
@@ -1,161 +0,0 @@
-** Open BUGS **
-
-** Fixed BUGS **
-- Marked cutting sometimes leaves a newline in the file unintelligently,
-  such as when all of a line is selected but the mark doesn't proceed to
-  the new line. (8) [FIXED/IRRELEVANT]
-- Certains are not lined up properly when there are tabs in them at 
-  certain col values. (9) [FIXED]
-- edit_refresh() and update_line() do not handle selecting text when the
-  cursor is beyond COLS (10) [FIXED]
-- No way to do a replace with the empty string (11) [FIXED, yay!]
-- Spelling support is not elegant like Pico's integration of the 'spell'
-  program.  nano only uses ispell (for now) (12) [FIXED]
-- Moving to the end of a line when close to a multiple of COLS and at
-  least COLS * 2 does not make the screen jump early like it would for
-  if we were around COLS (bugs in edit_refresh, update_line) (13)
-  [FIXED, mostly]
-- When at the very bottom of the edit window, do_wrap() goes berserk and
-  puts the cursor somewhere bad; subsequent keystrokes crash the program
-  (14) [FIXED, mostly]
-- Doing a replacement of a substring of the replace string (e.g.
-  replacing "ed" with "fred" causes an infinite loop). (15) [FIXED]
-- Cutting a file with marked text and both marker ends on the same line
-  causes a random segfault (16) [FIXED]
-- Cutting more than one line resets the KEEP_CUTBUFFER flag in 0.9.3.
-  Error is in bitwise assignment (nano.h). (17) [FIXED]
-- The wrapping code does not work right for lines like the following:
- *                                                                     *
-  Error is in do_wrap, must be rewritten. (18) [FIXED]
-- nano fails to follow symlinks, even though -l isn't being used (20).
-  [Bug in global flag init, FIXED]
-- When using --help or --version, the SIGINT character gets lost. (21)
-  [FIXED]
-- edit_refresh() and update_line() (and related functions) have 
-  trouble when a tab is the character that is the boundary at COLS (23)
-  [FIXED]
-- There is an off-by-one error in keeping track of totsize.  It is
-  caused by the fact that we count the newline at the end when we read
-  in a file but we do not, in fact, display this newline.  This should
-  go away implicitly when the "Magic Line" returns, but it is noted here
-  for documentation's sake. (24) [FIXED]
-- In replace with completely adjacent strings, every other search string
-  will be missed (try replace ':' in a string like ':::::::::') (28)
-  [FIXED]
-- If nano opens a read-only file with the --tempfile option, and a
-  change is made to the buffer, and a write is attempted, nano will not
-  give you a dialog about not being able to write the file, and it will
-  not let the user exit (29, discovered by Joshua Jensen) [FIXED]
-- Using nano -k, marked text is not cut properly. (31) [FIXED]
-- Invoking -t or -k has the effect of invoking both options. (32)
-  [FIXED]
-- totsize becomes incorrect after word-wrapping (25) [FIXED]
-- Wrapping a line with autoindent mode sometimes causes a segfault (19)
-  [FIXED]
-- When inserting files, the display sometimes fails to display properly
-  until a pageup/down occurs (22) [FIXED]
-- In search/replace code, there is too much refreshing in bottomwin (26)
-  [FIXED]
-- In replace, there is no way to accept the default replace string. (27)
-  [FIXED]
-- Using nano -t, user can not exit until a filename is given via ^O.
-  (30) [FIXED]
-- totsize problems still abound in do_justify (33) [FIXED]
-- Using -k, cut text is not pasted properly. (34) [FIXED].
-- Using -k, pasted text is not updated properly if it goes beyond
-  editbot. (35) [FIXED]
-- Doing a cut with -k can screw up the filestruct; fault is in cutting
-  code. (36) [FIXED]
-- Hitting enter on the magic line makes new lines, but they are not
-  written out to disk when saved..... (37). [FIXED]
-- Page up and page down do not work the same way as in 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 exists on one line multiple times will
-  fail after finding the last occurrence (discovered by Ken Tyler) (40).
-  [FIXED]
-- Meta-Z is currently broken to toggle suspend.  I guess I still don't
-  know signals very well =-) (41) [FIXED].
-- Unable to cut the entire file using the marker (discovered by Ken
-  Tyler) (42). [FIXED]
-- The keypad does not work when nano runs in the Gnome terminal (43).
-  [FIXED]
-- When reading in a file, if the file is a directory, the contents of
-  the file being edited are blown away (discovered by  Chris Pimlot)
-  (44). [FIXED]
-- In certain terms, nano will leave a "ghost" of screen upon exit when
-  called from inside mutt (among other settings) (45). [FIXED]
-- In replace, hitting the Goto line shortcut key does nothing after a
-  search string is entered (discovered by Rocco Corsi) (46) [FIXED].
-- When typing in a string in search or replace and hitting
-  CASE_SENSITIVE or the other search string, the current string edit is
-  blown away in favor of the last stored search (47) [FIXED]
-- If nano fails to open a file when it starts up, doing almost anything
-  causes a segfault (discovered by Ben Roberts) (48). [FIXED]
-- In certain terminals, nano would not work properly with keypad().
-  Turned out to be the silly timeout(0) call, which is completely
-  unneeded, anyway. (49) [FIXED]
-- With less than a page of text, doing a page down will move the current
-  line to the top of the screen, which it shouldn't do. (50) [FIXED]
-- With PDCurses, running Meta-X turns off the keypad. (51) [FIXED]
-- Resizing the window completely screws up the display if in any other
-  mode than normal editing (help screen, search and replace, file
-  browser...) (52) [FIXED]
-- Alt speller argument (-s, --speller) does not take a string argument
-  of more than one word. (53) [FIXED].
-- Cut to end cutting (-k) causes segfaults (try cutting "- Backup making
-  (filename~)?" line in TODO file) (discovered by
-  higuita@cadernoverde.com) (54) [FIXED].
-- When using autoindent (-i), wrapped text does not get autoindented
-  (55, discovered by Mark Senior) [FIXED].
-- When using -R (regex) and -p (Pico mode), subsequent searches after
-  the first fail if no string is entered (56) [FIXED].
-- Page down on a file of editwinrows fails (again). Reported by Ryan
-  Krebs (57) [FIXED].
-- File browser aborts on Solaris in qsort() call. (Reported by Matthias
-  Andree) (58) [FIXED].
-- Can modify the current file in view mode with ^W^R (discovered by
-  Rocco Corsi) (58) [FIXED].
-- When page up is used after two page downs, the screen doesn't update
-  properly (discovered by David Lawrence Ramsey) (59) [FIXED].
-- On BSD systems, marked cutting and paste often screws up the last line
-  in the cutbuffer (discovered by Barry Pederson) (60) [FIXED]
-- Blank lines are not kept when cutting with -k (discovered by Rocco)
-  (61) [FIXED].
-- nano will not suspend properly inside of mutt (62) [FIXED].
-- When switching from Pico mode to normal mode, the previous search is
-  not displayed until cancelling the search (63) [FIXED].
-- If you change search options but don't change the search string in
-  normal mode, hitting Enter causes the search/replace to abort (64)
-  (Jordi Mallach) [FIXED].
-- Cutting one line of text causes the screen to recenter the line
-  (reported and fixed by David Lawrence Ramsey) (65) [FIXED].
-- When cutting marked text including the bottom of the file, a new
-  "magic line" is not created" (reported by David Lawrence Ramsey, fixed
-  by David Lawrence Ramsey & Chris) (66) [FIXED].
-- ^C does not work after a suspend in tcsh (discovered by Trevor Cordes)
-  (68) [FIXED].
-- Home and End control keys (^A, ^E) do not always work in filename
-  prompt (bug found by Ian Turner) (69) [1.0 series only] [FIXED].
-- Trying to insert a file of 0 bytes will hang nano (70) [FIXED].
-- Meta-space and ^Space are not yet handled  in new backend code (77) [FIXED]
-- F-keys do not work with new shortcut backend (72) [FIXED]
-- Many menu items are probably missing from the new backend (73) [FIXED]
-- Need a 'check-vitals-mapped' function to check that the end used didn't
-  unbind all the keys for exit or cancel before starting up the editor (74) [FIXED]
-- Browser and prompt code still implement old switch on raw key input instead
-  of new if block for subnfunc values (75) [FIXED]
-- New backend code probably does not compile under anything but default options, 
-  if that (76) [FIXED]
-- -enable-tiny does not work with new code (78) [FIXED]
-- If a user only binds meta sequences to a function like left, right
-  page up/down, insert, and unbinds all other control and F keys for it,
-  nano will do the wrong thing when reading the key which is normally
-  assigned to it (79 - may not be worth fixing) [FIXED]
-- Segfault editing at COLS presumably due to new color syntax 
-  highlighting (80) [FIXED]
-- Cutting the line at the top of the screen recenters to center (71) [FIXED]
-
-
-$Id: BUGS 4439 2009-11-22 21:35:56Z astyanax $
diff --git a/ChangeLog b/ChangeLog
index 28e14ea..88d1d5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,1571 @@
+GNU nano 2.4.0  - 2015.03.22
+2015-03-22  Benno Schulenberg  <bensberg@justemail.net>
+	* src/chars.c (move_mbleft): Start looking for a multibyte char
+	not at the start of the string, but only as far back as such a
+	char can possibly be.  Change suggested by Mark Majeres.
+	*  src/search.c (findnextstr): Step backward or forward not simply
+	one byte but one character (possibly multibyte).  Fixes Savannah
+	bug #42175, reported by myself, and the finding of ghosts seen in
+	https://lists.gnu.org/archive/html/nano-devel/2015-03/msg00055.html.
+	* src/winio.c (edit_redraw): Do not center the current line when
+	smooth scrolling is used.  This fixes Savannah bug #42654.
+
+2015-03-21  Benno Schulenberg  <bensberg@justemail.net>
+	* src/text.c (do_alt_speller): Remove some leftovers.
+	* src/search.c: Place some comments better and unwrap some lines.
+
+2015-03-21  Mark Majeres  <mark@engine12.com>
+	* src/text.c (do_alt_speller): Restore the positions of the mark
+	and the cursor in a better way: to the columns where they were.
+	This fixes Savannah bug #44542, reported by Benno Schulenberg.
+
+2015-03-20  Benno Schulenberg  <bensberg@justemail.net>
+	* src/nano.c (finish_stdin_pager, cancel_stdin_pager, stdin_pager):
+	Normalize the whitespace, remove an old comment, and place another
+	one better.
+	* src/text.c (do_undo): Make a message equal to another one.  It
+	was mistakenly changed in r4950.  (This	is translation-neutral.)
+	* src/global.c (shortcut_init): Keep related items together in the
+	^G help screen.
+
+2015-03-17  Benno Schulenberg  <bensberg@justemail.net>
+	* src/text.c (do_alt_speller): Do not set the modified flag when
+	an external spell checker didn't make any changes.  This fixes
+	Savannah bug #44320, reported by Cody A. Taylor.
+
+2015-03-14  Benno Schulenberg  <bensberg@justemail.net>
+	* src/text.c (do_formatter): Fix a message plus a few comments.
+
+2015-03-14  Mark Majeres  <mark@engine12.com>
+	* src/nano.c (renumber): Get out if there is nothing to renumber,
+	to prevent do_undo() from falling over trying to renumber emptiness.
+	This fixes Savannah bug #44488, reported by Dennis Decker Jensen.
+
+2015-03-08  Benno Schulenberg  <bensberg@justemail.net>
+	* src/proto.h, src/nano.c: Fix compilation with --enable-tiny plus
+	--enable-nanorc.
+	* src/rcfile.c (parse_binding): Fix the rebinding of toggles.
+	* doc/man/{nano.1,rnano.1,nanorc.5}, doc/texinfo/nano.texi: Update
+	years and version numbers in the docs in anticipation of a release.
+	* src/nano.c (version): Drop compile time from version information
+	to enable a reproducible build.  Proposed by Jérémy Bobbio and Jordi
+	Mallach (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=774388).
+
+2015-03-07  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/man/nanorc.5, doc/texinfo/nano.texi: Add a note about the
+	inherent imperfection of using regular expressions for syntax
+	highlighting, as suggested by Mike Frysinger in bug #30962.
+	* doc/man/nanorc.5: Improve the indentation of some lists.
+	* doc/man/nanorc.5, doc/texinfo/nano.texi: Remove the mistaken
+	square brackets around the arguments of "header" and "magic" --
+	those arguments are not optional.  Also add "formatter" to the
+	texinfo document, and slightly improve its punctuation.
+
+GNU nano 2.3.99pre2 - 2015.02.27
+2015-02-25  Chris Allegretta <chrisa@asty.org>
+	* src/rcfile.c (parse_binding): Add an exception for do_toggle() as
+	rebinding toggles broke with r5022.  (Fixed in r5134.)
+
+2015-02-21  Benno Schulenberg  <bensberg@justemail.net>
+	* README: Fix the explanation of how to subscribe to a mailing list.
+	* doc/syntax/{java,lua,python,ruby}.nanorc: Wrap some overlong lines.
+
+2015-02-18  Mike Frysinger  <vapier@gentoo.org>
+	* doc/syntax/sh.nanorc: Recognize also dash, openrc and runscript.
+
+2015-02-16  Mike Frysinger  <vapier@gentoo.org>
+	* .gitignore: Ignore the autotools 'compile' file.
+
+2015-02-15  Benno Schulenberg  <bensberg@justemail.net>
+	* src/file.c (do_lockfile): Also show the name of the affected file
+	when finding a lock file, for when many files are opened at once.
+	* src/file.c (do_lockfile): The user does the editing, not the editor.
+
+2015-02-09  Chris Allegretta <chrisa@asty.org>
+	* nano.spec.in: Add dependency on texinfo, docdir files for
+	RPM file creation.
+
+GNU nano 2.3.99pre2 - 2015.02.06
+2015-02-03  Alex Henrie  <alexhenrie24@gmail.com>
+	* src/cut.c (do_cut_text): Make sure to set modified even when
+	using --enable-tiny.
+
+2015-02-01  Kamil Dudka  <kdudka@redhat.com>
+	* src/files.c (write_lockfile): Avoid writing uninitialized bytes to
+	the lock file -- a simple null_at() would not initialize the buffer.
+	* src/files.c (do_lockfile): Make sure that 'lockprog' and 'lockuser'
+	are terminated -- strncpy() does not guarantee that on its own.
+	* src/files.c (do_lockfile): Avoid printing a wrong PID on the status
+	bar due to treating serialized PID bytes as signed integers.  This
+	addresses https://bugzilla.redhat.com/1186384 reported by Don Swaner.
+	* src/files.c (write_lockfile): Do not trim the nano version number
+	-- snprintf() counts the trailing zero into the size limit.
+
+2015-02-01  Benno Schulenberg  <bensberg@justemail.net>
+	* src/winio.c (do_credits): Add a general entry for all translators.
+	* src/nano.c (version), src/winio.c (do_credits): Update the copyright
+	years to include 2015.
+
+2015-01-13  Chris Allegretta <chrisa@asty.org>
+	* src/files.c (open_buffer): Check here for locking and properly
+	handle choosing to not open a file when locked instead of in
+	open_file().  Fixes Savannah bug 42373 reported by Benno Schulenberg.
+
+GNU nano 2.3.99pre1 - 2015.01.06
+2015-01-03  Chris Allegretta <chrisa@asty.org>
+	* New formatter code to support syntaxes like
+	go which have tools to automatically lint and reformat the text for
+	you (gofmt), which is lovely.  rcfile option formatter, function
+	text.c:do_formatter() and some other calls.
+
+2014-12-28  Benno Schulenberg  <bensberg@justemail.net>
+	* src/files.c (do_lockfile): Gettextize the "File being edited"
+	prompt, and improve its wording.
+	* src/winio.c (do_credits): Remove the names of past translators
+	from the Easter-egg scroll.
+	* THANKS: Add a missing	historical translator name.
+	* src/winio.c (do_credits): Add Mark to the scroll, for all his
+	undo work, colouring nano's interface, and other patches.
+
+2014-11-30  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/syntax/spec.nanorc: Colorize %pretrans and %posttrans fully.
+	Original patch from Savannah patch #8573 by Daniel Vrátil.
+
+2014-09-21  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/syntax/{perl,python,ruby,sh}.nanorc: Recognize also header
+	lines of the form "#!/usr/bin/env thing" besides "#!/bin/thing".
+	This fixes Savannah bug #43270 reported by Kitty.
+
+2014-08-29  Benno Schulenberg  <bensberg@justemail.net>
+	* src/text.c (do_justify): Replace the old get_shortcut() wrapper
+	with the new func_from_key().
+
+2014-08-10  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/texinfo/nano.texi: Improve some wordings and formatting.
+
+2014-08-07  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/syntax/nanorc.nanorc: Remove a mistaken OR which causes a
+	'Bad regex, empty (sub)expression' error on some systems.  This
+	fixes Savannah bug #42929 reported by Misty De Meo.
+
+2014-08-03  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/man/nano.1, doc/man/rnano.1: Tweak the formatting a bit so that
+	po4a will create a nicer POT file.
+	* doc/man/nanorc.5: Improve some of the wordings and formatting.
+
+2014-08-02  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/texinfo/nano.texi: Standardize the formatting of command-line
+	options -- each one separately.  Also add some more markup.
+
+2014-08-01  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/man/nano.1, doc/man/rnano.1: Separate short and long option
+	by a comma instead of putting the long one between parentheses.
+	And showing the required quotes around the argument of -Q.
+
+2014-07-31  Benno Schulenberg  <bensberg@justemail.net>
+	* src/files.c (do_insertfile): Adjust some indentation.
+	* src/prompt.c (do_statusbar_input), src/browser.c (do_browser):
+	Reorder a few things, and adjust some whitespace.
+
+2014-07-27  Benno Schulenberg  <bensberg@justemail.net>
+	* src/global.c (add_to_sclist): Remove the now unused and unneeded
+	addition ability from this builder function of the shortcut list.
+	* src/global.c (strtokeytype): Move this to a better place.
+	* src/global.c (first_sc_for): Move this too to a better place.
+	* src/prompt.c (do_yesno_prompt): Use the new and more direct
+	func_from_key() wrapper instead of get_shortcut().
+	* src/text.c (do_linter): Likewise.
+	* src/files.c (do_insertfile, do_writeout): Likewise.
+
+2014-07-24  Jordi Mallach  <jordi@gnu.org>
+	* doc/texinfo/nano.texi, doc/man/nanorc.5: Typo fix.
+
+2014-07-22  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/syntax/nanorc.nanorc: Remove 'undo' from the valid options.
+
+2014-07-21  Jordi Mallach  <jordi@gnu.org>
+	* doc/nanorc.sample.in: Remove ‘undo’ section which is now obsolete.
+
+GNU nano 2.3.6 - 2014.07.17
+2014-07-16  Jordi Mallach  <jordi@gnu.org>
+	* doc/man/rnano.1: Additional printing formatting improvement from
+	Bjarni Ingi Gislason.
+
+2014-07-16  Jordi Mallach  <jordi@gnu.org>
+	* doc/man/fr/nano.1, doc/man/fr/rnano.1: Apply similar escaping fixes
+	to French manpages.
+	* doc/man/fr/nano.1, doc/man/fr/rnano.1, doc/man/fr/nanorc.5: Recode
+	as UTF-8.
+
+2014-07-16  Jordi Mallach  <jordi@gnu.org>
+	* doc/syntax/debian.nanorc: Add https, tor and spacewalk to supported
+	APT methods.
+	* doc/syntax/debian.nanorc: Apply the syntax to apt/sources.list.d/
+	entries as well, as reported by Rodolphe Pelloux-Prayer.
+
+2014-07-16  Jordi Mallach  <jordi@gnu.org>
+	* doc/man/nano.1, doc/man/rnano.1: Add some escaping and formatting
+	fixes as suggested Bjarni Ingi Gislason <bjarniig@rhi.hi.is> in
+	Debian bugs #662842 and #726956.
+
+2014-07-16  Benno Schulenberg  <bensberg@justemail.net>
+	* src/text.c: Normalize the tabbing.
+
+2014-07-16  Mark Majeres  <mark@engine12.com>
+	* src/text.c (do_undo): Make sure renumbering starts far enough back
+	after undoing a cut or paste.  This fixes a segmentation fault when
+	undoing a repeated cutting and pasting of the first line of a file.
+	* src/nano.c (move_to_filestruct, copy_from_filestruct): Fix two leaks.
+
+2014-07-13  David Lawrence Ramsey  <pooka109@gmail.com>
+	* ChangeLog: Typo fix.
+
+2014-07-12  Benno Schulenberg  <bensberg@justemail.net>
+	* configure.ac: The warning about datarootdir being ignored is
+	not merely a warning, it also activates a workaround.
+
+2014-07-11  Mark Majeres  <mark@engine12.com>
+	* src/text.c (do_undo, do_redo): Do not speak of "line wrap"
+	but instead of "text add" when undoing/redoing text additions
+	that caused automatic line breaks.
+
+2014-07-11  Benno Schulenberg  <bensberg@justemail.net>
+	* src/files.c (write_lockfile): Refix typo in error message.
+
+GNU nano 2.3.5 - 2014.07.11
+2014-07-11  Chris Allegretta <chrisa@asty.org>
+	* src/files.c (do_lockfile, open_file): If locking fails,
+	allow the lock failure message to be preserved AND
+	preserve the filename passed on the cmdline.  Fixes
+	Savannah bug #42668.
+
+2014-07-02  Chris Allegretta <chrisa@asty.org>
+	* src/files.c (do_lockfile): Check whether the directory
+	of the file we're trying to lock exists, and make the
+	resulting error message more intuitive.  Fixes
+	Savannah bug #42639 reported by Benno Schulenberg.
+
+2014-07-02  Mark Majeres  <mark@engine12.com>
+	* src/text.c (undo_cut, redo_cut, update_undo): Handle the
+	cases of cutting-from-cursor-to-end-of-line correctly.
+	* src/nano.c (do_input): Don't preserve the cutbuffer when
+	CUT_TO_END is toggled -- it would intermix two cut types.
+	* src/text.c (redo_cut, do_undo, do_redo): Don't forget to
+	free the cutbuffer after use.
+
+2014-07-02  Benno Schulenberg  <bensberg@justemail.net>
+	* src/proto.h: Add a typedef for a pointer to a function.
+	* src/global.c (func_from_key): New wrapper.
+	* src/prompt.c (get_prompt_string, do_prompt): Use the new
+	wrapper to make the code a bit cleaner.
+	* src/help.c (do_help, parse_help_input): Use the wrapper.
+	* src/browser.c (do_browser, parse_browser_input): Likewise.
+	* src/search.c (search_init, do_gotolinecolumn): Likewise.
+	* src/search.c (findnextstr): Replace a call of old wrapper
+	'getfuncfromkey()' with	a call of new 'func_from_key()'.
+	* src/winio.c (getfuncfromkey): Delete now unneeded wrapper.
+	* src/nano.c (usage, main), doc/texinfo/nano.texi: Properly
+	exclude the --quiet option when --disable-nanorc was given.
+
+2014-07-01  Benno Schulenberg  <bensberg@justemail.net>
+	* src/browser.c (do_browser), src/help.c (do_help): Make sure
+	to always set 'currmenu', so that we can rely on it.
+	* src/*.c (get_shortcut): Now that 'currmenu' is really global,
+	stop passing it around.
+	* src/help.c (help_init), src/winio.c (bottombars): There are
+	no tagless functions, so there is no need to check.
+	* src/prompt.c (do_prompt, get_prompt_string): Don't pass the
+	menu, just set it earlier.
+	* src/prompt.c (get_prompt_string): Group the arguments better.
+	* src/global.c (shortcut_init), src/browser.c (do_filesearch):
+	Show that it is possible to have backwards, regular-expressive
+	and case-sensitive searching in the file browser.
+	* src/browser.c (filesearch_init, do_filesearch): Now delete
+	these abilities again and all provisions for them.
+	* src/global.c (shortcut_init): Add two defines to make the
+	functions list clearer.
+
+2014-06-30  Mark Majeres  <mark@engine12.com>
+	* src/cut.c, src/global.c, src/nano.c: Rename 'cut_till_end' to
+	'cut_till_eof', and 'do_cut_till_end' to 'do_cut_till_eof', to
+	reduce confusion with CUT_TO_END, which is about end-of-line.
+
+2014-06-30  Benno Schulenberg  <bensberg@justemail.net>
+	* src/color.c (color_update): When there are no syntaxes, for example
+	with --ignorercfiles, do not try to find one, because that would lead
+	to the magic database being searched, which slows down startup a lot.
+	* src/color.c (color_update): Move some variables to a better place.
+	* src/*: Make 'meta_key' and 'func_key' into global variables, instead
+	of having them declared everywhere and passing them around endlessly.
+	* src/global.c (sc_seq_or): Now fix a bug introduced somewhere after
+	2.3.2 where binding a movement function to a Meta key would make the
+	corresponding Arrow key stop working (producing a character instead).
+
+2014-06-29  Benno Schulenberg  <bensberg@justemail.net>
+	* src/rcfile.c: Fix compilation with --enable-tiny --enable-nanorc.
+	* src/winio.c (parse_kbinput, get_escape_seq_kbinput): Make Ctrl-Left
+	and Ctrl-Right produce special codes, and map these codes to Prevword
+	and Nextword instead of reducing them to a plain Left and Right.  The
+	codes 539 and 554 were so chosen because some terminals produce these.
+
+2014-06-29  Mark Majeres  <mark@engine12.com>
+	* src/text.c (do_undo): Update the pointer to the bottom of the file
+	when undoing line deletions at file's end.
+
+2014-06-28  Benno Schulenberg  <bensberg@justemail.net>
+	* src/prompt.c (do_statusbar_input): Remove the useless parameters
+	'have_shortcut and 'allow_funcs'; the latter is only ever TRUE.
+	* src/global.c (shortcut_init), src/prompt.c (do_statusbar_input):
+	Eradicate the execute flag -- it is only FALSE for functions that are
+	empty placeholders (so executing them will not do anything anyway) or
+	for functions ('total_refresh', 'do_suspend_void') that do not exist
+	in menus with a prompt.  The only two exceptions are 'do_cancel' and
+	'do_gotolinecolumn_void'.  The first is handled specially, so do that
+	too for the second and then get to drop 140 parameters.
+	* src/global.c (strtosc): Move recognition of the toggles to the end,
+	use a single assignment of do_toggle_void, trim the unneeded braces.
+
+2014-06-27  Benno Schulenberg  <bensberg@justemail.net>
+	* src/global.c (shortcut_init): Add default keybindings for Cut,
+	PrevWord and NextWord in the prompt input lines; the code for those
+	special operations already exists, just the shortcuts were missing.
+	* src/rcfile.c (parse_binding): When binding keys, only allow those
+	menus where the bound function is actually present.  This reduces
+	the meaning of 'all' to "all menus where the function exists".
+	* src/rcfile.c (is_universal): New function, returning TRUE for the
+	functions that are present in most menus but only listed in MMAIN.
+	* doc/man/nanorc.5, doc/texinfo/nano.texi: Update the docs for this.
+	* prompt.c (find_statusbar_bracket_match, do_statusbar_find_bracket):
+	Remove these functions and thus the ability to search for a matching
+	bracket in a prompt input line.  The find_bracket function never had
+	a default keybinding outside MMAIN, so is unlikely to have been used.
+	* src/prompt.c (do_statusbar_input): Normalize the indentation.
+	* src/winio.c: Normalize some whitespace.
+	* Makefile.am, nano.spec.in: Stop distributing the BUGS file.
+	* BUGS: Remove obsolete file, as all the bugs in it have been fixed
+	long ago.  Nowadays bugs are tracked on Savannah.
+	* configure.ac: Silence a useless warning about ignoring datarootdir.
+
+2014-06-25  Benno Schulenberg  <bensberg@justemail.net>
+	* src/browser.c (do_browser): Allow 'firstfile' and 'lastfile' to be
+	rebound to Ctrl keys -- checking meta_key is wrong, the function has
+	already been determined, that is all that matters.
+	* src/help.c (do_help): Same thing for 'firstline'/'lastline'.
+
+2014-06-23  Benno Schulenberg  <bensberg@justemail.net>
+	* src/nano.h, src/move.c (do_up, do_down), src/winio.c (edit_scroll):
+	Rename UP_DIR and DOWN_DIR to UPWARD and DOWNWARD, for clarity.
+	* src/proto.h, src/global.c, src/search.c: Rename 'no_replace_void()'
+	to 'flip_replace_void()', to show what it actually does.
+	* doc/man/nanorc.5, doc/texinfo/nano.texi: Update the docs for that.
+	* src/global.c (strtosc): Add the bindable function 'gotodir'.
+	* doc/man/nanorc.5, doc/texinfo/nano.texi: Document the bindable
+	functions 'tofiles','gotodir' and 'flipnewbuffer', and correct
+	the description of 'gototext' (not being about the file browser).
+	* doc/syntax/nanorc.nanorc: Show Ins and Del as valid rebindable keys.
+	* src/help.c (do_help): Normalize the indentation.
+	* src/files.c (do_insertfile): Give audible feedback when flipping
+	the new buffer to off is not allowed in view mode.
+
+2014-06-22  Benno Schulenberg  <bensberg@justemail.net>
+	* src/browser.c (parse_browser_input), src/help.c (parse_help_input):
+	Remove two pointless calls of get_shortcut(), and adjust the comments.
+	* src/nano.c (do_toggle): When toggling softwrap, only the edit window
+	needs to be refreshed, not the entire screen.
+	* src/browser.c (do_browser): Remove superfluous abortion variable,
+	and place two comments better.
+	* src/text.c (do_redo): Rename 'undidmsg' to 'redidmsg', to be apt.
+
+2014-06-22  Mark Majeres  <mark@engine12.com>
+	* src/text.c (do_redo): When redoing a line join at the tail
+	of the file, make sure openfile->filebot is updated.
+	* src/text.c (undo_cut, redo_cut, do_undo, add_undo, update_undo):
+	Fix three leaks of the cutbuffer, shorten and regroup some stuff,
+	and remove an unneeded iteration of cutbottom.
+
+2014-06-21  Mark Majeres  <mark@engine12.com>
+	* src/text.c (undo_cut, add_undo): When undoing a cut-till-eof,
+	put the cursor back where the cut started, and not at the end.
+	* src/text.c (do_undo): When undoing a line break at the tail
+	of the file, make sure openfile->filebot is updated.
+
+2014-06-21  David Lawrence Ramsey  <pooka109@gmail.com>
+	* src/move.c, src/nano.c: Miscellaneous whitespace fixes, one
+	type fix, and one more #ifdef NANO_TINY.
+
+2014-06-20  Benno Schulenberg  <bensberg@justemail.net>
+	* src/proto.h, src/global.c: Remove two obsolete variables and an
+	unneeded extern, and regroup some stuff.
+	* src/files.c (check_dotnano): Wrap long lines and actually report
+	the name that is not a directory.
+	* src/*: Miscellaneous whitespace adjustments and comment tweaks.
+	* src/files.c: Fix compilation with --enable-tiny --enable-browser.
+	* doc/man/nano.1, doc/texinfo/nano.texi: History logging no longer
+	depends upon nanorc support, plus many other tweaks.
+	* src/global.c (strtosc): Fix compilation with --enable-tiny
+	--enable-histories --enable-nanorc.
+	* src/text.c: Fix compilation with --enable-tiny --enable-wrapping.
+	* src/files.c (do_insertfile): Fix compilation with --enable-tiny
+	--enable-histories --enable-multibuffer.
+	* src/nano.c: Fix compilation with --enable-tiny --enable-mouse.
+	* doc/man/nanorc.5, doc/texinfo/nano.texi: Explain better what "all"
+	means when rebinding keys.  This is a fix for Savannah bug #42552.
+	* src/nano.c (main): Make +1 and +,1 start on line one column one,
+	overriding a historical position.  This fixes Savannah bug #42538.
+
+2014-06-19  Benno Schulenberg  <bensberg@justemail.net>
+	* src/nano.c (window_init): Rename 'no_more_space()' to 'more_space()'
+	for consistency, and tweak the related comments.
+	* src/files.c: Update some comments to match the current status.
+	* src/nano (finish, main): Allow -H/--historylog and -P/--poslog to
+	function also when -I/--ignorercfiles is given.
+	* configure.ac: Add a --disable-histories flag, to disable the code
+	for the histories of search/replace strings and cursor positions.
+	* doc/texinfo/nano.texi: Document the new configure flag.
+	* src/*: Transform many DISABLE_NANORC to the new DISABLE_HISTORIES.
+	This completes the fix for Savannah bug #42539.
+
+2014-06-18  Benno Schulenberg  <bensberg@justemail.net>
+	* src/text.c: Rename 'to_end' to 'to_eof', to lessen confusion
+	with CUT_TO_END (which is about cutting to end-of-line).
+	* src/text.c: Upon better thought, elide the unneeded 'to_eof'.
+	* src/text.c: And elide a totally unused 'strdata2'.
+	* src/text.c: Rename the undo type UNSPLIT to JOIN, for clarity.
+	* src/global.c, src/rcfile.c: Rename function_type to key_type.
+	* src/text.c (break_line): Remove a condition and a break that
+	cancel each other.
+
+2014-06-18  Mark Majeres  <mark@engine12.com>
+	* src/text.c (add_undo): Don't start a new undo for CUT when the
+	cutbuffer is being preserved, because then the cuts are contiguous
+	and will form a single undo item.  And make sure the cutbuffer will
+	be cleared when a new undo item for CUT is created.
+	* src/cut.c (keeping_cutbuffer): New function, to access the status
+	of 'keep_cutbuffer' from the undo/redo code in src/text.c.
+	* src/cut.c (do_copy_text): Blow away the contents of the cutbuffer
+	if the mark is set or the cursor has moved between two copy commands.
+
+2014-06-17  Mark Majeres  <mark@engine12.com>
+	* src/text.c (do_undo, do_redo): After an undo or redo, update the
+	'placewewant' (the desired horizontal position of the cursor).
+
+2014-06-17  Benno Schulenberg  <bensberg@justemail.net>
+	* src/text.c (do_undo, do_redo): Remove obsolete boolean variable.
+	* doc/man/nano.1, doc/man/nanorc.5, doc/texinfo/nano.texi: Replace
+	SYSCONFDIR with an absolute path or a circumlocution, as suggested
+	by Mike Frysinger, plus some other tweaks.
+
+2014-06-16  David Lawrence Ramsey  <pooka109@gmail.com>
+	* src/nano.c (do_exit): Display the message "No file name" on the
+	statusbar for two seconds when --tempfile was given and the current
+	buffer has no name.  This fixes Savannah bug #41750.
+
+2014-06-16  Benno Schulenberg  <bensberg@justemail.net>
+	* configure.ac: For the sake of statically linked systems, make sure
+	the compiler also links against libz, which is used by libmagic.
+	This fixes Savannah bug #38378, reported by Alan Hourihane.
+	* src/nano.c (do_mouse, do_input): Don't bother returning zero when
+	the cursor moved, just reset the cutbuffer directly.  This avoids an
+	"Unknown Command" message on every cursor-positioning mouse click.
+	* src/nano.c (do_mouse): Put a common statement outside of then/else.
+	* src/Makefile.am: Remove -I m4; it is needed only at the top level.
+	* Makefile.am: Trim the contents of EXTRA_DIST to what is required.
+	* doc/man/nano.1, doc/man/nanorc.5, doc/texinfo/nano.texi: Update
+	the docs for the changed location of nano's search history.
+	* doc/man/nano.1, doc/man/nanorc.5, doc/texinfo/nano.texi: Change
+	some wordings, triggered by Savannah bug #52539.
+
+2014-06-14  Mark Majeres  <mark@engine12.com>
+	* src/nano.h, src/text.c (undo_cut, update_undo): When undoing a
+	backwards cut, put the cursor back in front of it, where it was.
+
+2014-06-13  Benno Schulenberg  <bensberg@justemail.net>
+	* src/nano.c (do_input): Repositioning the cursor with the mouse
+	(result == 0) should break a series of ^Ks.
+	* src/nano.c (do_mouse): Clicking on the titlebar or the statusbar
+	should not break a series of ^Ks, thus result must not be zero.
+	* src/nano.c (do_input): A toggle should not break a series of ^Ks.
+	* src/winio.c (get_shortcut): Do not treat holding both Control and
+	Meta the same as holding only Control.
+	* src/global.c, src/rcfile.c, src/nano.h, src/nano.c, src/text.c:
+	Remove the --undo option, having the undo functions always enabled.
+	If wished, the user can unbind them.  This fixes Savannah bug #42456.
+	* doc/man/{nano.1,nanorc.5}, doc/texinfo/nano.texi: Update the docs.
+	* nano.spec.in: Remove useless info dir file from the build directory,
+	don't clean this directory first, it's unnecessary, add a suggestion
+	for a pico symlink, and update the license and the source URL.
+
+2014-06-11  Benno Schulenberg  <bensberg@justemail.net>
+	* src/winio.c (get_mouseinput): Produce the correct return value for
+	when a mouse event reinserted something into the keyboard buffer.
+	* src/nano.c (do_input): Do not continue when there is a spurious
+	mouse event (a touch of the touchpad, for example) but get out.
+	Continuing would result in the cutbuffer being cleared upon the
+	next cut.  These two changes together fix Savannah bug #42326.
+	* src/nano.c (do_input): Always accept mouse events, also when
+	just looking for Unjustify.  This fixes Savannah bug #42322.
+	* src/nano.c (do_input): Remove a superfluous switch statement.
+	* src/winio.c (get_mouseinput): Set the type of a reinserted key,
+	also when it is a function key.  This fixes Savannah bug #42092.
+
+2014-06-10  Benno Schulenberg  <bensberg@justemail.net>
+	* src/browser.c, src/files.c, src/nano.c src/prompt.c, src/winio.c:
+	A few minimalistic whitespace adjustments.
+	* src/rcfile.c (check_bad_binding): Avoid a compiler warning.
+
+2014-06-10  David Lawrence Ramsey  <pooka109@gmail.com>
+	* src/winio.c: One more type fix and two tiny message tweaks.
+
+2014-06-09  David Lawrence Ramsey  <pooka109@gmail.com>
+	* src/*.c: Cosmetic tweaks of comments and whitespace.
+	* src/help.c, src/rcfile.c, src/winio.c: Elide a function call by
+	not comparing with an empty string but checking for the final \0.
+	* src/files.c, src/nano.c, src/text.c, src/winio.c: Type fixes in
+	debugging stuff -- line numbers are long, x positions unsigned long.
+	* src/files.c, src/move.c, src/nano.c, src/text.c, src/winio.c:
+	Make tiny nano a bit tinier by preening out some soft-wrap stuff.
+	* src/global.c, src/nano.c, src/winio.c: A few more cosmetic tweaks
+	(whitespace, order, braces, parentheses, and a typo) and type fixes.
+
+2014-06-09  Benno Schulenberg  <bensberg@justemail.net>
+	* src/nano.c (do_input): Remove two superfluous false conditions.
+	* src/nano.h, src/text.c (add_undo): Avoid a compiler warning with
+	--disable-wrapping.
+
+2014-06-09  Mark Majeres  <mark@engine12.com>
+	* src/text.c (do_undo, do_redo, add_undo, update_undo, do-wrap):
+	Rewrite the line-wrapping code to make use of the existing line-break
+	code.  And undo line wraps together with their causal text additions,
+	and not as separate actions because the user did not make them.
+
+2014-06-08  Mark Majeres  <mark@engine12.com>
+	* src/text.c (do_delete, do_deletion, do_undo, do_redo, update_undo):
+	Differentiate between undoing a Delete and undoing a Backspace -- the
+	cursor should be in a slightly but significantly different position.
+
+2014-06-04  Benno Schulenberg  <bensberg@justemail.net>
+	* src/global.c (shortcut_init), src/files.c (do_insertfile): Rename
+	'ext_cmd_void' to 'flip_execute_void' to better match what it does.
+	* src/global.c (strtosc), doc/man/nanorc.5, doc/texinfo/nano.texi:
+	Add function name 'flipexecute' to enable rebinding ^X in the menus
+	Read File and Execute Command.
+
+2014-06-04  David Lawrence Ramsey  <pooka109@gmail.com>
+	* src/*.c: Adjustments of whitespace and comments.
+	* doc/nanorc.sample.in: Interpunction tweaks.
+	* src/global.c (add_to_funcs): Add cast to subnfunc* for nmalloc().
+	* src/files.c (do_lockfile): Properly make the variable 'lockfilesize'
+	a size_t instead of a ssize_t, since it holds the result of strlen().
+	And use charalloc() instead of (char *)nmalloc().
+	* src/text.c (do_undo): Use charealloc() and not (char *)nrealloc().
+	* src/text.c (add_undo): Make use of null_at() to both null-terminate
+	the multibyte character and align it to use only the amount of memory
+	necessary.
+
+GNU nano 2.3.4 - 2014.06.02
+2014-06-02  Chris Allegretta <chrisa@asty.org>
+	* doc/syntax/default.nanorc: Can't do trailing spaces in the
+	  default syntax or it will hilight the spaces as you type them
+	  into a new file, which for non-programming is infuriating.
+
+2014-05-29  Mark Majeres  <mark@engine12.com>
+	* src/text.c (do_delete): For the undo structure, differentiate
+	between deleting a newline and any other character.
+
+2014-05-29  Chris Allegretta <chrisa@asty.org>
+	* src/chars.c (addstrings): This function needs to be available even
+	  on non-utf-8 systems.
+	* nano-regress: Added --disable-utf8 to regression check.
+
+GNU nano 2.3.3 - 2014.05.29
+2014-05-28  Chris Allegretta <chrisa@asty.org>
+	* doc/syntax/mutt.nanorc: Include Benno's awesome signature
+	  matcher, modified slightly to also work for quoted sigs.
+	* doc/syntax/default.nanorc: Be far more gentle with something
+	  which affects every file which doesn't match another syntax, and
+	  the user may not be able to override if their distro turns on
+	  highlighting by default.
+
+2014-05-28  Benno Schulenberg  <bensberg@justemail.net>
+	* src/nano.c (do_input): Remove the three unused parameters 's_or_t',
+	'ran_func', and 'finished'.  They are only ever set and never used.
+	* src/text.c (do_justify): Adjust a call of do_input().
+	* src/browser (do_browser): Actually translate the go-to-dir prompt.
+	* src/browser, src/search.c: There is no need to repeat translator
+	comments for the same string -- once is enough to get them included.
+	Add instead some translator comments for the prompts.
+	* src/global.c (shortcut_init): Make ^X in the Read-File menu toggle
+	between executing a command and inserting a file.  The mechanism in
+	do_insertfile() in files.c is already present -- in the past just
+	the wrong function was used in the relevant function-list item:
+	'do_insertfile_void' instead of the unintuitive 'ext_cmd_void'.
+	* src/browser (filesearch_init): Remove an unneeded format specifier.
+	* src/nano.c (usage): Add a translator comment for the --help output.
+	* src/global.c (shortcut_init): Elide four unneeded tags.
+	* src/global.c (shortcut_init): Make tiny nano just a bit tinier.
+	* src/global.c (shortcut_init): Standardize the add_to_funcs() calls,
+	breaking always between the menus and the tag.
+
+2014-05-27  Chris Allegretta <chrisa@asty.org>
+	* src/winio.c (edit_refresh): wredrawln() is not supported under
+	  slang.
+
+2014-05-27  Benno Schulenberg  <bensberg@justemail.net>
+	* src/global.c (shortcut_init): Improve the arrangement of help items
+	under certain compilation conditions.
+	* src/global.c (strtosc): Make tiny nano a bit tinier.
+	* src/global.c (strtosc): Allow rebinding 'suspend' in tiny nano.
+	* src/winio.c (set_modified): Adjust translator comment to make it
+	show up in the POT file, and make it take the "[  ]" into account.
+
+2014-05-26  Benno Schulenberg  <bensberg@justemail.net>
+	* src/cut.c (cut_line): Fix compilation with --enable-tiny.
+	* src/text.c (do_linter): Avoid a warning with --enable-tiny.
+	* src/global.c (shortcut_init): Unwrap some lines, and reorder two.
+
+2014-05-25  Benno Schulenberg  <bensberg@justemail.net>
+	* src/global.c: Cut down on the size of tiny nano, by not compiling
+	the function strtosc() when --disable-nanorc is given or implied.
+
+2014-05-25  Mark Majeres  <mark@engine12.com>
+	* src/chars.c (addstrings): New function, concatenates two allocated
+	strings, tacking the second onto the first and freeing the second.
+	* src/cut.c (do_uncut_text): Update the undo structure for a paste.
+	* src/text.c (undo_cut, redo_cut, add_undo, update_undo): Place the
+	cursor after an undo there where it was before the do, and handle
+	multibyte characters correctly.
+
+2014-05-23  Benno Schulenberg  <bensberg@justemail.net>
+	* src/winio.c (edit_draw): Finally, the proper fix for bug #31743;
+	telling ncurses to really redraw the line, without optimization, so
+	it will not mistakenly assume that a wide character at the start of
+	a line takes up just one column.  This deletes the workaround that
+	had the side effect of creating pastes full of trailing whitespace.
+
+2014-05-19  Mark Majeres  <mark@engine12.com>
+	* src/winio.c (edit_draw): Paint the current line *after* tickling the
+	terminal, so that the character in the final column will be displayed
+	properly.  Bug was introduced five days ago.
+
+2014-05-18  Benno Schulenberg  <bensberg@justemail.net>
+	* src/nano (precalc_multicolorinfo): Do not match the ^ anchor when
+	looking further on in a line.  This prevents an end="^$" from being
+	sometimes mistakenly matched.  Fix inspired by Savannah bug #27708.
+	* doc/syntax/default.nanorc: New file, example for a default syntax.
+
+2014-05-17  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/syntax/json.nanorc: New file, originally from Aapo Rantalainen,
+	but edited, extended, and improved.  See Savannah patch #7410.
+	* src/winio.c (edit_draw): Do not skip the colour-off commands at the
+	end of the loop.  Based on Savannah patch #7550 by Ryan Lothian.
+	This fixes bug #26111 reported by Dave Geering <dreamlax@Savannah>.
+
+2014-05-16  Benno Schulenberg  <bensberg@justemail.net>
+	* src/text.c, src/winio.c: Remove some more double spaces.
+	* doc/syntax/patch.nanorc: Show trailing whitespace on added lines.
+	* doc/syntax/debian.nanorc: Make the component colouring simpler,
+	and the URI colouring completer, and improve the comments.
+	* doc/syntax/*.nanorc: Harmonize (partially) the syntax files.
+
+2014-05-16  David Lawrence Ramsey  <pooka109@gmail.com>
+	* src/color.c, src/cut.c, src/text.c: Tweak some whitespace.
+	* src/global.c, src/move.c: Use TRUE and FALSE instead of 1 and 0.
+	* src/winio.c (edit_draw): Mention the name of the tickling character.
+	* src/search.c (goto_line_posx): Remove unneeded call of edit_refresh.
+	* src/text.c (do_undo, do_redo): Use size_t for line lengths.
+
+2014-05-15  Mark Majeres  <mark@engine12.com>
+	* src/*, but mainly src/text.c (undo_cut, redo_cut, do_undo, do_redo):
+	Go to the correct positions for undoing/redoing the cuts and pastes.
+	This fixes several undo problems and Savannah bug #25585.
+
+2014-05-15  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/syntax/c.nanorc: Improve the magic regex, plus tweaks.
+	* src/color.c (color_update): Adjust a comment, and be clearer.
+	* src/nano.h: Improve two comments, and elide one macro.
+	* doc/syntax/Makefile.am: Add texinfo.nanorc to the packing list.
+
+2014-05-14  Benno Schulenberg  <bensberg@justemail.net>
+	* src/winio.c (edit_draw): Poke a non-breaking space into the last
+	column of every line, to startle the terminal into handling wide,
+	two-column characters properly.  This fixes Savannah bug #31743.
+	* src/nano.c (precalc_multicolorinfo): Improve debugging messages,
+	and remove superfluous assignment (fileptr already equals endptr).
+	* src/color.c (color_update): Move magic check to after headerline.
+	* src/color.c (color_update): Open the magic database only when
+	actually going to use it, and close it afterward.
+	* doc/syntax/{perl.nanorc,xml.nanorc}: Improve two magic regexes.
+	* src/color.c (color_update): Stop seeking when a magic matched.
+	* doc/nanorc.sample.in: Add an example of colouring nano's interface
+	elements, and tweak some of the other descriptions.
+
+2014-05-13  Benno Schulenberg  <bensberg@justemail.net>
+	* src/text.c (do_linter): Make an error message somewhat clearer.
+	* src/rcfile.c (parse_binding): Improve another error message.
+	* doc/syntax/nanorc.nanorc: Show key names like M-6 and M-/ as valid.
+	* src/global.c (thanks_for_all_the_fish): Upon exit also free the
+	lists with functions and shortcuts.
+	* src/*.c: Several random whitespace and comment tweaks.
+	* src/global.c (replace_scs_for): Condense the function a bit.
+	* src/help.c (help_init): No need to keep looping when two are found.
+	* src/global.c: Improve compilation with --disable-browser.
+	* src/nano.h, src/*.c: A few more comment tweaks.
+
+2014-05-12  Benno Schulenberg  <bensberg@justemail.net>
+	* src/text.c (do_spell): Provide startup feedback, as for the linter.
+	* doc/syntax/nanorc.nanorc: Show bright foreground colours as valid.
+	* src/rcfile.c: Improve some comments, and remove some others that
+	are mispasted or superfluous.
+	* doc/texinfo/nano.texi: Add missing parenthesis, remove blank line.
+	* src/rcfile.c (parse_magictype, parse_headers): Handle the libmagic
+	and headerline regexes in the same manner, eliding a static variable
+	while renaming some others.
+	* src/*.h, src/rcfile.c (parse_magictype, parse_headers): Rename them
+	to parse_magic_exp() and parse_header_exp() to be more fitting, further
+	symmetrify them, and improve some comments.
+	* src/nano.h, src/color.c, src/global.c, src/rcfile.c: Rename struct
+	type 'exttype' to 'regexlisttype', to better match its functions, and
+	upon exit also free the regexes for libmagic results and headerlines.
+	* doc/syntax/python.nanorc: Improve the multiline regexes, make the
+	one with single quotes work again, and add some comments.
+	* doc/syntax/{man,python,fortran}.nanorc: Add regexes for comments,
+	trailing whitespace and reminders, and trim some trailing spaces.
+	* src/rcfile.c: Move parse_magic_exp() next to its sister.
+	* src/color.c (color_update): Rename a variable, and elide another.
+
+2014-05-10 Chris Allegretta <chrisa@asty.org>
+	* src/rcfile.c (parse_color_names): Redefine false and true to
+	  their appropriate macro names so --with-slang works (slangv2 anyway).
+	* src/text.c (do_linter): Care about whether user cancelled the file
+	  save (cancel the operation) versus just said no (continue but don't
+	  save the file).  Also doupdate() after statusbar message that
+	  linter is being invoked and blank the shortcuts to draw the eye.
+	  Also allow user to cancel at the "open in a new buffer" prompt.
+	  New function lint_cleanup().  Fixes Savannah bug #42203.
+
+2014-05-10  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/texinfo/nano.texi: Make syntax highlighting into a separate
+	section, and add the still missing section on rebinding keys.
+
+2014-05-10  Mark Majeres  <mark@engine12.com>
+	* src/*.h, src/*.c: Make it possible for the foreground colour of
+	interface elements to be bright.
+
+2014-05-09  Benno Schulenberg  <bensberg@justemail.net>
+	* src/winio.c (get_mouseinput): Count only shortcuts that are actually
+	shown, so that clicking on the ones after ^T (Speller/Linter) will work
+	again correctly.  This fixes the second part of Savannah bug #42093.
+	* src/global.c (shortcut_init, strtosc): Do not define nor accept
+	shortcuts for functions that are disabled.
+	* src/global.c (shortcut_init, strtosc): Define shortcut for the linter
+	when speller is disabled, and fix compilation with --disable-speller.
+	* src/global.c (shortcut_init, strtosc), doc/man/nanorc.5: Put softwrap
+	back among the "Appearance" toggles.
+	* doc/man/nanorc.5: Describe bindable functions in the third person.
+
+2014-05-06  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/texinfo/nano.texi: Let makeinfo figure out the node pointers.
+	* doc/syntax/texinfo.nanorc: New file, colouring for Texinfo files.
+	* doc/texinfo/nano.texi: Add sections on the Cutbuffer and the Mark,
+	remove option '-?', and make some other tweaks.
+	* doc/man/{nano.1,nanorc.5}, doc/texinfo/nano.texi: Synchronize the
+	documentation, and tweak some wording here and there.
+	* doc/syntax/texinfo.nanorc: Stop the brace content from spilling.
+
+2014-05-05  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/man/nanorc.5: Give syntax highlighting its own section,
+	add the "header" command, tweak some wording and formatting,
+	and trim some duplicate introductory information.
+	* src/global.c (strtosc), doc/man/nanorc.5: Allow the function
+	do_cut_till_end (naming it "cutrestoffile") to be rebound.
+	* doc/syntax/nanorc.nanorc: Add the four new *color options.
+	* doc/syntax/nanorc.nanorc: Differentiate between options that
+	take an argument and those that don't.
+
+2014-05-04  Benno Schulenberg  <bensberg@justemail.net>
+	* src/winio.c (statusbar): Elide a variable.
+	* src/*: Rename the variable 'reverse_attr' to 'hilite_attribute',
+	and remove an unneeded call of wattroff().
+	* doc/man/nanorc.5, doc/texinfo/nano.tex: Document the settings
+	of titlecolor, statuscolor, keycolor and functioncolor.
+	* doc/man/nanorc.5, doc/texinfo/nano.tex: Show quotes where quotes
+	are needed, remove some unneeded spaces, and do other tweaks.
+	* src/global.c (strtosc), doc/man/nanorc.5: Allow the Backwards
+	toggle to be rebound, document it, and document Backspace too.
+
+2014-05-03  Benno Schulenberg  <bensberg@justemail.net>
+	* src/*.h, src/*.c: Add the ability to colour four elements of
+	nano's interface differently: title bar, status bar, key combo,
+	and function tag.  Idea and original patch #8421 by Mark Majeres.
+	* src/global.c (shortcut_init): Unfold long lines consistently.
+	* src/global.c (shortcut_init): Order the shortcuts in roughly
+	the same manner as in the help lines, and group them per menu.
+	* src/global.c (shortcut_init): Remove the search-mode toggles
+	from the inappropriate WHEREISFILE and REPLACEWITH menus.
+	* src/global.c (shortcut_init): Paragraph jumping only makes
+	sense in the main editing menu; remove it from all others.
+
+2014-04-30  Benno Schulenberg  <bensberg@justemail.net>
+	* src/*, doc/*: Update the years in the copyright notices -- there
+	were releases in 2010, 2011, and 2013, and there will be in 2014.
+
+2014-04-27  Benno Schulenberg  <bensberg@justemail.net>
+	* src/nano.c (usage, main): Don't blurt out the full help text
+	but just a hint when the command line contains some mistake, to
+	avoid drowning out the error message.
+	* src/nano.c (usage): Mention only those options that actually do
+	something.  For the no-op compat flags the man page is the place.
+	* src/global.c (shortcut_init): In the help lines of Search/Replace
+	show the important toggles early on, and group them better.
+	* src/global.c (shortcut_init): Improve order and grouping in the
+	main help text and help lines.
+	* src/global.c (strtosc): Fix compilation with --enable-tiny.
+	* src/global.c (shortcut_init): Improve the order of the help items
+	still further, and make them also group nicely in the tiny version.
+
+2014-04-27  Mark Majeres  <mark@engine12.com>
+	* src/rcfile.c (parse_include): Plug two tiny memory leaks.
+
+2014-04-26  Benno Schulenberg  <bensberg@justemail.net>
+	* src/global.c (add_to_funcs): Add a pointer to the tail of the
+	functions list, to simplify and speed up adding new items.  And
+	make use of it to remember the location of the Uncut item.
+	* src/global.c, src/files.c (make_new_buffer, close_buffer): Make
+	help lines show "Close" again when more than one buffer is open.
+	* src/global.c (strtosc), doc/man/nanorc.5: Allow the do_spell
+	(and thus do_lint) function to be bound to other key combos.
+	* src/global.c (strtosc), doc/man/nanorc.5: Group related functions
+	together, remove duplicate up/down, add missing prevpage/nextpage.
+
+2014-04-24  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/faq.html: Update a few URLs, delete some obsolete ones, update
+	the section on configuration flags and on translating nano, plus a
+	whole series of other small fixes and adjustments.
+
+2014-04-23  Benno Schulenberg  <bensberg@justemail.net>
+	* src/winio.c, src/help.c, src/text.c, src/browser.c: Remove
+	several unneeded double semicolons, and two relic comments.
+	* src/help.c (parse_help_input), src/browser.c (parse_browser_input):
+	Make the Minus and Space keys work in the help viewer and file browser
+	also when the PrevPage and NextPage functions are bound to meta-key
+	sequences -- searching for these will not find them.  So, instead put
+	in the standard key code.  This fixes Savannah bug #42140.
+	* src/global.c (first_sc_for): Stop the whole charade of preferring
+	control keys over meta keys over function keys, but return the first
+	one in the list -- just like the function name implies.  This will
+	make a user-defined shortcut appear in the two bottomlines without
+	having to unbind the existing one first -- better feedback.
+	* src/global.c (shortcut_init, flagtostr, strtosc): Put the two
+	wrapping toggles together and increase their contrast a bit.
+	* src/nano.c (usage), doc/man/nano{.1,rc.5}, doc/texinfo/nano.texi:
+	Increase the contrast between hard-wrapping and soft-wrapping.
+
+2014-04-22  Benno Schulenberg  <bensberg@justemail.net>
+	* src/global.c (shortcut_init): Put the movement keys in the
+	help viewer in the order of increasing stride.
+	* src/global.c (shortcut_init): Rename many constants from
+	'*_msg' to '*_tag' to reduce confusion with 'nano_*_msg'.
+	* src/global.c (shortcut_init): Elide several pointless constants.
+	* src/global.c (shortcut_init): Elide more unneeded constants, and
+	update some translator comments and shorten a few tags.
+	* src/global.c (shortcut_init): Delete unneeded empty funcs; being
+	in the list of shortcuts is enough.
+	* src/global.c (shortcut_init): Put left/right in normal order.
+	* src/global.c (shortcut_init): List function key after meta key.
+	* src/help.c (help_init): Show just two shortcuts per function --
+	only three functions showed three, but who has an F13, F14, F15?
+	This also fixes Savannah bug #41889: misalignment of help text.
+	* src/help.c (help_init): Split the toggles into three groups,
+	and do not show toggle keys that have been rebound.
+
+2014-04-21  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/syntax/nanorc.nanorc: There is no F0 key.
+	* src/global.c (first_sc_for): Adjust two comments -- the help
+	viewer no longer sorts keys to be control first, meta second.
+	* src/global.c (first_sc_for): Put meta first, for clarity.
+	* src/global.c (strtokeytype): No need to check for lowercase
+	'm' or 'f', the source doesn't use them and rc-file processing
+	uppercases them.  Also put control first, for clarity.
+	* src/global.c (strtosc, strtomenu): Sort functions slightly
+	better, and allow things to be rebound in the linter menu.
+	* src/nano.h: Delete a large bunch of unused defines.
+	* src/nano.h, src/proto.h: Delete some more unused stuff.
+	* src/rcfile.c (parse_binding), src/winio.c (get_mouseinput):
+	Avoid three compiler warnings with --enable-debug.
+	* src/global.c (assign_keyinfo): Decombine repetitive condition.
+	* src/global.c (assign_keyinfo, shortcut_init): Give nicer names
+	to the dedicated keys, for when they show up in the help lines.
+	* src/rcfile.c (parse_binding): K-keys no longer exist.
+	* src/global.c, src/rcfile.c, doc/nanorc.sample.in: Allow the
+	codes from the Ins and Del keys to be rebound.
+	* src/rcfile.c (parse_binding): Improve two error messages, and
+	complain about wrong menu names after wrong function names.
+
+2014-04-16  Benno Schulenberg  <bensberg@justemail.net>
+	* src/winio.c (get_mouseinput): Properly find also the zeroeth
+	item from a certain menu in the list of functions.  Until now
+	this accidentally worked, because "Get Help" was the very first
+	item in almost all menus.  Partly fixes Savannah bug #42093.
+	* src/nano.h: MHELP should not be part of MALL, as ^B and ^F and
+	Enter and Backspace and so on don't make any sense there.
+	* src/nano.h, src/global.c (shortcut_init): Rename MALL to MMOST,
+	to be more accurate.
+	* src/nano.h, src/global.c, src/help.c, src/search.c: Rename
+	MREPLACE2 to MREPLACEWITH, for clarity.
+	* src/nano.h: Adjust some tabbing and spacing.
+	* src/global.c (shortcut_init): Make better use of MMOST.
+
+2014-04-15  Benno Schulenberg  <bensberg@justemail.net>
+	* src/nano.c (precalc_multicolorinfo): Actually set the intended
+	non-blocking mode for keyboard input.
+	* src/winio.c: Relocate and correct a few comments.
+	* README.SVN: To build nano from svn, ssh is not required.
+	* src/*.c: Normalize whitespace around '==' comparison.
+	* configure.ac: Check for the availability of snprintf(),
+	fixes Savannah bug #42070 reported by David Lawrence Ramsey.
+	* src/global.c (shortcut_init), src/help.c (do_help): Add the
+	shortcuts M-\ and M-/ for First Line and Last Line to the help
+	viewer, instead of ^Y and ^V, which are already taken for Page
+	Up and Page Down.  Also, stop them from aborting the viewer.
+	* src/help.c (do_help): Remove superfluous abortion variable.
+	* src/global.c (shortcut_init), src/help.c (do_help): Add the
+	shortcut ^L for Refresh to the help viewer and stop it aborting;
+	a changed version of patch #7013 from David Lawrence Ramsey.
+
+2014-04-14  Benno Schulenberg  <bensberg@justemail.net>
+	* src/{proto.h,cut.c,nano.c,text.c}: Remove the unused parameter
+	'file_bot' from copy_from_filestruct(), and rename the other.
+	* src/*: Remove the unused parameter 'func_key' from get_shortcut(),
+	and subsequently from parse_browser_input() and parse_help_input().
+	* src/*: Adjust some whitespace and tweak a few comments.
+	* src/winio.c (getfuncfromkey): Elide variable and condense comment.
+	* src/text.c (break_line): Initialize a variable to avoid a compiler
+	warning, rename it to be more apt, add a comment, tweak some others,
+	and remove an unneeded 'if'.
+	* src/char.c (move_mbleft): Avoid a compiler warning (int → size_t),
+	rename the variable, and another, and straighten out the logic.
+
+2014-04-13  Benno Schulenberg  <bensberg@justemail.net>
+	* proto.h, global.c, rcfile.c: Remove the unused parameter 'menu'
+	from strtosc().
+	* global.c (shortcut_init): Remove mistaken browser item from the
+	Go-To-Line menu.
+	* global.c (shortcut_init): Delete a misplaced setting of 'currmenu'.
+	* global.c (shortcut_init, strtomenu): Cosmetic tweaks.
+	* doc/syntax/{changelog,c,po}.nanorc: Some small extra colourings.
+	* configure.ac, doc/texinfo/nano.texi: Make --enable-tiny disable
+	the use of libmagic, and document the --disable-libmagic flag.
+	* src/nano.c (version): Print the correct --enable/--disable option.
+	* configure.ac, src/*, doc/texinfo/nano.texi: Convert all occurrences
+	of #ifdef ENABLE_NANORC to #ifndef DISABLE_NANORC, and adapt for it.
+	* configure.ac: Complain about --enable-color without --enable-nanorc.
+
+2014-04-10  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/syntax/Makefile.am: Add four recent syntaxes to the packlist.
+
+2014-04-08  Benno Schulenberg  <bensberg@justemail.net>
+	* doc: Add the documentation for the new --noread option.
+	* doc: Add missing --poslog option to the texinfo file, plus tweaks.
+
+2014-04-08  Hans Alves  <fonsvandeachterburen@gmail.com>
+	* nano.h, files.c, nano.c: Adding the command-line option --noread
+	to treat any name on the command line as a new file.  This allows
+	nano to write to named pipes -- it will start with a blank buffer,
+	and will write to the pipe when the user saves the file.  This way
+	nano can be used as an editor in combination with for instance gpg
+	without having to write sensitive data to disk first.
+
+2014-04-08  David Lawrence Ramsey  <pooka109@gmail.com>
+	* src/*.c: More editing of comment blocks and trimming of blank lines.
+
+2014-04-08  Benno Schulenberg  <bensberg@justemail.net>
+	* src/rcfile.c: Correct two comments, and tweak two others.
+	* src/color.c (color_update): Correct one comment, tweak some others,
+	remove two superfluous ones, and remove an unneeded 'if'.
+
+2014-04-08  David Lawrence Ramsey  <pooka109@gmail.com>
+	* src/nano.c (main): Convert the literal UTF-8 whitespace string into
+	its corresponding byte sequence, and add a comment for it.
+	* src/{files.c,global.c,help.c,winio.c}: Reformat some comment blocks,
+	fix a few typos, and remove a few unneeded blank lines.
+
+2014-04-08  Benno Schulenberg  <bensberg@justemail.net>
+	* src/rcfile.c (parse_binding): Melt the binding and unbinding code,
+	which are very similar, into a single function.
+	* src/rcfile.c (parse_binding): Uppercase only the first two or three
+	characters of the key name, in order to preserve ^Space and M-Space,
+	so they can be unbound.  Fixes Savannah bug #41940.
+	* doc/syntax/go.nanorc: Extend the syntax highlighting for Go lang,
+	from the submission by Robert Clausecker <fuzxxl@Savannah>.
+
+2014-04-07  Benno Schulenberg  <bensberg@justemail.net>
+	* src/{proto.h,global.c,text.c}: Keep a pointer to the Uncut item in
+	the functions list, to be able to change its description to Unjustify
+	at the appropriate moment.  This avoids having to fully repopulate
+	the functions and shortcuts lists before and after every Justify.
+	Also, look for ^U only in the main menu, to which ^W M-J factually
+	returns and which shortcut_init() "sneakily" sets.
+	* src/{proto.h,files.c,global.c,nano.c,rcfile.c}: Drop the obsolete
+	argument of shortcut_init(), and remove two unneeded calls of it.
+	* src/global.c (shortcut_init): Allow M-J after an --enable-justify.
+	* src/rcfile.c (parse_rcfile): The user documentation only speaks
+	of options, not of flags.  Make the error messages conform.
+	* src/rcfile.c (check_vitals_mapped): Improve layout of message.
+
+2014-04-06  Benno Schulenberg  <bensberg@justemail.net>
+	* src/global.c (shortcut_init): Limit M-T (cut-till-end-of-file) to
+	the main menu, and M-J (full-justify) to the main and search menus.
+	* src/proto.h: There is no need for the helpline tags to be external,
+	they are only ever used in src/global.c.
+	* src/global.c: Do not set any helpline tags to empty strings;
+	compilation should fail if they are needed and not defined.
+
+2014-04-05  Benno Schulenberg  <bensberg@justemail.net>
+	* src/nano.c (version): Print the correct configuration options.
+	* src/{chars.c,nano.c,text.c}: Cosmetic tweaks.
+	* doc/texinfo/nano.texi: Adjust for new disabling config options.
+
+2014-04-05  Mike Frysinger  <vapier@gentoo.org>
+	* src/nano.c (do_input): Reload possibly freed function pointer.
+
+2014-04-04  Benno Schulenberg  <bensberg@justemail.net>
+	* src/{files.c,nano.c}: Avoid two more compilation warnings.
+	* configure.ac: Allow --enable-extra and --enable-multibuffer
+	to override --enable-tiny.
+	* src/rcfile.c (check_vitals_mapped): Do not allow 'set quiet'
+	to suppress a fatal-error message, make sure the user sees it.
+	* src/color.c: Comment tweaks.
+	* src/{*.h,*.c}, configure.ac: Convert all occurrences of
+	#ifdef ENABLE_COLOR to #ifndef DISABLE_COLOR.
+	* src/nano.h: Comment tweaks.
+	* configure.ac: Move the enabling stuff to after the disablers.
+	* configure.ac: Add submissive colour disabling to --enable-tiny.
+	* configure.ac: Allow other enablers to override --enable-tiny too.
+	* src/{proto.h,search.c}: Fix compilation with --enable-browser.
+	* src/global.c (shortcut_init): Fix warnings with --enable-help.
+	* src/text.c (do_justify): Fix compilation with --enable-justify.
+	* src/nano.c (do_mouse): Fix warning with --enable-mouse.
+	* src/prompt.c (get_prompt_string): Fix compilation for the
+	combination of --enable-tiny with --enable-tabcomp.
+	* src/prompt.c (get_prompt_string): Normalize the indentation.
+	* src/text.c: Comment tweaks.
+
+2014-04-03  Benno Schulenberg  <bensberg@justemail.net>
+	* configure.ac: Remove unused '*_support' variables.
+	* doc/syntax/po.nanorc: New file, syntax colouring for PO files.
+	* configure.ac: Stop --with-slang from duplicating --enable-tiny.
+	* configure.ac: Sort all the disabling options alphabetically.
+	* src/{proto.h,files.c,global.c,nano.c,rcfile.c}, configure.ac:
+	Convert #ifdef ENABLE_MULTIBUFFER to #ifndef DISABLE_MULTIBUFFER.
+	* src/{proto.h,files.c,,nano.c,winio.c}, configure.ac:
+	Convert #ifdef NANO_EXTRA to #ifndef DISABLE_EXTRA.
+	* src/{global.c,text.c}: Fix two compilation warnings for tiny.
+
+2014-04-02  Benno Schulenberg  <bensberg@justemail.net>
+	* configure.ac, doc/Makefile.am: Try to build the info documentation
+	only when 'makeinfo' is available.  Patch partly by Mike Frysinger.
+	* configure.ac: Upping the required version of Autoconf, to ensure the
+	ONCE macros are defined.  Suggested by Kamil Dudka and Mike Frysinger.
+
+2014-04-02  Mike Frysinger  <vapier@gentoo.org>
+	* doc/man/{,fr}/Makefile.am: Simplify the man rules still further.
+	* .gitignore: Add 'config.cache', created by './configure -C'.
+	* src/nano.c (die_save_file): Newer gcc warns about set-but-unused
+	variables, so add a dummy if() check to kill that off.
+	* src/search.c (search_init): Silence a compiler warning about a
+	variable possibly being used uninitialized.
+
+2014-03-31 Chris Allegretta <chrisa@asty.org>
+	* doc/syntax/go.nanorc: New file, basic go syntax highlighting.
+
+2014-03-30  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/syntax/changelog.nanorc: New file, first attempt at colouring
+	Changelog files.
+	* ChangeLog: Consistently use a colon after names of changed files.
+
+2014-03-30  Mike Frysinger  <vapier@gentoo.org>
+	* doc/Makefile.am, doc/man/Makefile.am, doc/man/fr/Makefile.am:
+	The build already provides a standard htmldir for installing html
+	files.  Use that instead of creating our own.
+	* doc/man/Makefile.am, doc/man/fr/Makefile.am: Use dist_ prefixes
+	and += appending supported by automake to produce simpler files.
+	* doc/Makefile.am: Drop redundant localedir, as autoconf/automake
+	already creates this for us.
+	* src/rcfile.c, doc/nanorc.sample.in: Hard-listing all the wanted
+	syntax files is a PITA.  Support globs in include paths, so people
+	can easily drop in new files and have it "just work".
+
+2014-03-27  Benno Schulenberg  <bensberg@justemail.net>
+	* src/nano.c (main): Fix compilation with --disable-utf8.
+	* src/global.c (shortcut_init): Place a help string among
+	its kin, adjust some indentation, group function pairs more
+	tightly, bundle restricted stuff, and delete an unused item.
+
+2014-03-27  Mike Frysinger  <vapier@gentoo.org>
+	* configure.ac: Make --disable-nanorc with --enable-color barf.
+	* configure.ac: Allow --disable-utf8 and --enable-utf8 to work.
+
+2014-03-26  Benno Schulenberg  <bensberg@justemail.net>
+	* configure.ac: Word, tab, and comment tweaks.
+	* src/global.c: Some comment tweaks, and whitespace trimmings.
+	* src/global.c (print_sclist): Also print last shortcut in list.
+	* doc/texinfo/nano.texi: Explain how to select and paste with
+	the mouse when mouse support is enabled: by holding down Shift.
+	* nano.spec.in, doc/faq.html, doc/texinfo/nano.texi: Remove
+	vestiges of the obsolete '--enable-all' configure flag.
+	* src/rcfile.c: Fix compilation with --disable-color.
+	* src/rcfile.c: Allow (un)binding keys when colour is disabled.
+	* src/help.c: Fix compilation with --disable-browser.
+	* src/{proto.h,browser.c,help.c}: Remove a superfluous function.
+
+2014-03-26  Mike Frysinger  <vapier@gentoo.org>
+	* configure.ac: Clean up most of the --with/--enable flags:
+	- use AS_HELP_STRING instead of writing the text ourselves;
+	- use the normal enable_xxx var AC_ARG_ENABLE creates for us;
+	- delete duplicate checks in a few places (due to previous cleanup);
+	- unwrap some macros/var assignments;
+	- delete trailing whitespace;
+	- delete old --enable-all flag;
+	- fix quoting on a lot of vars that come from the user;
+	- use AC_MSG_* helpers instead of raw `echo`.
+
+2014-03-24  Benno Schulenberg  <bensberg@justemail.net>
+	* src/{nano,move,winio}.c: Fix a few compiler warnings.
+	* src/{global,rcfile,winio}.c: Print menu numbers for debugging
+	in hex, and tweak a few of those debugging messages.
+	* src/nano.c: Harmonize comments, and trim some blank lines.
+
+2014-03-24  Mike Frysinger  <vapier@gentoo.org>
+	* doc/syntax/gentoo.nanorc: Match more files, add a trailing
+	whitespace check, and EAPI=5 updates.
+	* doc/syntax/javascript.nanorc: New file, based on C syntax.
+	* doc/syntax/{nanorc,python}.nanorc: Highlight trailing whitespace.
+	* configure.ac, m4/ax_check_compile_flag.m4: Start building with
+	warnings enabled, to help prevent issues from silently creeping in.
+	* configure.ac: Newer ncurses include pkg-config files which tell
+	us the right -I/-L paths we need, so default to that before trying
+	the legacy ways.
+	* configure.ac: Add a configure flag to disable the use of the
+	fattening libmagic.
+
+2014-03-23  Benno Schulenberg  <bensberg@justemail.net>
+	* src/rcfile.c (parse_keybinding, parse_unbinding): Improve a
+	debugging message, fix a translator comment, and tweak others.
+
+2014-03-22  Benno Schulenberg  <bensberg@justemail.net>
+	* THANKS: Add some missing translator names, and tweak others.
+
+2014-03-21  Benno Schulenberg  <bensberg@justemail.net>
+	* src/chars.c (is_punct_mbchar, mbstrchr): Elide a variable,
+	thus making two ifs identical to six others.
+	* doc/syntax/nanorc.nanorc: Add the 'extendsyntax' directive,
+	and change two colours to be legible on a light background.
+
+2014-03-19  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/nanorc.sample.in: Document the changed whitespace defaults.
+	* src/global.c, doc/man/nanorc.5: Allow softwrap to be rebound.
+	* doc/nanorc.sample.in: Sort the includes alphabetically, and
+	add the ones for Lua, Magicpoint, and Spec files.
+	* doc/nanorc.sample.in: Add "poslog", plus tiny textual tweaks.
+	* src/global.c, doc/man/nanorc.5: Group softwrap with the toggles
+	that affect how things look -- it does not belong in the group of
+	general program functions, nor in the group of editing behaviour.
+	* doc/man/nanorc.5: Add the descriptions of six missing bindable
+	functions, and tweak those of a few others.
+
+2014-03-18  Benno Schulenberg  <bensberg@justemail.net>
+	* src/global.c (shortcut_init): In the file browser one cannot
+	search for a regular expression, so do not mention it.
+
+2014-03-17  Benno Schulenberg  <bensberg@justemail.net>
+	* src/global.c (shortcut_init): Show ^F and ^B instead of kright
+	and kleft in the help lines of the tiny version.
+	* src/global.c (shortcut_init): Remove some inconsistent spaces
+	and newlines, condense three statements into one, place an #endif
+	better, melt two #ifndefs into one, and add a comment.
+	* src/winio.c (edit_scroll): Remove the old softwrap scrolling code.
+	* src/{nano.h,proto.h,color.c,cut.c,files.c,global.c,help.c,nano.c,
+	search.c,text.c,utils.c}: Add, fix, and remove some #endif comments,
+	remove an obsolete comment, and remove some superfluous #ifndefs.
+	* src/global.c (shortcut_init): Put ^B and ^F in the same order as
+	all other command keys: first the backward then the forward motion.
+	* src/{nano.h,*.c}: Remove stray spaces before tabs.
+
+2014-03-16  Benno Schulenberg  <bensberg@justemail.net>
+	* src/nano.h: Display more help items when the terminal is wider.
+
+2014-03-14  Benno Schulenberg  <bensberg@justemail.net>
+	* src/nano.c (main): When in a UTF-8 locale, use prettier characters
+	(»·) for indicating whitespace, and for similarity use ">." instead of
+	":." when not in a UTF-8 locale.  Changes suggested by Mike Frysinger.
+
+2014-03-05  Benno Schulenberg  <bensberg@justemail.net>
+	* src/move.c (do_down): Initialize the correct variable to zero.
+	Solves jumpy scrolling behaviour reported by Chris Allegretta.
+
+2014-03-04 Chris Allegretta <chrisa@asty.org>
+	* global.c (first_sc_for): Return raw keystrokes last, so
+	  they will not be displayed if there are F-keys or Meta keys
+	  mapped for an item in the shortcut list.
+
+2014-03-04  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/syntax/nanorc.nanorc: Add keyword 'quiet', sort 'locking',
+	and concatenate the two separate strings into one.
+	* src/nano.c (main), doc/nanorc.sample.in: Make the M-P toggle
+	actually do something by default, by using visible characters.
+	* src/global.c (shortcut_init): Normalize the writing of three
+	help-line items: "Write Out", "Uncut Text", and "Unjustify", to
+	better stress the O and U -- the big C and J were distracting.
+	* doc/{syntax/nanorc.nanorc,man/nanorc.5,texinfo/nano.texi}:
+	Remove erroneous 'suspendenable' -- it is not a settable option
+	but a bindable function.
+
+2014-03-03 Chris Allegretta <chrisa@asty.org>
+	* global.c (shortcut_init): Don't actually free the shortcut
+	  list, since the next pass via justifying will then remove all
+	  custom shortcuts.  Fixes bug discovered by Benno Schulenberg.
+	* text.c (do_linter): Remove some unused variables to quiet
+	  -pedantic -Wall.
+
+2014-03-03  Benno Schulenberg  <bensberg@justemail.net>
+	* src/global.c (add_to_funcs): Add a newline, for clarity.
+	* src/global.c (shortcut_init): Mark, don't translate yet.
+	* src/move.c (do_down): Correctly compute the minimum amount
+	to scroll when softwrap is on and there are overlong lines.
+	* src/winio.c (edit_scroll): Disable amount computation here.
+	* src/move.c (do_down): Trim some redundant code, and correct
+	the scrolling behaviour when softwrap is off -- the construct
+	(amount ? amount : 1) wasn't doing what I intended.
+	* doc/man/nano{.1,rc.5}: Slightly improve formatting and wording.
+	* doc/{texinfo/nano.texi,man/nanorc.5}: Add some missing options
+	to the texinfo documentation, and improve alphabetization a bit.
+	* src/nano.c (usage): Don't mention --softwrap in tiny version.
+
+2014-03-01 Chris Allegretta <chrisa@asty.org>
+	* global.c (shortcut_init): Fix an issue with the split
+	  do_research() setup when using --enable-tiny.
+	* rcfile.c (parse_linter): Allow linter to be unset using "".
+	* rcfile.c: Allow syntaxes to be extended via "extendsyntax"
+	  directive.  Color, header, magic and linter should all be
+	  able to be extended.  Man page updates for nanorc(5).
+	* doc/nanorc.sample.in: Document 'set quiet'.
+
+2014-03-01  Mike Frysinger  <vapier@gentoo.org>
+	* src/color.c (color_update): Do not write to stderr on magic
+	errors.  If the magic db has errors such that magic_load() fails,
+	the current code dumps to stderr which messes up the terminal.
+	The error message is also vague to the point where it's confusing
+	-- I thought nano had problems writing to the file I was editing.
+	Instead, use statusbar() and clarify the messages.
+	(Patch tweaked by Benno.)
+
+2014-02-28  Benno Schulenberg  <bensberg@justemail.net>
+	* src/text.c (execute_command): Equalize pipe error messages.
+	* src/global.c (thanks_for_all_the_fish): Remove a redundant
+	'#ifdef DEBUG', it is contained within a wider one.
+	* src/global.c (strtosc): Correct a misspelled keyword.
+	* src/rcfile.c (check_vitals_mapped): Actually translate a
+	helpful message, and reword it somewhat for clarity.
+	* src/global.c: Remove unused function 'free_shortcutage'.
+	* src/global.c (strtosc): Indent conditions consistently.
+
+2014-02-28  Eitan Adler  <lists@eitanadler.com>
+	* src/nano.c (do_toggle): Constify a char pointer, to fix
+	a warning when compiling with clang (and -Wall).
+
+2014-02-27  Mike Frysinger  <vapier@gentoo.org>
+	* doc/man/nanorc.5: Relocate the misplaced unbind section,
+	and improve formatting.  (Patch tweaked by Benno.)
+	* doc/syntax/nanorc.nanorc: Add the bind/unbind commands,
+	so they will look supported when using syntax highlighting.
+
+2014-02-27  Benno Schulenberg  <bensberg@justemail.net>
+	* src/help.c (parse_help_input): Make 'Space' again an alias
+	for PageDown and 'Minus' for PageUp -- they were mistakenly
+	swapped during code conversion in revision 4223.
+
+2014-02-26  Mike Frysinger  <vapier@gentoo.org>
+	* doc/syntax/sh.nanorc: Highlight more shell builtins and
+	common commands, and rewrite the variable highlighting to be
+	more exact and handle cases where string operations are used.
+	* doc/syntax/gentoo.nanorc: Update to newer EAPIs, and fold
+	in updated shell changes too.  Much of this is based on work
+	by Davide Pesavento <pesa@gentoo.org>.
+	* doc/syntax/makefile.nanorc: Highlight trailing whitespace.
+
+2014-02-26  Benno Schulenberg  <bensberg@justemail.net>
+	* src/global.c (shortcut_init): Put PageUp and PageDown
+	and also WhereIs and WhereIsNext together in the help lines
+	of the file browser, and WriteOut and Readfile in the help
+	lines of the main window -- related stuff in one column.
+	* doc/syntax/man.nanorc: Better colouring of manpage files.
+
+2014-02-26  Konstantin Abakumov  <abakumov@Savannah>  (tiny change)
+	* doc/syntax/python.nanorc: Slightly improve the regexes for
+	multiline strings in Python, reducing spillage.
+
+2014-02-26  Benno Schulenberg  <bensberg@justemail.net>
+	* src/move.c (do_down), src/winio.c (edit_scroll): Scroll an
+	extra amount when softwrap is on and the current line would
+	otherwise run off the screen, and recalculate maxrows after
+	each scroll.  Solves bug #27550 reported by Hannes Schueller.
+
+2014-02-25  Benno Schulenberg  <bensberg@justemail.net>
+	* NEWS: Fix some typos and wordings, and rewrap a few lines.
+	* src/global.c: Correcting some translator comments, removal
+	of a few superfluous blank lines, and some pedantic comment
+	tweaks (mainly adding missing periods and stars).
+	* src/global.c: Ordering "Prev Word" and "Next Word" better.
+	* src/global.c: Make ^G not only call help but also exit from
+	it, and make ^C also exit from help and from the file browser.
+	Also remove two redundant shortcut definitions.
+
+2014-02-25  Mike Frysinger  <vapier@gentoo.org>
+	* src/Makefile.am: Rename 'INCLUDES' to 'AM_CPPFLAGS', since
+	Automake changed the naming of these a while ago, and at least
+	version 1.13 now starts warning about it.
+	* .gitignore: Ignore generated files (and bak files).
+
+2014-02-25  Benno Schulenberg  <bensberg@justemail.net>
+	* src/files.c (write_lockfile, do_lockfile): Fix a typo reported
+	by Jean-Philippe Guérard and inconsistent spelling of "lock file"
+	reported by myself on nano-devel in March 2013.
+
+2014-02-25  Benno Schulenberg  <bensberg@justemail.net>
+	* src/help.c (do_help_void): Call the help browser with the correct
+	refresher for afterwards.  This solves a bug reported by myself on
+	nano-devel in August 2010: after typing ^R ^T ^W ^G ^X, the file
+	being edited would get displayed instead of the list of files.
+
+2014-02-24 Chris Allegretta <chrisa@asty.org>
+	* New linter functionality, rcfile option "linter".
+	* src/global.c (shortcut_init): Actually free the sclist
+	  if it was allocated before.
+	* src/winio.c (do_credits): Add Benno, my children,
+	  update copyright info.
+
+2014-02-23  Benno Schulenberg  <bensberg@justemail.net>
+	* doc/syntax/*.nanorc: Comment and punctuation tweaks.
+	* doc/syntax/sh.nanorc: Colour $VAR within a "" string
+	but not within a '' string, and do not colour strings
+	within comments.  Fixes bug #29943.
+
+2014-02-23  Benno Schulenberg  <bensberg@justemail.net>
+	* src/text.c (do_undo, do_redo, add_undo): Make warning
+	sentences in the status bar consistently end in a period.
+
+2014-02-22  Benno Schulenberg  <bensberg@justemail.net>
+	* src/files.c (write_file): Add a missing malloc.
+	Reported by an anonymous cross compiler, bug #30671.
+
+2014-02-22  Benno Schulenberg  <bensberg@justemail.net>
+	* src/winio.c (get_mouseinput): Correct an oversight,
+	use the proper 'do_up_void' and 'do_down_void' names.
+	Reported by Zhou Z.J. <zzj666@Savannah>, bug #38268.
+
+2014-02-22  Lauri Kasanen  <laxy@Savannah>  (tiny change)
+	* doc/syntax/html.nanorc: Also recognize htm as extension,
+	use cyan for tags (more visible on dark background), correct
+	the expression for ampersand codes, and colour strings too.
+
+2014-02-22  Dennis Jenkins  <dennisjenkins@Savannah>  (tiny change)
+	* doc/syntax/c.nanorc: Also recognize c++ as extension.
+
+2014-02-22  Benno Schulenberg  <bensberg@justemail.net>
+	* src/nano.c (move_to_filestruct): Update the data in 'mark_begin'
+	when mark and cursor are on the same line.  This avoids a segfault
+	after M-A, right, M-T, left, ^K, or a hang when the left is left out.
+
+2014-02-22  Benno Schulenberg  <bensberg@justemail.net>
+	* src/nano.c (main): Add two conditions on ENABLE_NANORC.
+	* src/files.c (close_buffer, do_insertfile): Likewise.
+	This avoids compilation failure when nano is configured
+	with both --disable-color and --disable-nanorc.
+
+2014-02-22  Felipe Bugno  <capent@Savannah>  (tiny change)
+	* doc/nanorc.sample.in: Add an include for CMake files.
+
+2014-02-22  David Lawrence Ramsey  <pooka109@gmail.com>
+	* src/nano.c (allow_pending_sigwinch): A (char *) cast for pedantic purposes.
+	* src/cut.c (do_cut_text): Wrap a reference to 'copy_text' in NANO_TINY.
+
+2014-02-22  David Lawrence Ramsey  <pooka109@gmail.com>
+	* ChangeLog, NEWS, doc/faq.html: Fix typos, wording, and spacing.
+
+2014-01-25 Chris Allegretta <chrisa@asty.org>
+	* src/winio.c (set_modified): Check for a filename before trying to lock.
+
+2014-01-24  Benno Schulenberg  <bensberg@justemail.net>
+	* src/nano.c (copy_from_filestruct): Check explicitly for mark being set when
+	  trying to partition, as we shouldn't be messing with the x address, etc.
+
+2014-01-01 Chris Allegretta <chrisa@asty.org>
+	* doc/texinfo/nano.texi: Change '@sp4' since makeinfo 5.1 hates the
+	  lack of spacing.  Fixes bug #40103 reported by flapane@Savannah.
+	  Also change SVN status to non-binary so diffs work.
+
+2014-01-01 Chris Allegretta <chrisa@asty.org>
+	* src/global.c (strtokeytype): Check for lower-case 'f' for defining F-key
+	  sequences for consistency (previously was two checks for upper case 'F').
+	  Fixes bug #40815 reported by David Binderman <dcb314@Savannah>.
+
+2013-06-13 Matthew Fischer <mfisch@Savannah>
+	* doc/syntax/c.nanorc: Add the 'auto' keyword.
+
+2013-06-13  David Lawrence Ramsey <pooka109@gmail.com>
+	* src/global.c (first_sc_for): Try to more consistently display keystrokes,
+	  useful when the user has re-binded a bunch of them.
+
+2013-06-13 Kamil Dudka <kdudka@redhat.com>
+	* doc/man/nano.1: Actually document the -P (--poslog) option.
+
+2013-04-12 Chris Allegretta <chrisa@asty.org>
+	* src/files.c (do_insertfile): Check for saved cursor position when inserting a
+	  file as well.  Fixes Savannah bug #38600 reported by Craig Barnes.
+	* src/files.c (write_file): Don't re-stat() the file if we're writing out
+	  a marked portion (especially because it would give the wrong stat info).
+	  Part two of issue reported by Benno Schulenberg.
+
+2013-04-07 Michael Berg <mike@berg-net.us>
+	* do_cut_text: Fix copying (not cutting) text setting Modified state.
+	  Partly fixes an issue reported by Benno Schulenberg.
+
+GNU nano 2.3.2 - 2013.03.23
+2013-03-17 Chris Allegretta <chrisa@asty.org>
+	* Revert r4547 as we should have a new release and the overlap code is not yet
+	  ready for public consumption.
+
+2013-01-20 Chris Allegretta <chrisa@asty.org>
+	* src/text.c (do_histify): Don't allow sigwinch to be received while justifying
+	  as that puts us into a wacky state.  Fixes crash on justify by Joshua Rogers.
+	* configure.ac: Added --with-wordbounds option to let cross compilers force
+	  whether their target system support GNU-style word boundaries or not.
+	  Originally reported by dave festing.
+	* doc/man/nanorc.5: Fix typo in softwrap description, reported by
+	  cbart387@Savannah.
+
+2013-01-19 Chris Allegretta <chrisa@asty.org>
+	* configure.ac: Make ncurses checking to set $LIBS and check the ncursesw lib
+	  actually works before defaulting to it over ncurses!  Shock!
+
+2013-01-13 Chris Allegretta <chrisa@asty.org>
+	* src/utils.c (parse_num): Initialize errno before calling strtol().  Fixes issue
+	  where trying to go to a line number too long will break legitimate goto-lines
+	  for the remainder of the editing session, reported by Joshua Rogers.
+
+2013-01-09 Mike Frysinger <vapier@gentoo.org>
+	* configure.ac: Check for ncursesw5-config and base $CPPFLAGS on it.
+
+2013-01-09 Fabian Groffen <grobian@Savannah>
+	* configure.ac, src/nano.h: Make the search for ncursesw more generalized.
+
+2013-01-02 David Benjamin <davidben@Savannah>
+	* src/search.c (parse_syntax): Fix blatantly and dangerously incorrect code
+	  for deleting old syntaxes.
+
+2013-01-02 Mike Frysinger <vapier@gentoo.org>
+	* src/files.c (cwd_tab_completion): Remove unnecessary variables.
+	* src/search.c (search_init): Fix gcc complaints on certain versions.
+
+2013-01-02 Eitan Adler <lists@eitanadler.com>
+	* configure.ac: Remove unnecessary checks.
+	* src/nano.h, NEWS: Fix redundant wording.
+
+2012-12-31 Chris Allegretta <chrisa@asty.org>
+	* src/*: Introduce (basic) vim-style file locks.  Does not allow vim to recover
+	  our changes, and just lets a vim user know we're editing a file.  Command-line
+	  option "-G" or "--locking", nanorc option "locking".  New functions in
+	  src/files.c: do_lockfile(), write_lockfile(), and delete_lockfile().
+
+2012-02-05 Chris Allegretta <chrisa@asty.org>
+	* src/*: Fix overlapping strings highlighting each other.  New variables in edit_draw
+	  (slmatcharray, pbegin, paintok), new logic (with repeated setting of values in the
+	  array but it's BFI after all).  FIXME: Need to create a new 'overlap'.
+	* src/*: Fix a silly issue with the argument to nregcomp, as it's confusing to the caller.
+	* src/nano.h: Change the color types to a compiler macro (COLORWIDTH), may not actually
+	  even be worth doing, but someday who knows how wide a color curses implementation might
+	  be, and maybe we'll even start checking for it in autoconf!
+
+GNU nano 2.3.1 - 2011.05.10
+2011-05-10 Chris Allegretta <chrisa@asty.org>
+	* text.c (do_enter): Only increment totsize by the auto-indented amount, since the previous
+	  line's size was already counted.  Fixes bug reported by Robert Spanjaard.
+
+2011-05-08 Chris Allegretta <chrisa@asty.org>
+	* doc/syntax/Makefile.am: Finally get around to sorting the syntax file list.
+
+2011-05-08 Matthew Wild <mattj100@Savannah>
+	* doc/syntax/spec.nanorc: New lua syntax highlighting config.
+
+2011-03-28 Asterios Dramis <asterios.dramis@gmail.com>
+	* doc/syntax/spec.nanorc: New RPM spec file highlighting config.
+
+2011-03-12 Chris Allegretta <chrisa@asty.org>
+	* po/*: Sync latest translation fixes, add an update_linguas.sh script.  Rename
+	  existing update.pl to update_sources.pl to make it more specific.
+
+2011-03-04 Chris Allegretta <chrisa@asty.org>
+	* color.c (color_update): Add check for whether the file even exists
+	  before we try to run the magic check on it.  Fixes error messages to stderr
+	  when reading in files that don't exist, reported by Mike Frysinger.
+
+2011-03-03 Chris Allegretta <chrisa@asty.org>
+	* color.c (color_update): Remove unneeded debugging message from libmagic commit.
+	  Fixed extra messages going to stderr, reported by Mike Frysinger.
+
+GNU nano 2.3.0 - 2011.02.26
+2011-02-26 Chris Allegretta <chrisa@asty.org>
+	* Change RAW in function_type enum to RAWINPUT, to fix compilation on AIX,
+	  reported by Richard G Daniel <skunk@iskunk.org>.
+
+2011-02-23 Chris Allegretta <chrisa@asty.org>
+	* Fix some more severe warnings from 'g++ -pedantic', from patch originally
+	  by Eitan Adler <lists@eitanadler.com>.
+
+2011-02-23 Kamil Dudka <kdudka@redhat.com>
+	* doc/man/nanorc.5: Fix small typo.
+
+2011-02-22 Chris Allegretta <chrisa@asty.org>
+	* color.c (nfreeregex): Fix that we were trying to set the pointer passed by value
+	  to NULL.  Fixes crashes on file save reported by Ken Tyler and Matthieu Lejeune.
+
+2011-02-18 Chris Allegretta <chrisa@asty.org>
+	* New saved cursor position history option.  Command line option -P or --poslog, rc file
+	  entry "poslog".  Search history changes to ~/.nano/search_history, cursor position log
+	  is ~/.nano/filepos_history.  Added checks to move the legacy .nano_history file to the
+	  new location.  Several new functions to files.c: load_poshistory(), save_poshistory(),
+	  check_poshistory(), update_poshistory(), and reworking of histfilename().  New FAQ entry
+	  4.15 discussing the change and offering an interoperability workaround.
+	* files.c (load_history): Set last_search to the last search value we loaded from history,
+	  so do_research will succeed without needing to manually load the last search in.  Fixes
+	  bug reported by Matthieu Lejeune.
+
+2011-02-12 Chris Allegretta <chrisa@asty.org>
+	* Initial libmagic implementation, adapted from Eitan Adler <eitanadlerlist@gmail.com>.
+	  New nanorc entry "magic" to enable this functionality, nanorc file and man page updates.
+
+2011-02-06 Chris Allegretta <chrisa@asty.org>
+	* src/*: Retire iso_me_harder_funcmap based on suggestion by <bernd.spaeth@gmx.net>
+	  This does add 20KB to nano's executable size but it gets rid of a lot of indirection
+	  that makes people stomach turn.  There are several new stub functions and need of more
+	  tidying as a result of this.
+	* files.c (write_file): Fix problems with writing the backup file (albeit interactively)
+	  with new function prompt_failed_backupwrite(), allows more secure handling of problems
+	  with failing to write the backup file compared to 'allow_insecure_backup'.
+	* winio.c (edit_redraw): Removed unused variable.
+
+GNU nano 2.2.6 - 2010.11.22
 2010-11-15 Chris Allegretta <chrisa@asty.org>
 	* Add a section to the FAQ about using nanorc on Win32 systems.
 
 2010-11-12 Chris Allegretta <chrisa@asty.org>
-	* Add check for RESTRICTED mode back to speller, suspend and insert file
-	  routines, since adding key bindings broke the fact that they should be
-	  disabled in restricted mode.  Fixes Savannah bug 31625 reported by
-	  Charlie Somerville.
-
-2010-08-10 - nano 2.2 branch cut here
+	* Add check for RESTRICTED mode back to speller, suspend and insert file routines,
+	  since adding key bindings broke the fact that they should be disabled in restricted\
+	  mode.  Fixes Savannah bug #31625 reported by Charlie Somerville.
 
 GNU nano 2.2.5 - 2010.08.05
 2010-08-04 Lauri Kasanen <curaga@operamail.comcuraga@operamail.com>
-        * doc/syntax/mgp.nanorc: New Magicpoint syntax highlighting definition
+	* doc/syntax/mgp.nanorc: New Magicpoint syntax highlighting definition.
 
 2010-08-04 Peter <exodus@savannah>
 	* doc/syntax/tex.nanorc: No longer highlight escaped comments
@@ -19,82 +1573,81 @@ GNU nano 2.2.5 - 2010.08.05
 2010-06-20 Chris Allegretta <chrisa@asty.org>
 	* New rc file option allow_insecure_backup, allows the previous security
 	  fixes for backup files to be overridden if you're really positive
-	  you want to.  Fixes Savannah bug 29732 by Brian Szymanski <skibrianski>.
+	  you want to.  Fixes Savannah bug #29732 by Brian Szymanski <skibrianski>.
 
 2010-05-23 Chris Allegretta <chrisa@asty.org>
 	* files.c (write_file): Don't even try to chown() the backup
 	  file unless we're root, since it's probably going to fail if
 	  we're editing a file we don't own.  Fixes Savannah bug
-	  29514: [nano 2.2.2] backup should ignore chown errors.
+	  #29514: [nano 2.2.2] backup should ignore chown errors.
 
 GNU nano 2.2.4 - 2010.04.15
 2010-04-07 Chris Allegretta <chrisa@asty.org>
 	* doc/man/nano.1,nanorc.5: Remove the backup file warnings now
-          that a sufficient security fix exists for the backup file code.
+	  that a sufficient security fix exists for the backup file code.
 
 2010-04-14 Chris Allegretta <chrisa@asty.org>
-	* text.c (do_alt_speller): Skip invoking the alt speller if the file size 
-	  is 0 bytes.  Fixes Savannah bug 29393 reported by Mike Frysinger.
-	* files.c (wirte_file): Don't set current_stat when tmp == TRUE, check
+	* text.c (do_alt_speller): Skip invoking the alt speller if the file size
+	  is 0 bytes.  Fixes Savannah bug #29393 reported by Mike Frysinger.
+	* files.c (write_file): Don't set current_stat when tmp == TRUE, check
 	  whether current_stat is set when trying to use it, and don't do the
 	  modification check if the filename changed, since we have no way
-	  of knowing about it in that case.  Fixes Savannah bug 29392, reported
+	  of knowing about it in that case.  Fixes Savannah bug #29392, reported
 	  by Mike Frysinger.  [CVE-2010-1160]
 
 2010-04-13 Felipe Bugno <necron@bol.com.br>
 	* doc/syntax/cmake.nanorc: Added cmake syntax highlighting file.
 
 2010-04-09 Chris Allegretta <chrisa@asty.org>
-	* files.c (do_writeout): Better security fixes for backup file writing, 
-	  mangled from submission by Dan Rosenberg <dan.j.rosenberg at gmail> 
-          [CVE-2010-1161]
+	* files.c (do_writeout): Better security fixes for backup file writing,
+	  mangled from submission by Dan Rosenberg <dan.j.rosenberg at gmail>.
+	  [CVE-2010-1161]
 
 2010-04-08 Chris Allegretta <chrisa@asty.org>
-	* files.c (do_writeout): Previous fixes should not cause a crash 
+	* files.c (do_writeout): Previous fixes should not cause a crash
 	  when saving a new file.  Discovered by Mike Frysinger <vapier@gentoo.org>.
 
 2010-04-07 Chris Allegretta <chrisa@asty.org>
 	* doc/man/nano.1,nanorc.5: Add warnings about using backup
 	  mode as root due to the Dan Rosenberg security analysis.
- 
+
 2010-04-02 Chris Allegretta <chrisa@asty.org>
 	* files.c (do_writeout): Expand modification check to include both the
-	  original file's device ID and inode number as reasons to warn the 
-          user that the file has been modified.  Also abort on writing a backup
-	  file when its owner doesn't match the edited file. Based on security 
-	  analysis on nano by Dan Rosenberg. [CVE-2010-1160]
-
+	  original file's device ID and inode number as reasons to warn the
+	  user that the file has been modified.  Also abort on writing a backup
+	  file when its owner doesn't match the edited file.  Based on security
+	  analysis on nano by Dan Rosenberg.  [CVE-2010-1160]
 
 2010-03-21 Chris Allegretta <chrisa@asty.org>
 	* nano.c (page_stdin et al): Don't attempt to reset/reopen the terminal
-	  settings when reading stdin if it was aborted with SIGINT.  May fix Savannah
-	  bug 29114 reported by  Mike Frysinger.
+	  settings when reading stdin if it was aborted with SIGINT.  May fix
+	  Savannah bug #29114 reported by Mike Frysinger.
 
 2010-03-21 Mike Frysinger <vapier@gentoo.org>
-	* doc/syntax/c.nanorc: Add additional support for #include_next and #pragma
+	* doc/syntax/c.nanorc: Add additional support for #include_next and #pragma.
 
 2010-03-21 Chris Allegretta <chrisa@asty.org>
-	* move.c (do_page_up, do_page_down()): Explicitly set current_y to 0 when paging 
-	  up when not in smooth scroll mode, as previous fixes would otherwise cause 
-	  the cursor to not really be moved to the stop of the screen.
+	* move.c (do_page_up, do_page_down()): Explicitly set current_y to 0 when
+	  paging up when not in smooth scroll mode, as previous fixes would otherwise
+	  cause the cursor to not really be moved to the top of the screen.
 
 2010-03-07 Chris Allegretta <chrisa@asty.org>
 	* configure.ac, nano.c (handle_sigwinch): Create check for whether LINES and
-	  COLS can safely be redefined.  Fixes compilation issues with cygwin, and likely
-	  with newer versions of ncurses, fixes Savannah bug 28984 repoted by Andy Koppe
-          and Eric Oliver via mailing list.
-	* winio.c (get_mouseinput) - fix stray semicolon in code, also reported in
-	  bug 28984.
+	  COLS can safely be redefined.  Fixes compilation issues with Cygwin, and likely
+	  with newer versions of ncurses.  Fixes Savannah bug #28984 reported by Andy Koppe
+	  and by Eric Oliver via mailing list.
+	* winio.c (get_mouseinput): Fix stray semicolon in code, also reported in
+	  bug #28984.
 
 GNU nano 2.2.3 - 2010.02.11
 2010-01-28 Chris Allegretta <chrisa@asty.org>
-	* move.c (do_page_up, do_page_down): Fix for smooth mode not preserving cusor 
-	  position.  Part one of fix for Savannah bug 21178 by Mike Frysinger.
+	* move.c (do_page_up, do_page_down): Fix for smooth mode not preserving cursor
+	  position.  Part one of fix for Savannah bug #21178 by Mike Frysinger.
 
 GNU nano 2.2.2 - 2010.01.17
 2010-01-17 Chris Allegretta <chrisa@asty.org>
-	* nano.c (main), prompt.c (do_statusbar_input): Handle problems with an unmapped 
-	  function due to key rebinding, fixes crashes on FreeBSD repoted by Eitan 
+	* nano.c (main), prompt.c (do_statusbar_input): Handle problems with an unmapped
+	  function due to key rebinding, fixes crashes on FreeBSD reported by Eitan
 	  Adler <eitanadlerlist@gmail.com>.
 
 2010-01-14 Chris Allegretta <chrisa@asty.org>
@@ -104,9 +1657,9 @@ GNU nano 2.2.2 - 2010.01.17
 2010-01-12 Chris Allegretta <chrisa@asty.org>
 	* move.c (do_page_up, do_page_down): Fix issues with not enough scrolling down/up
 	  and cursor centering.
-	* winio.c (edit_scroll): Remove lots of needless checking of line length for 
+	* winio.c (edit_scroll): Remove lots of needless checking of line length for
 	  soft wrapping code.
-	* winio.c (edit_update) - Remove extra code for when updating with old_current outside
+	* winio.c (edit_update): Remove extra code for when updating with old_current outside
 	  of the new buffer boundary and centering issues.
 
 2010-01-05 Tito <farmatito@tiscali.it>
@@ -129,94 +1682,93 @@ GNU nano 2.2.2 - 2010.01.17
 
 2009-12-20 Chris Allegretta <chrisa@asty.org>
 	* files.c (is_file_writable): remove assert check for f, since it's not
-	  initialized at the time.  Fixes Savannah bug 28309, reported by Zoltan Kovacs.
+	  initialized at the time.  Fixes Savannah bug #28309, reported by Zoltan Kovacs.
 
 2009-12-20 Brian Szymanski <skibrianski via Savannah>
-	* src/files.c (write_file): Check stat struct exists, and if not use just obtained stat data.
-	  Fixes Ubuntu bug 471568, "reproducible crash in nano on trying to save to a file 
-	  different than the one specified on the command line".
+	* src/files.c (write_file): Check whether stat struct exists, and if not, use the
+	  just obtained stat data.  Fixes Ubuntu bug 471568, "reproducible crash in nano on
+	  trying to save to a file different than the one specified on the command line".
 
 2009-12-15 Chris Allegretta <chrisa@asty.org>
-	* doc/nanorc.sample.in - Remove erroneous 'set suspendenable' as it's actually a 
+	* doc/nanorc.sample.in: Remove erroneous 'set suspendenable' as it's actually a
 	  key binding (e.g. 'bind M-Z suspendenable all') and not a settable flag.  Fixes
-	  Savannah bug 28299 reported by Mike Frysinger.
+	  Savannah bug #28299 reported by Mike Frysinger.
 
 GNU nano 2.2.1 - 2009.12.12
 2009-12-12 Chris Allegretta <chrisa@asty.org>
-	* text.c (do_delete), nano.c (do_output): Add check for length of current line 
+	* text.c (do_delete), nano.c (do_output): Add check for length of current line
 	  before and after adding/deleting text, and do full refresh if it is now
 	  a different multiple of COLS.  Also get rid of superfluous do_refresh
 	  vars now that we have edit_refresh_needed.
 
 2009-12-09 David Lawrence Ramsey <pooka109@gmail.com>
-	* global.c (shortcut_init), browser.c (do_browser): Fix M-W not being bound to 
+	* global.c (shortcut_init), browser.c (do_browser): Fix M-W not being bound to
 	  research in either main menu or browser.
 
 2009-12-09 Chris Allegretta <chrisa@asty.org>
-	* files.c (read_file) - Add parameter for whether we should even try to check
-	  file writability, as the message is useless when we're inserting into an 
-	  existing buffer.  Fixes Savannah bug 28219.
+	* files.c (read_file): Add parameter for whether we should even try to check
+	  file writability, as the message is useless when we're inserting into an
+	  existing buffer.  Fixes Savannah bug #28219.
 
 2009-12-07 David Lawrence Ramsey <pooka109@gmail.com>
 	* global.c (shortcut_init): Many fixes for keybindings code oversights, including
-	  restore page up/down and GotoDir to browser, 
-	* browser.c (do_browser): Fix breaking out of a submenu (e.g. gotodir) breaks out
-	  of browser altogether.
+	  restore page up/down and GotoDir in browser.
+	* browser.c (do_browser): Fix breaking out of a submenu (e.g. gotodir), it broke
+	  out of the browser altogether.
 	* doc/nanorc.sample.in: Add missing entries for fortran/ObjC/OCaml entries.
 
 2009-12-03 David Lawrence Ramsey <pooka109@gmail.com>
-	* global.c (shortcut_init) - Remove help shortcut from help shortcut list :-)  Tweaked 
+	* global.c (shortcut_init): Remove help shortcut from help shortcut list. :-)  Tweaked
 	  to reorder exit shortcut to end of list to not mess up prev/next shortcut symmetry.
 
 2009-12-03 Eitan Adler <eitanadlerlist@gmail.com>
-	* doc/syntax/makefile.nanorc - Fix poor regex for all alpha characters which sometimes leads to
-	  error messages, reported by gibboris@gmail.com.
+	* doc/syntax/makefile.nanorc: Fix poor regex for all alpha characters which sometimes
+	  leads to error messages, reported by gibboris@gmail.com.
 
 2009-12-02 Chris Allegretta <chrisa@asty.org>
-	* text.c (add_undo, do_undo, do_redo) - Do not execute cases for SPLIT when DISABLE_WRAPPING
-	  is defined.  Fixes Savannah bug 28151 (anon).
+	* text.c (add_undo, do_undo, do_redo): Do not execute cases for SPLIT when
+	  DISABLE_WRAPPING is defined.  Fixes Savannah bug #28151 (anon).
 
 2009-12-02 Jordi Mallach <jordi@gnu.org>
 	* doc/man/nano.1: Fix escaping of hyphens for the -$ option.
 
 2009-12-01 Kamil Dudka <kdudka@redhat.com>
-	* chars.c, file.c - Better handle unused results for things like mbtowc(), new
+	* chars.c, file.c: Better handle unused results for things like mbtowc(), new
 	  macro IGNORE_CALL_RESULT.
 
 2009-12-01 Chris Allegretta <chrisa@asty.org>
-	* global.c (shortcut_init) - Remove redundant entries for ^Y/^V reported by
+	* global.c (shortcut_init): Remove redundant entries for ^Y/^V reported by
 	  Christian Weisgerber.
-	* doc/man/nanorc.5 - Fix typo in Meta documentation, reported by gibboris@gmail.com.
+	* doc/man/nanorc.5: Fix typo in Meta documentation, reported by <gibboris@gmail.com>.
 
 2009-12-01 David Lawrence Ramsey <pooka109@gmail.com>
-	* global.c (shortcut_init) - Add support for ^P and ^N in the help menu.
+	* global.c (shortcut_init): Add support for ^P and ^N in the help menu.
 	* Update documentation for 2.2 features including sample nanorc file, texinfo
-	  file, man pages, UPGRADE file, and update copyright noticed for the current year.
+	  file, man pages, UPGRADE file, and update copyright notice for the current year.
 
 GNU nano 2.2.0 - 2009.11.30
 2009-11-29 Chris Allegretta <chrisa@asty.org>
-	* prompt.c (get_prompt_string) - Universally handle help key when is 
-disabled.  Fixes Savannah
-	  bug 28117 by David Lawrence Ramsey <pooka109@gmail.com>.
+	* prompt.c (get_prompt_string): Universally handle help key when it is disabled.
+	  Fixes Savannah bug #28117 by David Lawrence Ramsey <pooka109@gmail.com>.
 	* chars.c, files.c: Add junk vars to silence the compiler.  Sigh.
 
 2009-11-29 David Lawrence Ramsey <pooka109@gmail.com>
 	* Change several *chars to const char, additional cleanups and casts to make compilers happier.
 	* global.c: Fix replace and insert file initializations for proper compilation options.
-	* nano.c (do_suspend): Update comments to reflect actual code path, bad Chris and thanks for
-	  noticing Jordi.
-	* configure.ac: Fix typos
+	* nano.c (do_suspend): Update comments to reflect actual code path, bad Chris, and thanks for
+	  noticing, Jordi.
+	* configure.ac: Fix typos.
 
 2009-11-27 Chris Allegretta <chrisa@asty.org>
 	* nano.c (do_suspend): Don't clear the screen but do move the cursor down to the last line
 	  first in an effort to not corrupt the screen, which contradicts Pico but is consistent
-	  with almost all other text editors.  Fixes Savannah bug 28110/Debian bug 460510
+	  with almost all other text editors.  Fixes Savannah bug #28110 / Debian bug 460510
 	  reported by Tim Connors <reportbug@rather.puzzling.org>.
-	* doc/dyntax/makefile.nanorc - Sample Makefile highlighting based on wiki.linuxhelp.net version.
+	* doc/syntax/makefile.nanorc: Sample Makefile highlighting based on wiki.linuxhelp.net version.
 
 2009-11-26 Chris Allegretta <chrisa@asty.org>
 	* winio.c (edit_scroll): Adjust for long lines when scrolling.
-	* rcfile.c (parse_rcfile), initialize size argument to getline(), fixes crash on FreeBSD 
+	* rcfile.c (parse_rcfile): initialize size argument to getline(), fixes crash on FreeBSD
 	  reported by Eitan Adler <eitanadlerlist@gmail.com>.
 
 2009-11-26 Jordi Mallach <jordi@gnu.org>
@@ -229,91 +1781,90 @@ disabled.  Fixes Savannah
 
 2009-11-22 Chris Allegretta <chrisa@asty.org>
 	* nano.c (main): Allow edit_refresh_needed to take effect when using --enable-tiny
-	  (fixes Savannah bug 28076 reported by David Lawrence Ramsey).
+	  (fixes Savannah bug #28076 reported by David Lawrence Ramsey).
 
 2009-11-22 David Lawrence Ramsey <pooka109@gmail.com>
-	* nano.c (move_to_filestruct): Fix bug 71 (cut at top of line recenters)
-	* Fix compilation with --enable-tiny
+	* nano.c (move_to_filestruct): Fix bug 71 (cut at top of line recenters).
+	* Fix compilation with --enable-tiny.
 
 2009-11-22 Mike Frysinger <vapier@gentoo.org>
 	* doc/syntax/gentoo.nanorc: Tweak comment highlighting.
 
 GNU nano 2.1.99pre2 - 2009.11.21
 2009-11-21 Chris Allegretta <chrisa@asty.org>
-	* rcfile.c: Add unbinding keyword, fixes Savannah bug 22852 reported by frankd.
+	* rcfile.c: Add unbinding keyword, fixes Savannah bug #22852 reported by frankd.
 	* prompt.c (update_statusbar_line): Set statusbar_pww when updating the line.
-	  Fixes Savannah bug 24957 by Mike Frysinger.
+	  Fixes Savannah bug #24957 reported by Mike Frysinger.
 
 2009-11-19 Chris Allegretta <chrisa@asty.org>
-	* nano.c (die_save_file) Try nd match the permissions of the file we were
-	  editing but only make a minimal effort to do so. Fixes Savannah bug 27273
+	* nano.c (die_save_file) Try and match the permissions of the file we were
+	  editing but only make a minimal effort to do so. Fixes Savannah bug #27273
 	  reported by Mike Frysinger.
 
 2009-11-18 Adrian Bunk <bunk via Savannah>
-	* nano.c (main): Allow --fill and --nowrap to override nanorc entries and each other
-          on the command line.
+	* nano.c (main): Allow --fill and --nowrap to override nanorc entries
+	  and each other on the command line.
 
 2009-11-15 Chris Allegretta <chrisa@asty.org>
 	* winio.c (edit_refresh): Always computer maxsize regardless of whether smooth scrolling
-	  is enabled.  Fixes Savannah bug 28024 by Mike Frysinger.
+	  is enabled.  Fixes Savannah bug #28024 by Mike Frysinger.
 
 GNU nano 2.1.99pre1 - 2009.11.15
 2009-11-14 Chris Allegretta <chrisa@asty.org>
-	* move.c (do_first_line, do_last_line): Just set edit_refresh_needed rather than 
-	  get messy.
-	* files.c (do_writeout) - Only mention file modification if we're writing the same
-	  file we originally opened.
+	* move.c (do_first_line, do_last_line): Just set edit_refresh_needed
+	  rather than get messy.
+	* files.c (do_writeout): Only mention file modification if we're
+	  writing the same file we originally opened.
 
 2009-11-13 Chris Allegretta <chrisa@asty.org>
-	* winio.c: Add new static maxsize to be able to easier calculation with
-	  softwrap.
-	* nano.c (do_mouse): Fix mouse support not working with soft wrapping.  Fixes
-	  Savannah bug 27549 reported by Hannes Schueller.
+	* winio.c: Add new static maxsize for easier calculation with softwrap.
+	* nano.c (do_mouse): Fix mouse support not working with soft wrapping.
+	  Fixes Savannah bug #27549 reported by Hannes Schueller.
 
 2009-11-11 Chris Allegretta <chrisa@asty.org>
-	* winio.c: Large tweaking of cursor and text display based on COLS not COLS - 1, 
+	* winio.c: Large tweaking of cursor and text display based on COLS not COLS - 1,
 	  due to finally understanding that display_string wasn't being called properly
-	  when softwrap was enabled.  Fixes Savnnah bug 27603, Return key doesn't scroll 
-	  viewport reported by Hannes Schueller.
-	* - Fix size_t formatting issues with -pedantic
+	  when softwrap was enabled.  Fixes Savannah bug #27603, "Return key doesn't scroll
+	  viewport" reported by Hannes Schueller.
+	* Fix size_t formatting issues with -pedantic
 
 2009-11-09 Chris Allegretta <chrisa@asty.org>
-	* files.c (read_file): - Remove debugging messages from file load.  Fixes
-	  Savannah bug 27838.
+	* files.c (read_file): Remove debugging messages from file load.
+	  Fixes Savannah bug #27838.
 
 2009-11-07 Chris Allegretta <chrisa@asty.org>
-	* nano.h - Add bogus value at begin of flags enumeration because it
-	  causes casesens rcfile option to misbehave, reported by Helmut 
-	  Jarausch <jarausch@igpm.rwth-aachen.de>
+	* nano.h: Add bogus value at begin of flags enumeration because it
+	  caused the casesens rcfile option to misbehave, reported by Helmut
+	  Jarausch <jarausch@igpm.rwth-aachen.de>.
 
 2009-11-03 Chris Allegretta <chrisa@asty.org>
-	* nano.h - Fix comma at end of enumerator list which angers -pedantic.
-	* rcfile.c - Add in specific check for UNDOABLE and fix declaration as
+	* nano.h: Fix comma at end of enumerator list which angers -pedantic.
+	* rcfile.c: Add in specific check for UNDOABLE and fix declaration as
 	  to what flag it toggles.  Fixes undo mode being able to be called from
-	  the rc file, reported by Helmut Jarausch <jarausch@igpm.rwth-aachen.de>
+	  the rc file, reported by Helmut Jarausch <jarausch@igpm.rwth-aachen.de>.
 
 2009-11-03 Mike Frysinger <vapier@gentoo.org>
-	* files.c - Move up is_file_writable() to stop implicit definition complaints.
+	* files.c: Move up is_file_writable() to stop implicit definition complaints.
 
 2009-10-27 Chris Allegretta <chrisa@asty.org>
-	* browser.c (browser_init): Set column width to something sane when 
+	* browser.c (browser_init): Set column width to something sane when
 	  initializing in a directory with no file entries.  Fixes Savannah
-	  bug 24163 found (and initial patch) by Paul Wise.
+	  bug #24163 found (and initial patch) by Paul Wise.
 
 2009-09-15 Chris Allegretta <chrisa@asty.org>
 	* winio.c: Clean up some unused variables from the soft wrapping code.
 
 GNU nano 2.1.11 - 2009.09.14
 2009-09-12 Chris Allegretta <chrisa@asty.org>
-	* winio.c (edit_update) - properly update edittop when using soft wrapping.
-	  Fixes lack of centering for searching for off-screen answers, found by 
-	  Hannes <mr_creosote@mutantwatch.de>.
+	* winio.c (edit_update): properly update edittop when using soft wrapping.
+	  Fixes lack of centering for searching for off-screen answers, found by
+	  Hannes Schueller <mr_creosote@mutantwatch.de>.
 
 2009-09-03 Chris Allegretta <chrisa@asty.org>
 	* global.c (shortcut_init): Fix up/down keys not responding in the file browser,
-	  discovered by Hannes <mr_creosote@mutantwatch.de>.
-	* move.c (do_up) - Fix another scrolling issue with softwrap when the
-	  cursor is beyond COLS, discovered by Hannes <mr_creosote@mutantwatch.de>.
+	  discovered by Hannes Schueller <mr_creosote@mutantwatch.de>.
+	* move.c (do_up): Fix another scrolling issue with softwrap when the cursor
+	  is beyond COLS, discovered by Hannes Schueller <mr_creosote@mutantwatch.de>.
 
 2009-09-02 Chris Allegretta <chrisa@asty.org>
 	* Attempt to check file writability and emit a warning on the status bar
@@ -322,49 +1873,49 @@ GNU nano 2.1.11 - 2009.09.14
 
 2009-08-29 Chris Allegretta <chrisa@asty.org>
 	* Fix more soft wrapping issues, particularly with scrolling,
-	  discovered by Hannes <mr_creosote@mutantwatch.de>.
+	  discovered by Hannes Schueller <mr_creosote@mutantwatch.de>.
 
 2009-08-19 Chris Allegretta <chrisa@asty.org>
 	* Fix issue with soft wrapping not displaying the last character of each line,
-	  fixed bug discovered by Hannes <mr_creosote@mutantwatch.de>.
+	  fixed bug discovered by Hannes Schueller <mr_creosote@mutantwatch.de>.
 
 2009-08-17 Mike Frysinger <vapier@gentoo.org>
 	* doc/syntax/(gentoo|sh|tcl).nanorc: Fix problems with empty regexes on POSIX.
-	  Fixes Savannah bug 27175.
+	  Fixes Savannah bug #27175.
 
 2009-08-17 Chris Allegretta <chrisa@asty.org>
-	* Initial soft line wrapping implementation.  Command line flags
-	  -$ or --softwrap.  
+	* Initial soft line wrapping implementation.  Command-line flags -$ or --softwrap.
 	* nano.c, text.c: Clean up some fprintf warnings in debug mode due to printing
 	  a size_t without using the zd specifier.
+
 2009-08-13 Chris Allegretta <chrisa@asty.org>
 	* New global flag implementation courtesy of Adam Wysocki <gophi@arcabit.pl>, allows
- 	  previous undo flag to be implemented consistent with other flags.
+	  previous undo flag to be implemented consistent with other flags.
 
 GNU nano 2.1.10 - 2009.07.28
 2009-07-27 Chris Allegretta <chrisa@asty.org>
-	* text.c (undo_cut, redo_cut): Don't actually try and undo/redo an empty cut, i.e. the magicline. 
+	* text.c (undo_cut, redo_cut): Don't actually try and undo/redo an empty cut, i.e. the magicline.
 	  Fixes crash on cutting last line discovered by Eitan Adler <eitanadlerlist@gmail.com>.
 
 2009-07-11 Chris Allegretta <chrisa@asty.org>
-	* nano-regress: Small tweaks
-	* Change undo code to off unless unabled via a command line option (-u/--undo).  Until this code
-	  stabilizes this is the only responsible way to treat it.
+	* nano-regress: Small tweaks.
+	* Change undo code to off unless enabled via a command line option (-u/--undo).
+	  Until this code stabilizes this is the only responsible way to treat it.
 
 2009-03-08 Chris Allegretta <chrisa@asty.org>
-	* TODO - Break out some targets for various features into 2.2 
+	* TODO: Break out some targets for various features into 2.2
 	  and 2.4 series for things which are feasible.
 
 2009-02-28 Chris Allegretta <chrisa@asty.org>
 	* configure.ac: Add check for whether _XOPEN_SOURCE_EXTENDED is needed for
-	  curses to work w/color.  Fixes compilation on HP-UX with older GCC, 
+	  curses to work w/color.  Fixes compilation on HP-UX with older GCC,
 	  reported by jay.krell@cornell.edu.
 
 2009-02-23 Eitan Adler <eitanadlerlist@gmail.com>
-	* doc/man/Makefile.am: Fix make variable substitution to be more portable
+	* doc/man/Makefile.am: Fix make variable substitution to be more portable.
 
 2009-02-23 Chris Allegretta <chrisa@asty.org>
-	* rcfile.c (parse_keybinding) - Define a var before tryung to use it.  Whoops!
+	* rcfile.c (parse_keybinding): Define a var before tryung to use it.  Whoops!
 	* fix some redefinitions causing compiler warnings, from Eitan Adler.  Other
 	  (hopefully) fixes for uncasted malloc()s, reported by the same.
 	* doc/man/fr/Makefile.am: Add groff check fix to fr files.
@@ -373,19 +1924,19 @@ GNU nano 2.1.9 - 2009.02.16
 2009-02-16 Chris Allegretta <chrisa@asty.org>
 	* Add new argument to reset_multis for force redraws without attempting to
 	  guess whether we need to, for functions that we don't have good info about
-	  the text state.  New utility function color.c:reset_multis_for_id().  
+	  the text state.  New utility function color.c:reset_multis_for_id().
 
 2009-02-15 Chris Allegretta <chrisa@asty.org>
-	* configure.ac, doc/man/Makefile.am - Add check for HTML output support in GNU
+	* configure.ac, doc/man/Makefile.am: Add check for HTML output support in GNU
 	  groff.  Fixes Savannah bug #24461: build traps on groff.  Also, add installation
 	  of html-ized man pages to $datadir/nano/man-html, since we should probably
 	  install files we went to all the trouble of generating.
 
 2009-02-14 Chris Allegretta <chrisa@asty.org>
-        * nano.c (precalc_multicolorinfo) - Add debugging so we have a better clue if further
-          issues arise.   Also start at the beginning of later lines when trying to match the
-          end of a multi-line regex.  Fixes more overly aggressive highlighting found by 
-          Mike Frysinger.  Finally, advance to the match end for performance.
+	* nano.c (precalc_multicolorinfo): Add debugging so we have a better clue if further
+	  issues arise.  Also start at the beginning of later lines when trying to match the
+	  end of a multi-line regex.  Fixes more overly aggressive highlighting found by
+	  Mike Frysinger.  Finally, advance to the match end for performance.
 
 2009-02-11 Chris Allegretta <chrisa@asty.org>
 	* nanorc.c (parse_include): Do call real_dir_from_tilde() on included
@@ -397,7 +1948,7 @@ GNU nano 2.1.9 - 2009.02.16
 	  errors about the rcfile and asking user to press enter.  Also, nano should
 	  now only ask for one enter press when there is an error when not using -q.
 	  Based on discussion between Eitan Adler and Mike Frysinger.
-	* rcfile.c (parse_keybinding) -  Significant cleanups and fixes for 
+	* rcfile.c (parse_keybinding): Significant cleanups and fixes for
 	  detecting and reporting errors in key bindings code.
 
 2009-02-08 Chris Allegretta <chrisa@asty.org>
@@ -409,23 +1960,24 @@ GNU nano 2.1.9 - 2009.02.16
 
 GNU nano 2.1.8 - 2009.02.07
 2009-02-06 Chris Allegretta <chrisa@asty.org>
-	* rcfile.c (parse_include): Abort on being unable to open an included rcfile.  Fixes
-	  Savannah bug 25490, nanorc: "include"ing a file which doesn't exist causes nano to segfault.
+	* rcfile.c (parse_include): Abort on being unable to open an included rcfile.
+	  Fixes Savannah bug #25490, nanorc: "include"ing a file which doesn't exist
+	  causes nano to segfault.
 
 2009-02-05 Chris Allegretta <chrisa@asty.org>
-	* More color syntax speedups:  Determine in reset_multis() whether we really need to call
+	* More color syntax speedups: Determine in reset_multis() whether we really need to call
 	  edit_refresh().  Additional global var edit_refresh_needed() to hopefully reduce
-	  repeated calls to the function.  New helper funcs reset_multis_before() and 
+	  repeated calls to the function.  New helper funcs reset_multis_before() and
 	  reset_multis_after().
 
 2009-02-02 Chris Allegretta <chrisa@asty.org>
 	* New color precalculation code for mult-line regexes.  New function precalc_multicolorinfo(),
-	  new structure multidata for keeping track of where regexes start/stop.  More 
+	  new structure multidata for keeping track of where regexes start/stop.  More
 	  performance improvements forthcoming.
 
 2009-01-29 Chris Allegretta <chrisa@asty.org>
-	* nano.c (move_to_filestruct) - properky initialize new fileage for multiswatching, sigh.
-	  Fix cut sefaults discovered by Mike Frysinger.
+	* nano.c (move_to_filestruct): Properly initialize new fileage for multiswatching, sigh.
+	  Fix cut segfaults discovered by Mike Frysinger.
 
 2009-01-29 Chris Allegretta <chrisa@asty.org>
 	* nano.c (main): Add support for nano acting like a pager when invoked with - as first
@@ -435,21 +1987,20 @@ GNU nano 2.1.8 - 2009.02.07
 	* doc/syntax/gentoo.nanorc: Updates from David and Mike Frysinger.
 
 2009-01-25 Chris Allegretta <chrisa@asty.org>
-	* files.c (open_file), nanorc.c (parse_include): Don't get_full_path on 
-	  included rc files, due to it potentially impacting the ability
-	  to read files in nano's cwd().  Fixes Savnanah bug #25297 reported by Mike 
-	  Frysinger)
+	* files.c (open_file), nanorc.c (parse_include): Don't get_full_path on included
+	  rc files, due to it potentially impacting the ability to read files in nano's
+	  cwd().  Fixes Savnanah bug #25297 reported by Mike Frysinger.
 
 2009-01-24 Chris Allegretta <chrisa@asty.org>
 	* First pass at some caching of caching color info.  Right now it's only for
 	  multi-line regexes but this may not be enough to increase performance.
 	* Add interruptability to search functions.  New functions enable_nodelay and
 	  disable_nodelay and changes to the routines to handle checking for pending
-	  searches.  Fixes Savnnah bug 24946: Need interrrupt for search.
+	  searches.  Fixes Savnnah bug #24946: Need interrrupt for search.
 
 2009-01-19 Chris Allegretta <chrisa@asty.org>
 	* Change function definitions to shorts instead of (void *)s.  New mapping function
-          iso_me_harder_funcmap().  Fixes compilation complaints with -pedantic, 
+	  iso_me_harder_funcmap().  Fixes compilation complaints with -pedantic,
 	  reported by Eitan Adler <eitanadlerlist@gmail.com>.
 
 GNU nano 2.1.7 - 2008.11.10
@@ -459,139 +2010,141 @@ GNU nano 2.1.7 - 2008.11.10
 
 2008-10-14 Chris Allegretta <chrisa@asty.org>
 	* nanorc.5: Fix redo man page entry and update explanation, reported by
-	  Eitan Adler <eitanadlerlist@gmail.com>
+	  Eitan Adler <eitanadlerlist@gmail.com>.
 	* global.c (shortcut_init), search.c (search_init): Fix add_to_sclist for ^W^T so
-	  invalid messages will display properly.  Fixes Savannah bug 24507.
+	  invalid messages will display properly.  Fixes Savannah bug #24507.
 
 2008-10-13 Chris Allegretta <chrisa@asty.org>
 	* Remove CUTTOEND as an undo type as it's unneeded, fix u->to_end logic in undo struct.
-	* undo.c (update_undo): Don't free cutbuffer if NULL, fix for Savannah bug #24499
+	* undo.c (update_undo): Don't free cutbuffer if NULL, fixes Savannah bug #24499.
 
 2008-10-04 Chris Allegretta <chrisa@asty.org>
-	* cut.c (Add_undo): Save last cut undo information so it can be used for next uncut, fixes
-	  Savannah bug 24183.
+	* cut.c (add_undo): Save last cut undo information so it can be used for
+	  next uncut, fixes Savannah bug #24183.
 
 GNU nano 2.1.6 - 2008.10.03
 2008-10-03 Pascal Gentil <pascal.gentil@univ-rennes1.fr>
-	* fortran.nanorc: Sample python syntax highlighting file
+	* fortran.nanorc: Sample Fortran syntax highlighting file.
 
 2008-09-30 Dirkjan Ochtman <dirkjan@ochtman.nl>
-	* python.nanorc: Small python syntax update
+	* python.nanorc: Small Python syntax update.
 
 2008-09-30 <bluestorm_dylc@hotmail.com>
-	* ocaml.nanorc: Sample OCaml syntax highlighting file
+	* ocaml.nanorc: Sample OCaml syntax highlighting file.
 
 2008-09-30 Dave Geering <dgeering@toshiba-tap.com>
-	* objc.nanorc: Sample Objective-C Syntax Hightlighting file
+	* objc.nanorc: Sample Objective-C syntax hightlighting file.
 
 2008-09-30 Chris Allegretta <chrisa@asty.org>
-        * configure.ac: Change extra, multibuffer, color and rcfile configure options to default to enabled
-          --enable-tiny will now disable these options as well
-	* python.nanorc, ruby.nanorc: Add header lines for python and ruby as well
+	* configure.ac: Change extra, multibuffer, color and rcfile configure options
+	  to default to enabled --enable-tiny will now disable these options as well.
+	* python.nanorc, ruby.nanorc: Add header lines for Python and Ruby as well.
 
 2008-09-21 Chris Allegretta <chrisa@asty.org>
-	* rcfile.c, color.c, nano.h: Add new capability for matching a syntax type by the "header" (1st line)
-	  of a file being edited.  Based on Savannah bug 24197 and inital proof of concept by Dave Geering 
-	  <dgeering@toshiba-tap.com>
+	* rcfile.c, color.c, nano.h: Add new capability for matching a syntax type by
+	  the "header" (1st line) of a file being edited.  Based on Savannah bug #24197
+	  and initial proof of concept by Dave Geering <dgeering@toshiba-tap.com>.
 
 2008-09-16 Chris Allegretta <chrisa@asty.org>
-	* text.c: Add support for undoing a text uncut.  Split out the undo and redo of a text cut 
-	  in order to avoid code duplication.
+	* text.c: Add support for undoing a text uncut.  Split out the undo and redo
+	  of a text cut in order to avoid code duplication.
 
 2008-09-06 Chris Allegretta <chrisa@asty.org>
-	* nano.c: Do call disable_signals at startup regardless, since under cygwin we can't generate
-	  ^C without it.
+	* nano.c: Do call disable_signals at startup regardless, since under Cygwin
+	  we can't generate ^C without it.
 
 GNU nano 2.1.5 - 2008.08.30
 2008-08-29 Chris Allegretta <chrisa@asty.org>
-	* configure.ac, color.c, rcfile.c, utils.c: 1st attempt at supporting systems which don't support
-	  GNU-style word boundaries.  New function fixbounds() to translate from GNU-style to 
-	  BSD-style, autoconf option GNU_WORDBOUNDS.
-	* nano-regress: New perl script to check for some of the more obvious issues with compilation
-	  issues with certain configure options.
-	* global.c, help.c, browser.c, files.c, proto.h: Fix several compipation and programmatic 
-	  issues with --disable-help, especially that do-writeout was treating ^G the same as ^M.
+	* configure.ac, color.c, rcfile.c, utils.c: 1st attempt at supporting systems
+	  which don't support GNU-style word boundaries.  New function fixbounds() to
+	  translate from GNU-style to BSD-style, autoconf option GNU_WORDBOUNDS.
+	* nano-regress: New perl script to check for some of the more obvious issues
+	  with compilation issues with certain configure options.
+	* global.c, help.c, browser.c, files.c, proto.h: Fix several compilation and
+	  programmatic issues with --disable-help, especially that do-writeout was
+	  treating ^G the same as ^M.
 
 2008-08-28 Chris Allegretta <chrisa@asty.org>
-	* configure.ac, rcfile.c:  Add support for an alternate rcfilename at configure time.  Maybe this
+	* configure.ac, rcfile.c: Add support for an alternate rcfilename at configure time.  Maybe this
 	  should become a command line option some day, but I don't see the need currently.  Start of
 	  fix for Savannah bug #24128: Add nanorc support to win32 platform.
 
 2008-08-21 Chris Allegretta <chrisa@asty.org>
-	* text.c: Change error messages where we may possibly get into a bad state and urge
-	  the user to save when this happens.  Originally by Benno Schulenberg <bensberg@justemail.net>
-	* text.c (do_enter):  Fix issue when compiled with --enable-debug, fixes Savannah bug 24092.
+	* text.c: Change error messages where we may possibly get into a bad state and urge the
+	  user to save when this happens.  Originally by Benno Schulenberg <bensberg@justemail.net>
+	* text.c (do_enter): Fix issue when compiled with --enable-debug, fixes Savannah bug #24092.
 
 2008-08-08 Magnus Granberg <zorry@ume.nu> / Adam Conrad <?>
-	* files.c (write_file): Add needed flags to open() calls when writing out files.  Fixes Savannah bug 
-	  #23827: Compilation fails with -D_FORTIFY_SOURCE=2
+	* files.c (write_file): Add needed flags to open() calls when writing out files.
+	  Fixes Savannah bug #23827: Compilation fails with -D_FORTIFY_SOURCE=2.
 
 2008-08-08 Chris Allegretta <chrisa@asty.org>
-	* files.c (write_file): Check exit code of fclose(), since in certain out of space conditions the OS will
-	  happily report successful fwrite()s until you try and close the file.  Fix for Savannah bug
-	  #24000: no free space on partition - nano claims successful write - file empty 
+	* files.c (write_file): Check the exit code of fclose(), since in certain
+	  out-of-space conditions the OS will happily report successful fwrite()s
+	  until you try and close the file.  Fixes Savannah bug #24000: no free
+	  space on partition - nano claims successful write - file is empty.
 
 GNU nano 2.1.4 - 2008.08.09
 2008-08-08 Chris Allegretta <chrisa@asty.org>
-	* files.c (write_file): Do not go on and attempt to write the main file if writing the backup file failed,
-	  related to Savannah bug 24000.
+	* files.c (write_file): Do not go on and attempt to write the main file if writing
+	  the backup file failed, related to Savannah bug #24000.
 	* text.c (do_redo): Fix improperly restoring the text when redoing a line split.
-        * text.c (add_undo): Fix check for multi-line cut check skips adding other new legit events.
+	* text.c (add_undo): Fix check for multi-line cut check skips adding other new legit events.
 
 2008-07-23 Chris Allegretta <chrisa@asty.org>
-	* text.c: Reset openfile-> to OTHER after an undo or redo so we don't mistakenly
+	* text.c: Reset openfile-> to OTHER after an undo or redo so we don't
 	  mistakenly think this is an update when it's really an add.  Also
-          Fix an extra ; after an if statement which makes nano try to free a struct which
-          may be NULL
+	  fix an extra ; after an if statement which makes nano try to free
+	  a struct which may be NULL.
 
 GNU nano 2.1.3 - 2008.08.04
 2008-07-23 Chris Allegretta <chrisa@asty.org>
-	* configure.ac: Add ncursesw dir to include path if lib detected
+	* configure.ac: Add ncursesw dir to include path if lib is detected.
 
 2008-07-11 Mike Frysinger <vapier@gentoo.org>
 	* doc/nanorc.sample.in: Include the updates files in the default sample nanorc.
 
 2008-07-11 Fabian Groffen <grobian@gentoo.org>
 	* nano.c: Don't include langinfo.h if not using ENABLE_UTF8
-	  (Savannah patch 6565)
+	  (Savannah patch #6565).
 
 2008-07-11 Mitsuya Shibata <mty.shibata@gmail.com>
 	* text.c: Fix crashing in help menu when using certain locales
-	  (Savannah bug 23751)
+	  (Savannah bug #23751).
 
 2008-07-09 Chris Allegretta <chrisa@asty.org>
-        * nano.c/nano.h/global.c/text.c: New generalized undo code, currently
+	* nano.c/nano.h/global.c/text.c: New generalized undo code, currently
 	  just works for adding and deleting text and splitting and unsplitting lines.
 
 2008-06-29 Chris Allegretta <chrisa@asty.org>
-	* global.c: Fix for not having search history when --disable-justify is used
-	  (Savannah bug 23733)
+	* global.c: Fix for not having a search history when --disable-justify is used
+	  (Savannah bug #23733).
 
 
 GNU nano 2.1.2 - 2008.06.24
 2008-06-24 Chris Allegretta <chrisa@asty.org>
 	* rcfile.c: Added function check_bad_binding() to look for sequences which
-	  shouldn't be bound, per Savannah bug 22674.
+	  shouldn't be bound, per Savannah bug #22674.
 
 2008-05-31 Chris Allegretta <chrisa@asty.org>
-	* prompt.c,search.c,global.c: Tentative fix for bug #23144: using arrow 
-	  keys in search buffer affects main window (by Mike Frysinger)
+	* prompt.c,search.c,global.c: Tentative fix for bug #23144: using arrow
+	  keys in search buffer affects main window (by Mike Frysinger).
 
 2008-05-31 Chris Allegretta <chrisa@asty.org>
-	* global.c: Fix for Savannah bug #23442: left/right arrow keys 
-	  do not work with --enable-tiny (by Mike Frysinger)
+	* global.c: Fix for Savannah bug #23442: left/right arrow keys
+	  do not work with --enable-tiny (by Mike Frysinger).
 
 2008-05-31 Chris Allegretta <chrisa@asty.org>
 	* files.c,proto.h,text.c: Fix for conflicts with AIX curses
-	  variables, from William Jojo <jojowil@hvcc.edu>
+	  variables, from William Jojo <jojowil@hvcc.edu>.
 
 2008-05-31 Chris Allegretta <chrisa@asty.org>
-	* global.c: Fix for compile error when --disable-speller is used 
-	  (Savannah bug 23227 by Mike Frysinger)
+	* global.c: Fix for compile error when --disable-speller is used
+	  (Savannah bug #23227 by Mike Frysinger).
 
 2008-05-31 Chris Allegretta <chrisa@asty.org>
-	* Fix for seg fault when window size too small, by 
-          Andreas Amann <andreas.amann@tyndall.ie>
+	* Fix for seg fault when window size is too small,
+	  by Andreas Amann <andreas.amann@tyndall.ie>.
 
 GNU nano 2.1.1 - 2008.04.01
 2008-05-31 Chris Allegretta <chrisa@asty.org>
@@ -614,41 +2167,41 @@ GNU nano 2.1.1 - 2008.04.01
 	  issue.
 
 2008-03-19  Chris Allegretta <chrisa@asty.org>
-	* gloabl.c: Fix bracket matching sequence to be M-] not M-[, as reported
+	* global.c: Fix bracket matching sequence to be M-] not M-[, as reported
 	  Nick Warne <nick@ukfsn.org>.
-	* doc/syntax/Makefile.am - Actually include new syntaxes from Mike, etc
-	* debian.nanorc - New debian sources.list config since we're including
-	  gentoo, adapted from Milian Wolff <mail@milianw.de>
+	* doc/syntax/Makefile.am: Actually include new syntaxes from Mike, etc.
+	* debian.nanorc: New debian sources.list config since we're including
+	  gentoo, adapted from Milian Wolff <mail@milianw.de>.
 
 2008-03-18  Mike Frysinger <vapier@gentoo.org>
-	* winio.c: Remove unneeded variable in parse_kbinput()
-	* rcfile.c: relocate check_vitals_mapped() function to just above 
-	  where it actually gets used and declare it "static void" in the process
-	* global.c: only declare nano_justify_msg when justify support is enabled
-	* php.nanorc: Php syntax highlighting config
-	* tcl.nanorc: Tcl syntax highlighting config
-	* gentoo.nanorc: Gentoo syntax highlighting config
+	* winio.c: Remove unneeded variable in parse_kbinput().
+	* rcfile.c: Relocate check_vitals_mapped() function to just above where
+	  it actually gets used and declare it "static void" in the process.
+	* global.c: Only declare nano_justify_msg when justify support is enabled.
+	* php.nanorc: Php syntax highlighting config.
+	* tcl.nanorc: Tcl syntax highlighting config.
+	* gentoo.nanorc: Gentoo syntax highlighting config.
 
 2008-03-17  Benno Schulenberg <bensberg@justemail.net>
 	* global.c: Fix incorrect first line jump messsage, fix
-	  more comments to assist translators
+	  more comments to assist translators.
 	* winio.c: Fix shortcut labels not being translated.
 
 2008-03-17  Mike Frysinger <vapier@gentoo.org>
-	 * */.gitignore: Git ignore files for those running a local git
-	   against SVN.
+	* */.gitignore: Git ignore files for those running a local git
+	  against SVN.
 
 2008-03-16  Benno Schulenberg <bensberg@justemail.net>
-	* src/help.c, src/global: Fix help strings no longer being 
+	* src/help.c, src/global: Fix help strings no longer being
 	  translated properly.
-	* src/global.c, doc/man/nanorc.5: Fix typos and poorlly worded lines
-	  in the source and man pages.
+	* src/global.c, doc/man/nanorc.5: Fix typos and poorly worded
+	  lines in the source and man pages.
 
 2008-03-04  Chris Allegretta <chrisa@asty.org
 	* everything: New shortcut backend.  New structs subnfunc
-	for menu functions and toggles and sc for shortcut keys, old 
-	'shortcut' and 'toggles' structs are gone.  The current implementation 
-	has a bunch of broken stuff (some of which is documented in BUGS). 
+	for menu functions and toggles and sc for shortcut keys, old
+	'shortcut' and 'toggles' structs are gone.  The current implementation
+	has a bunch of broken stuff (some of which is documented in BUGS).
 	Updated nanorc.5 with some mostly complete documentation on configuring.
 
 2007-12-20  David Lawrence Ramsey  <pooka109@gmail.com>
diff --git a/INSTALL b/INSTALL
index 7d1c323..2099840 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -12,8 +12,8 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented
@@ -226,6 +226,11 @@ order to use an ANSI C compiler:
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
@@ -304,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
 
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -362,4 +368,3 @@ operates.
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
-
diff --git a/Makefile.am b/Makefile.am
index 9f696c7..af890cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,8 @@
-## $Id: Makefile.am 4227 2008-03-15 23:14:34Z astyanax $
+## $Id: Makefile.am 5026 2014-06-27 20:20:14Z bens $
 AUTOMAKE_OPTIONS = gnu no-dependencies
 
 SUBDIRS = doc m4 po src
 
-EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING COPYING.DOC ChangeLog \
-		ChangeLog.pre-2.1 INSTALL NEWS README README.SVN \
-		THANKS TODO UPGRADE config.rpath install-sh missing \
-		mkinstalldirs nano.spec
+EXTRA_DIST = ChangeLog.pre-2.1 README.SVN UPGRADE nano.spec
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/Makefile.in b/Makefile.in
index 275e550..e54697f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -33,16 +77,16 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-target_triplet = @target@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/nano.spec.in $(top_srcdir)/configure ABOUT-NLS \
-	AUTHORS COPYING COPYING.DOC ChangeLog INSTALL NEWS THANKS TODO \
-	config.guess config.rpath config.sub depcomp install-sh \
-	missing mkinstalldirs
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.h.in mkinstalldirs $(srcdir)/nano.spec.in \
+	ABOUT-NLS COPYING COPYING.DOC THANKS TODO compile config.guess \
+	config.rpath config.sub depcomp install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
+	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -56,32 +100,75 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = nano.spec
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 depcomp =
 am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -109,10 +196,14 @@ am__relativize = \
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -158,6 +249,11 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NCURSESW_CFLAGS = @NCURSESW_CFLAGS@
+NCURSESW_CONFIG = @NCURSESW_CONFIG@
+NCURSESW_LIBS = @NCURSESW_LIBS@
+NCURSES_CFLAGS = @NCURSES_CFLAGS@
+NCURSES_LIBS = @NCURSES_LIBS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -169,6 +265,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKGDATADIR = @PKGDATADIR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -198,6 +296,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+haveit = @haveit@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -222,27 +321,19 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-target = @target@
 target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = gnu no-dependencies
 SUBDIRS = doc m4 po src
-EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING COPYING.DOC ChangeLog \
-		ChangeLog.pre-2.1 INSTALL NEWS README README.SVN \
-		THANKS TODO UPGRADE config.rpath install-sh missing \
-		mkinstalldirs nano.spec
-
+EXTRA_DIST = ChangeLog.pre-2.1 README.SVN UPGRADE nano.spec
 ACLOCAL_AMFLAGS = -I m4
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -278,10 +369,8 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -297,22 +386,25 @@ nano.spec: $(top_builddir)/config.status $(srcdir)/nano.spec.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -327,57 +419,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -393,12 +440,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -410,15 +452,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -427,9 +465,31 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -465,13 +525,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -500,36 +557,42 @@ distdir: $(DISTFILES)
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
 
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -540,8 +603,8 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -551,17 +614,19 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -584,13 +649,21 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -621,10 +694,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -705,23 +783,23 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	ctags-recursive install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
-	distclean distclean-generic distclean-hdr distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
+.MAKE: $(am__recursive_targets) all install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
+	distcheck distclean distclean-generic distclean-hdr \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/NEWS b/NEWS
index bd73632..c3e21d0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,55 +1,168 @@
-2010.11.22 - GNU nano 2.2.6 "Pimp my BBS" wants you to go to 
-		www.desertbus.org and donate a few bucks for the great 
-		Child's Play Charity!  This is just a small release to 
-		update a bug where restricted mode was not particularly 
-		restricted since key bindings were introduced. It also 
-		signals the return of win32 builds which now feature 
+2015.03.22 - GNU nano 2.4.0 "lizf" is released.  This is the first
+		stable release in many years, and brinds together many
+		new features from the 2.3 series: including:
+		a fully functional undo system (now enabled by default),
+		vim-compatible file locking, linter support, formatter
+		support, syntax highlighting flexibility, and many fixes
+		for issues reported since 2.2.  Many sincere thanks
+		to all of the bug reports, patches, well wishes and
+		contributions from everyone who has continued to
+		support us.  Thank you for using nano!
+
+
+2015.02.27 - GNU nano 2.3.99pre3 "Ashley" is released.  This is likely
+		to be the last release before the next major (2.4.0)
+		release.  Please test it out and send us any feedback
+		via the Savannah bug page for nano
+		(https://savannah.gnu.org/bugs/?group=nano).  This
+		release includes fixes for rebinding toggles via
+		nanorc, several memory alignment fixes, and documentation
+		and build updates.  As always thank you for using
+		nano - Share and Enjoy!
+
+2015.02.06 - GNU nano 2.3.99pre2 "Snowblind" is released.  This release
+		contains only fixes, including: a long-standing problem
+		with cutting in nano-tiny, several memory alignment
+		improvements, and issues with leftover file locks.  Please
+		keep reporting bugs so we can get a happy and healthy
+		2.4.0 soon.  Thanks for using nano!
+
+2015.01.06 - GNU nano 2.3.99pre1 "Junior" is released.  As the first
+		2.4 release candidate there will be fewer new features
+		but many bugfixes going forward.  This release contains
+		new support for language reformatters like go's gofmt
+		command which takes the place of the spelling checker.
+		Fixes in this release include many syntax highlighting
+		fixes and improvements, and documentation formatting updates.
+		As always please report bugs via the Savannah bug page for
+		nano (https://savannah.gnu.org/bugs/?group=nano), so we can
+		release a super awesome and bug-free 2.4.0 soon!
+
+2014.07.17 - GNU nano 2.3.6 "Columbo" is released.  This release
+		contains a fix for installing internationalization
+		files.  Also included are scattered documentation
+		(in particular man page) fixes, and a few touch ups
+		to syntax highlighting definitions.  Oh, just one
+		more thing, thanks for using nano!
+
+2014.07.11 - GNU nano 2.3.5 "lucky day" is released.  This release
+		contains many visible and under-the-hood fixes for
+		components such as file locking, more fixes to the
+		undo system, and you no longer have to explicitly ask
+		nano to have undo/redo support as it now defaults to
+		being enabled.  Other notable fixes include a better
+		handling of --tempfile mode, and better handling of
+		command line arguments when also attempting to specify
+		+<line number>.  As always, please file any bugs you
+		find at the Savannah page for nano, at
+		https://savannah.gnu.org/bugs/index.php?42639 and
+		thanks for using nano.
+
+2014.06.02 - GNU nano 2.3.4 won't leave you high, won't leave you dry. This
+		release contains only a small number of fixes, but in
+		particular allows nano to compile on non-UTF8 curses
+		implementations (i.e. libncursesw).  Other small fixes to
+		the undo implementation and the default syntax config are
+		also included. As always, Share and Enjoy!
+
+2014.05.28 - GNU nano 2.3.3 is in its right place.  This release contains
+		many many improvements to the core system, including
+		substantial improvements to the undo/redo code, UTF-8
+		handling, the configure script, and display of shortcuts
+		on very wide terminals,  New features include the
+		ability to read named pipes (--noread), as well as
+		linter support (see the nanorc man page for details).  Also
+		included are much improved syntax highlighting code, and
+		configurations for JSON, texinfo, Go, and a default syntax
+		for catch all highlighting. Finally, nano now has the
+		ability to set the color of the title bar, status bar, and
+		shortcut keys (e.g. "^X") and their descriptions.  Again
+		see the nanorc page for details.  There's much more, too
+		much to include here, but please keep those reports and
+		general feedback coming!  Thank you for helping us help
+		you help us all.
+
+2013.03.22 - GNU nano 2.3.2 "Annoy your coworkers for fun and profit" is
+		released.  This release introduces vim-style file locking
+		(though not backup/restore), useful when using nano
+		in a multi-editor environment.  Feedback is welcome if
+		you run into any issues with this new code.  Other new
+		features include additional support for word boundary
+		checking when cross compiling, fixes for trying to go to
+		an invalid line number, and the usual documentation
+		tweaks.
+
+2011.05.10 - GNU nano 2.3.1 "I'm in space" is released.  This
+		release includes some fixes for the new libmagic code, as
+		well as a fix for improper character counts when using
+		auto-indent.  Also included are new syntax highlighting
+		definitions for RPM spec and lua files.  Thanks for
+		using nano and keep circulating the tapes.
+
+2011.02.26 - GNU nano 2.3.0 "Septic surprise" is released.  This first
+		release in the 2.3 unstable series brings several new
+		features.  First, libmagic support for syntax highlighting
+		has been added on top of the existing file extension
+		and header support already available.  Secondly, cursor
+		position can be saved between editing sessions with
+		the -P or --poslog command-line flag, or via "set poslog"
+		in your .nanorc.  Also included are some fixes for
+		compilation with g++, and better handling of issues
+		writing the backup file, which should reduce the need
+		for the 'set allow_insecure_backup" nanorc option.
+		Don't stop, get it get it, don't stop, get it get it.
+
+2010.11.22 - GNU nano 2.2.6 "Pimp my BBS" wants you to go to
+		www.desertbus.org and donate a few bucks for the great
+		Child's Play Charity!  This is just a small release to
+		update a bug where restricted mode was not particularly
+		restricted since key bindings were introduced.  It also
+		signals the return of win32 builds which now feature
 		nanorc support; please see the FAQ for details of how
-		to enable it, this feature is a bit of a kludge for now.   
+		to enable it, this feature is a bit of a kludge for now.
 		Remember that when all else fails, USE SPACE JUMP.
 
 2010.08.05 - GNU nano 2.2.5 "Inactivity timeout" is now available.
-		This release includes slightly less restrictive checkng
-		when writing files in strange environments (e.g. 
-		when being used out of crontab).  For very strange situations
+		This release includes slightly less restrictive checking
+		when writing files in strange environments (e.g. when
+		being used out of crontab).  For very strange situations
 		(such as where you cannot change the permissions on the
-		file you're writing, there is a new rc file option 
+		file you're writing), there is a new rc file option
 		"allow_insecure_backup" to be even more permissive and
-		allowing the write to proceed.  Also included are
-		some syntax highlighting updated, and that is about it.
+		allow the write to proceed.  Also included are some
+		syntax highlighting updates, and that is about it.
 		Keep fighting the good fight children.
 
 2010.04.15 - GNU nano 2.2.4 is nobody's fool.  First and foremost,
-		this relase includes some security fixes due to
+		this release includes some security fixes due to
 		an assessment of nano's vulnerability to symlink attacks
 		on open files.  The CVEs fixed with this release are
 		CVE-2010-1160 and CVE-2010-1161.  Also included are fixes
 		for various crash modes when using the spell checker
 		on new files in multibuffer mode (surely you've used
-		that combination recently? No?) as well as a fixing
-		the 'file was modified' message when saving to a 
+		that combination recently? no?) as well as a fixing
+		the 'file was modified' message when saving to a
 		new filename (since how would nano know?).  And
-		the list would not be complete without our 
+		the list would not be complete without our
 		third-times-the-charm fixes to page up/down due to
-		the soft wrapping code.  The lone new feature 
-		included is a new syntax higlighting definition for 
+		the soft wrapping code.  The lone new feature
+		included is a new syntax highlighting definition for
 		cmake-related files.  Please do consider upgrading to
 		this release if still using the 2.0 series since
 		fixes for that version are still forthcoming.
 
-
 2010.02.11 - GNU nano 2.2.3 "fumbling toward stability" is released.
-		This release contains a fix for only one bug, but a 
-		rather irritating one: when paging up/down with smooth 
-		scrolling, the cursor position was not being preserved 
-		due to a bug in 2.2.2. With such a targeted fix 
+		This release contains a fix for only one bug, but a
+		rather irritating one: when paging up/down with smooth
+		scrolling, the cursor position was not being preserved
+		due to a bug in 2.2.2. With such a targeted fix
 		like this what could POSSIBLY go WRONG?  Hahaha.
 		Enjoy and if you find new bugs, as always please
 		use Savannah's bug tracker.
 		http://savannah.gnu.org/bugs/?func=additem&group=nano
 
 2010.01.17 - GNU nano 2.2.2 is released for you, you, you.  This
-		release includes fixes for: crashed when writing
+		release includes fixes for: crashes when writing
 		backup files in certain conditions, improper
 		screen centering when moving up/down in various
 		combination of smooth scrolling and soft wrapping modes,
@@ -62,19 +175,18 @@
 
 2009.12.12 - GNU nano 2.2.1 "DLR strikes back" is open for business.
 		This release fixes many bugs, including: missing
-		keybindings for page up/down and GotoDir in the browser, 
-		^P/^N in the help menu, and restoration of M-W as the 
+		keybindings for page up/down and GotoDir in the browser,
+		^P/^N in the help menu, and restoration of M-W as the
 		default re-search binding.  Other fixes include several
-		issues with compiler warnings and configure options, and 
-		documentation updates, including the nano texinfo manual, 
+		issues with compiler warnings and configure options, and
+		documentation updates, including the nano texinfo manual,
 		nano and nanorc man pages, and UPGRADE file, and some
-		missing syntax highliting entries for the saple nanorc.
+		missing syntax highliting entries for the sample nanorc.
 		And no release would be complete without the latest round
-		of 'final' soft wrapping fixes!  Finally, nano will no 
-		longer print a warning when attempting to insert the 
-		contents of a read-only file into an existing buffer.  
+		of 'final' soft wrapping fixes!  Finally, nano will no
+		longer print a warning when attempting to insert the
+		contents of a read-only file into an existing buffer.
 		Enjoy and Happy Hanukkah.
-		
 
 2009.11.30 - GNU nano 2.2.0 "Doc Brown" is released!  The culmination
 		of almost two years of development and hot on the heels
@@ -83,54 +195,54 @@
 		include several fixes for tiny mode (involving both
 		the help keys and replace menu text), more 'final'
 		fixes for soft wrapping, and several typo and documentation
-		updates including nanorc tweaks and a new syntax 
+		updates including nanorc tweaks and a new syntax
 		highlighting file for makefiles. Also included is a long
 		standing fix for random crashing when using nanorc on
 		FreeBSD, and nano will no longer clear the screen on
 		suspend to maintain compatibility with other *nix editors.
 		For those who haven't been playing along at home, please
 		see the official web page for the summary of new
-		features since 2.0.  Special thanks to all who have 
-		submitted bug reports recently in support of our new 
-		stable release, and apologies for all those bugs we 
+		features since 2.0.  Special thanks to all who have
+		submitted bug reports recently in support of our new
+		stable release, and apologies for all those bugs we
 		didn't yet find :-) Peace to all.
 
 2009.11.21 - GNU nano 2.1.99pre2 is available for a special pre-Black
 		Friday discount.  Included are some (hopefully
 		final) fixes for issues with last page display
 		caused by the soft wrapping code, and a fix for
-		a long standing issue with hittig the home key when 
+		a long standing issue with hittig the home key when
 		going through the search history.  On the features
-		front, nano will now attempt to retain the proper 
-		ownership and permissions when trying to create a 
-		.save file due to receiving a signal.  Nano can also 
-		now unbind keys from one or more menus via the 'unbind' 
-		keyword.   Finally, passing --fill or --nowrap on 
-		the command line will now override any related 
-		.nanorc entries.  Speak now or forever hold your bugs!	
+		front, nano will now attempt to retain the proper
+		ownership and permissions when trying to create a
+		.save file due to receiving a signal.  Nano can also
+		now unbind keys from one or more menus via the 'unbind'
+		keyword.   Finally, passing --fill or --nowrap on
+		the command line will now override any related
+		.nanorc entries.  Speak now or forever hold your bugs!
 
 2009.11.15 - GNU nano 2.1.99pre1 "take a bow" is out there, man, it's
-		out there all right.  This release contains mainly 
-		bugfixes, underscoring that we are preparing for the 
-		next stable series release.  Included are many fixes 
-		for the new soft wrapping code, compiler warning tweaks, 
-		and the modification time warning no longer triggers 
-		when saving a file as a new name.  Also include are 
-		some fixes for various nanorc options, and there are 
-		surely more bugs to find before we call the code base 
+		out there all right.  This release contains mainly
+		bugfixes, underscoring that we are preparing for the
+		next stable series release.  Included are many fixes
+		for the new soft wrapping code, compiler warning tweaks,
+		and the modification time warning no longer triggers
+		when saving a file as a new name.  Also include are
+		some fixes for various nanorc options, and there are
+		surely more bugs to find before we call the code base
 		stable, so please keep those reports coming!
 
 2009.09.14 - GNU nano 2.1.11 is on very thin ice, very thin ice, very thin
 		ice.  This release includes two new features: first, nano
 		will check whether the current file is writable when it
 		is opened, and warn if it is not on the status bar. Secondly,
-		a new soft-wrapping (AKA full line display) option is 
+		a new soft-wrapping (AKA full line display) option is
 		available, which will attempt to fully display the contents
 		of lines longer than the width of the screen without the
 		usual truncation and a '$' symbol at the end of the line.
-		It can be enabled via Meta-$ inside the editor, via the 
-		-$ or --softwrap command line flags, or "set softwrap" 
-		in your .nanorc).  As always please report any bugs to the 
+		It can be enabled via Meta-$ inside the editor, via the
+		-$ or --softwrap command line flags, or "set softwrap"
+		in your .nanorc).  As always please report any bugs to the
 		nano Savannah project page
 		(http://savannah.gnu.org/bugs/?func=additem&group=nano)
 		Remember: data loss happens, back up your files.
@@ -140,76 +252,75 @@
 		compiler combos, various compiler warnings, and some crash
 		fixes in the undo code.  On the topic of the latter item,
 		the undo code is now marked as experimental since it can
-		cause severe stability and memory issues, and thus now 
-		requires a flag (-u, --undo) in order to enable it.  
-		Please feel free to continue to test the undo code and 
+		cause severe stability and memory issues, and thus now
+		requires a flag (-u, --undo) in order to enable it.
+		Please feel free to continue to test the undo code and
 		thanks again for using nano for your text editing needs.
 		Go team Nano!
 
 2009.02.16 - GNU nano 2.1.9 wonders what all that glass is doing on the
-		floor!  This release is primarily meant as a less buggy 
-		version of 2.1.8, particularly for issues with the new 
-		sped-up syntax highlighting code.  Other fixes include 
-		configure-time detection of groff HTML support before 
-		attempting to generate the HTML version of man pages, 
-		and using ~ or ~username syntax in .nanorc should now 
-		work again.  Also, nano will now only ask for one 
-		acknowledgement of errors it encounters when parsing 
-		nanorc files, and a new flag -q (--quiet) will silence 
-		these messages altogether.  Give it a go, and happy 
+		floor!  This release is primarily meant as a less buggy
+		version of 2.1.8, particularly for issues with the new
+		sped-up syntax highlighting code.  Other fixes include
+		configure-time detection of groff HTML support before
+		attempting to generate the HTML version of man pages,
+		and using ~ or ~username syntax in .nanorc should now
+		work again.  Also, nano will now only ask for one
+		acknowledgement of errors it encounters when parsing
+		nanorc files, and a new flag -q (--quiet) will silence
+		these messages altogether.  Give it a go, and happy
 		birthday lenny!
 
 2009.02.07 - GNU nano 2.1.8 "unsafe at any speed" is released.  This
-		release include some long overdue performance 
+		release include some long overdue performance
 		improvements in syntax color highlighting, the ability
 		to abort running searches (useful mainly when
 		editing very large files) and the ability to use nano
 		like a pager for viewing standard input (i.e. "nano -").
-		Additionally, there are gentoo syntax highlighting 
-		updates and fixes for issues with reading files 
-		in a directory with strange parent directory permissions. 
-		The key bindings code was also substantially changed 
-		in order to be more ISO-C compatible.  Be sure to use 
-		the Savannah page not only for bug reports but for any 
-		features you would like to see before the next stable 
+		Additionally, there are gentoo syntax highlighting
+		updates and fixes for issues with reading files
+		in a directory with strange parent directory permissions.
+		The key bindings code was also substantially changed
+		in order to be more ISO-C compatible.  Be sure to use
+		the Savannah page not only for bug reports but for any
+		features you would like to see before the next stable
 		series is released.  Have fun with it!
-		
 
 2008.11.10 - GNU nano 2.1.7 "Effingham" is ready to make good on those
 		campaign promises of lower bug rates and 50% more pie.
 		This release includes a new check for external
-		modifications when saving a file, some code and 
-		documentation cleanups, and more bug fixes for 
+		modifications when saving a file, some code and
+		documentation cleanups, and more bug fixes for
 		the new undo code (but we continue to welcome your bug
-		reports via the Savananh bug page at 
+		reports via the Savananh bug page at
 		http://savannah.gnu.org/bugs/?func=additem&group=nano.
 		Come get some.
 
 2008.10.03 - GNU nano 2.1.6 was for new features before it was against
-		them.  This release includes more undo capability, 
+		them.  This release includes more undo capability,
 		several new syntax highlighting configurations including
 		Objective C, OCaml, and Fortran, and a new capability
 		to activate highlighting based on the 1st line of the
-		file being edited.  Also, the new default configure 
+		file being edited.  Also, the new default configure
 		options now include color syntax highlighting, .nanorc
 		support, multibuffer and extras.  These items can still
 		be disabled and are not enabled with --enable-tiny.  Bug
-		fixes include better signal handling under Cygwin, and 
+		fixes include better signal handling under Cygwin, and
 		that's about it.  Again please remember to
-		submit bug reports via Savannah at 
+		submit bug reports via Savannah at
 		http://savannah.gnu.org/bugs/?func=additem&group=nano
-		as undo functions certainly need more testing.  
+		as undo functions certainly need more testing.
 		Bon appetit.
 
 2008.08.30 - GNU nano 2.1.5 is ready to lead on day one.  This release
 		contains a better fix for incorrectly reported successful
 		writes on full filesystems, more helpful messages when
-		an internal error occurs in the undo code, and fixes for 
-		various combinations of configure-time options and 
-		compiler flags.  Also included is new support for 
+		an internal error occurs in the undo code, and fixes for
+		various combinations of configure-time options and
+		compiler flags.  Also included is new support for
 		changing the rc file name at configure time, and
-		using GNU-style regexes for word-boundaries on systems 
-		which do not support them natively, as well as the ever 
+		using GNU-style regexes for word-boundaries on systems
+		which do not support them natively, as well as the ever
 		popular translation updates.  Rock the tarball.
 
 2008.08.09 - GNU nano 2.1.4 "I told you so!" is released.  This release
@@ -222,42 +333,42 @@
 		are likely to run out of space; see Savannah bug 24000.
 		Have fun with it!
 
-2008.08.04 - GNY nano 2.1.3 "least stable version ever" is released.  This
+2008.08.04 - GNU nano 2.1.3 "least stable version ever" is released.  This
 		release includes new (and experimental) undo and redo
-		functionality for most text operations.  The default 
+		functionality for most text operations.  The default
 		key bindings are Meta-U for undo and Meta-E for redo, but
 		these can be remapped using the new 2.1 keybinding code.
-		Also included are some fixes for configuring using wide 
-		curses, crashing when invoking the help menu with 
+		Also included are some fixes for configuring using wide
+		curses, crashing when invoking the help menu with
 		certain locales, and not saving the search history when
 		compiled with configure options.
 
 2008.04.24 - GNU nano 2.1.2 "New York City" is released.  This release
-		contains fixes for binding bad keys, some 
-		configure-specific compilation failures, and more issues 
-		with the new input back end and in particular the status 
-		bar.  Also fixed are some long standing issues with 
+		contains fixes for binding bad keys, some
+		configure-specific compilation failures, and more issues
+		with the new input back end and in particular the status
+		bar.  Also fixed are some long standing issues with
 		compiling on AIX, and a segfault when making the terminal
 		window too small.  Rest in Peace Tim and George!
 
 2008.04.01 - GNU nano 2.1.1 wont get fooled again.  This release contains
 		fixes for the new user-rebindable keys (in particular
 		bracket match which was mis-bound), and various
-		problems with translations and configure-related 
+		problems with translations and configure-related
 		compilation problems are now fixed as well.
-		It also contains new syntax highlighting 
-		definitions for TCL, PHP, Gentoo and Debian-related 
-		files, and some documentation updates as well. 
-		Please continue to send reports with the key 
+		It also contains new syntax highlighting
+		definitions for TCL, PHP, Gentoo and Debian-related
+		files, and some documentation updates as well.
+		Please continue to send reports with the key
 		binding code to the Savannah page
 		(https://savannah.gnu.org/bugs/?group=nano).
-		
+
 2008.03.18 - GNU nano 2.1.0 "under old mismanagement" is released.
 		This first release in the 2.1 development series
 		introduces rebinadble keys for most actions inside
-                the editor.  Please see the nanorc(5) page for
-		more information on configuring key bindings.  Please 
-		also report all keybinding bugs (crashes, missing 
+		the editor.  Please see the nanorc(5) page for
+		more information on configuring key bindings.  Please
+		also report all keybinding bugs (crashes, missing
 		menu functions) using the Savannah bug tracker URL,
 		https://savannah.gnu.org/bugs/?group=nano and
 		thanks for sticking with us!
@@ -735,10 +846,10 @@
 		new option to ignore rc files (-I,--ignorercfiles),
 		compatibility with -pedantic, handling null characters
 		before EOF, a slightly sportier nanorc.sample and more.
-			Fixes are included included for justification,
+			Fixes are included for justification,
 		the reading and writing file routines, resizing and fill
 		length, millions of memory leaks, the usage screen was
-		updated, and the the --quotestr and --regexp really work
+		updated, and the --quotestr and --regexp really work
 		now ;-)  Enjoy :)
 
 05/12/2002 - GNU nano 1.1.9 is released, happy Mother's Day!  This
@@ -896,7 +1007,7 @@
 		also features mutt's case insensitive string compare
 		function for more speed and less memory usage.  Two new
 		translations are included, Ukrainian and Russian.
-	
+
 05/12/2001 - GNU nano 1.0.2 is the "just the bugfixes ma'am" release.
 		The most noticeable fixes are for display errors using
 		page up/down with the marker code, and view mode (-v)
@@ -1063,7 +1174,7 @@
 
 08/03/2000 - Nano 0.9.15 is the "I can't think of a release description"
 		release.  There are the usual gala of display bugfixes,
-		a fix for the the nasty bug in -k mode that could create
+		a fix for the nasty bug in -k mode that could create
 		a loop in the file being edited, and some other code
 		cleanup.  Also, the -T option should now work regardless
 		of the curses library used.  Yay.
@@ -1315,4 +1426,4 @@
 		update your bookmarks, tell your friends, and all that
 		jazz.
 
-$Id: NEWS 4516 2010-08-11 02:42:32Z astyanax $
+$Id: NEWS 5128 2015-03-07 20:46:11Z bens $
diff --git a/README b/README
index abbb892..da80787 100644
--- a/README
+++ b/README
@@ -24,6 +24,7 @@ Overview
 How to compile and install nano
 
      Download the nano source code, then:
+
      tar zxvf nano-x.y.z.tar.gz
      cd nano-x.y.z
      ./configure
@@ -32,31 +33,30 @@ How to compile and install nano
 
      It's that simple.  Use --prefix with configure to override the
      default installation directory of /usr/local.
-     
-     If you configured with the "--enable-nanorc" option, after
-     installation you might copy the doc/nanorc.sample to your home
-     directory, rename it to ".nanorc", and then edit it according to
-     your taste.
+
+     If you haven't configured with the "--disable-nanorc" option, after
+     installation you may want to copy the doc/nanorc.sample to your
+     home directory, rename it to ".nanorc", and then edit it according
+     to your taste.
 
 Web Page
 
 	http://www.nano-editor.org/
 
-Mailing List and Bug Reports
+Mailing Lists and Bug Reports
 
 	Savannah hosts all the nano-related mailing-lists.
 
-	+ info-nano@gnu.org is a very low traffic list
-	  used to announce new nano versions or other important
-	  information about the project.
+	+ info-nano@gnu.org is a very low traffic list used to announce
+	  new nano versions or other important information about the
+	  project.
 	+ help-nano@gnu.org is for those seeking to get help without
-	  wanting to hear about the technical details of its
-	  development.
-	+ nano-devel@gnu.org is the list used by the people
-	  that make nano and a general development discussion list, with
-	  moderate traffic.
+	  wanting to hear about the technical details of its development.
+	+ nano-devel@gnu.org is the list used by the people that make
+	  nano and a general development discussion list, with moderate
+	  traffic.
 
-	To subscribe, send email to nano-<name>-request@gnu.org with a
+	To subscribe, send email to <name>-request@gnu.org with a
 	subject of "subscribe", where <name> is the list you want to
 	subscribe to.
 
@@ -65,8 +65,6 @@ Mailing List and Bug Reports
 
 Current Status
 
-	GNU nano has reached its third stable milestone, 2.0.x.
-	Development of new features continues in the 2.1.x branch, while
-	2.0.x versions are dedicated to bug-fixing and polishing.
-
-$Id: README 4057 2007-01-29 12:40:48Z dolorous $
+	GNU nano has reached its fourth stable milestone, 2.2.x.
+	Development of new features continues in the 2.3.x branch, while
+	2.2.x versions are dedicated to bug-fixing and polishing.
diff --git a/README.SVN b/README.SVN
index f5476f2..5dfa84d 100644
--- a/README.SVN
+++ b/README.SVN
@@ -17,7 +17,6 @@ packages:
 - groff    (version >= 1.12)
 - texinfo  (version >= 4.0)
 - subversion (aka svn)
-- ssh (with support for the SSH version 2 protocol)
 - glib 2.x (if your system doesn't have vsnprintf(), which the configure
   script will check for)
 - make, gcc and the normal development libraries (curses or slang, etc.)
@@ -30,15 +29,15 @@ to use UTF-8.
 Download the source
 -------------------
 
-To obtain the current nano development code (called 'trunk'), use the 
-following command.  It will create a copy of the files in a subdirectory 
+To obtain the current nano development code (called 'trunk'), use the
+following command.  It will create a copy of the files in a subdirectory
 of your current working directory called 'nano':
 
     $ svn co svn://svn.savannah.gnu.org/nano/trunk/nano
 
 If you want to download the stable SVN branch instead, use:
 
-    $ svn co svn://svn.savannah.gnu.org/nano/branches/nano_2_0_branch/nano
+    $ svn co svn://svn.savannah.gnu.org/nano/branches/nano_2_2_branch/nano
 
 
 Generate the configure script
@@ -83,5 +82,5 @@ you'll need to run that "make install" command with root privileges.
 Problems?
 ---------
 
-Please submit any bugs in the SVN branch using the Savannah project's 
-bug tracker (https://savannah.gnu.org/bugs/?group=nano)
+Please submit any bugs in the SVN branch using the Savannah project's
+bug tracker (https://savannah.gnu.org/bugs/?group=nano).
diff --git a/THANKS b/THANKS
index 4efd9ec..4c0c3e2 100644
--- a/THANKS
+++ b/THANKS
@@ -5,7 +5,7 @@ If we missed you here, let us know!
 Sharuzzaman Ahmat Raslan <sharuzzaman@excite.com>
 						Malay translator
 Laurentiu Buzdugan <buzdugan@voyager.net>	Romanian translator
-CHAO Wei-Lun <chaoweilun@pcmail.com.tw>		Traditional Chinese translator
+CHAO Wei-Lun <chaoweilun@pcmail.com.tw>		Chinese (traditional) translator
 Ricardo Cárdenes Medina <ricardo@conisys.com>	Spanish translator
 Marco Colombo <magicdice@inwind.it>		Italian translator
 Yavor Doganov <yavor@doganov.org>		Bulgarian translator
@@ -13,37 +13,63 @@ Karl Eichwalder <keichwa@gmx.net>		German translator
 Doruk Fisek <dfisek@fisek.com.tr>		Turkish translator
 Jean-Philippe Guérard <jean-philippe.guerard@laposte.net>
 						French translator
-Geir Helland					Norwegian bokmål translator
+Geir Helland <pjallabais@users.sourceforge.net>	Norwegian Bokmål translator
 Tedi Heriyanto <tedi_h@gmx.net>			Indonesian translator
 Václav Haisman <V.Haisman@sh.cvut.cz>		Czech translator
 Szabolcs Horvath <horvaths@janus.gimsz.sulinet.hu>
 						Hungarian translator
-Kalle Kivimaa <kalle.kivimaa@iki.fi>		Finnish Translator
-Eivind Kjørstad <ekj@vestdata.no>		Norwegian nynorsk translator
+Kalle Kivimaa <kalle.kivimaa@iki.fi>		Finnish translator
+Eivind Kjørstad <ekj@vestdata.no>		Norwegian Nynorsk translator
 Florian König <floki@bigfoot.com>		German translator
 Wojciech Kotwica <wkotwica@post.pl>		Polish translator
 Clement Laforet <clem_laf@wanadoo.fr>		French translator
+Daniele Medri <madrid@linux.it>			Italian translator
 Gergely Nagy <algernon@debian.org>		Hungarian translator
-Kalle Olavi Niemitalo <kon@iki.fi>		Finnish Translator
+Kalle Olavi Niemitalo <kon@iki.fi>		Finnish translator
+A. Murat EREN <meren@comu.edu.tr>		Turkish translator
 Claudio Neves <cneves@nextis.com>		Brazilian Portuguese translator
-Daniel Nylander <po@danielnylander.se>		Swedish Translator
+Daniel Nylander <po@danielnylander.se>		Swedish translator
 Michael Piefel <piefel@informatik.hu-berlin.de> German translator
-Sergey A. Ribalchenko <fisher@obu.ck.ua>	Russian, Ukrainian translator
+Sergey A. Ribalchenko <fisher@obu.ck.ua>	Ukrainian and Russian translator
 Michel Robitaille <robitail@IRO.UMontreal.CA>	French translator
 Christian Rose <menthos@menthos.com>		Swedish translator
-Stig E Sandoe <stig@ii.uib.no>			Norwegian bokmål translator
-Benno Schulenberg <benno@nietvergeten.nl>	Dutch translator
+Stig E Sandø <stig@ii.uib.no>			Norwegian Bokmål translator
+Benno Schulenberg <benno@vertaalt.nl>		Dutch and Esperanto translator
 Danilo Segan <dsegan@gmx.net>			Serbian translator
 Keld Simonsen <keld@dkuug.dk>			Danish translator
 Guus Sliepen <guus@nl.linux.org>		Dutch translator
 Cezary Sliwa <sliwa@cft.edu.pl>			Polish translator
 Pierre Tane <tanep@bigfoot.com>			French translator
 Jacobo Tarrío <jtarrio@trasno.net>		Galician translator
-Kjetil Torgrim Homme <kjetilho@linpro.no>	Norwegian nynorsk translator
+Kjetil Torgrim Homme <kjetilho@linpro.no>	Norwegian Nynorsk translator
 Miquel Vidal <miquel@sindominio.net>		Catalan translator
 Phan Vinh Thinh <teppi82@gmail.com>		Vietnamese translator
 Pauli Virtanen <pauli.virtanen@saunalahti.fi>	Finnish translator
 Peio Ziarsolo <peio@sindominio.net>		Basque translator
+Anton Zinoviev <zinoviev@debian.org>		Bulgarian translator
+João Victor Duarte Martins <jvdm@sdf.lonestar.org>
+						Brazilian Portuguese translator
+Kevin Patrick Scannell <kscanne@gmail.com>	Irish translator
+Gabor Kelemen <kelemeng@gnome.hu>		Hungarian translator
+Francisco Javier Tsao Santín <tsao@members.fsf.org>
+						Galician translator
+Dimitriy Ryazantcev <DJm00n@mail.ru>		Russian translator
+Clytie Siddall <clytie@riverland.net.au>	Vietnamese translator
+LI Daobing <lidaobing@gmail.com>		Chinese (simplified) translator
+Jorma Karvonen <karvonen.jorma@gmail.com>	Finnish translator
+Aron Xu <happyaron.xu@gmail.com>		Chinese (simplified) translator
+Pavel Fric <pavelfric@seznam.cz>		Czech translator
+Pavel Maryanov <acid@jack.kiev.ua>		Russian translator
+Sergey Poznyakoff <gray@gnu.org>		Polish translator
+Ask Hjorth Larsen <asklarsen@gmail.com>		Danish translator
+Trần Ng�c Quân <vnwildman@gmail.com>		Vietnamese translator
+Klemen Košir <klemen913@gmail.com>		Slovenian translator
+Yasuaki Taniguchi <yasuakit@gmail.com>		Japanese translator
+Jorge González <aloriel@gmail.com>		Spanish translator
+Johnny A. Solbu <johnny@solbu.net>		Norwegian Bokmål translator
+Миро�лав �иколић <miroslavnikolic@rocketmail.com>
+						Serbian translator
+
 
 Ben Armstrong <synrg@sanctuary.nslug.ns.ca>	Negative -r value idea, code
 Thomas Dickey <dickey@herndon4.his.com>		Curses help and advice
@@ -59,4 +85,4 @@ Jeremy Robichaud <robicj@yahoo.com>		Beta tester
 Bill Soudan <wes0472@rit.edu>			Regex code, etc
 Ken Tyler <kent@werple.net.au>			Search fixes and more
 
-$Id: THANKS 3303 2006-03-15 22:44:43Z jordi $
+$Id: THANKS 5098 2014-12-28 22:23:31Z bens $
diff --git a/TODO b/TODO
index 5756119..ed3e833 100644
--- a/TODO
+++ b/TODO
@@ -96,4 +96,4 @@ For version 1.0:
 - Unjustify command (^U after ^J) [DONE =-].
 - Username completion (~user) [DONE =-].
 
-$Id: TODO 4516 2010-08-11 02:42:32Z astyanax $
+$Id: TODO 4513 2010-08-06 01:20:51Z astyanax $
diff --git a/aclocal.m4 b/aclocal.m4
index f55b305..c807458 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,15 +11,176 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -31,10 +192,10 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.14.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -50,22 +211,22 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -84,7 +245,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -110,22 +271,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -144,16 +302,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -163,7 +319,7 @@ fi])])
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -176,12 +332,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -189,8 +346,9 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -229,16 +387,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -247,16 +405,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -304,7 +462,7 @@ AM_CONDITIONAL([am__fastdep$1], [
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -314,34 +472,39 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -354,7 +517,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -366,21 +529,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -398,7 +559,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
+# is enabled.  FIXME.  This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -408,18 +569,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 16
-
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -432,7 +596,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -461,31 +625,40 @@ AC_SUBST([CYGPATH_W])
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@@ -496,34 +669,78 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi])
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -545,7 +762,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -564,16 +781,14 @@ if test x"${install_sh}" != xset; then
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -589,14 +804,12 @@ AC_SUBST([am__leading_dot])])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -614,7 +827,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -641,15 +854,12 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -657,11 +867,10 @@ AC_DEFUN([AM_MISSING_PROG],
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -674,63 +883,35 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
+  AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -741,24 +922,82 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -769,32 +1008,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$[2]" = conftest.file
    )
 then
@@ -804,9 +1051,85 @@ else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -814,34 +1137,32 @@ AC_MSG_RESULT(yes)])
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -849,24 +1170,22 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -876,80 +1195,120 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 m4_include([m4/ac_define_dir.m4])
+m4_include([m4/ax_check_compile_flag.m4])
 m4_include([m4/gettext.m4])
 m4_include([m4/glib-2.0.m4])
 m4_include([m4/iconv.m4])
diff --git a/compile b/compile
new file mode 100755
index 0000000..531136b
--- /dev/null
+++ b/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/config.guess b/config.guess
index dc84c68..b79252d 100755
--- a/config.guess
+++ b/config.guess
@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2013-06-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -17,26 +15,22 @@ timestamp='2009-11-20'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -139,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -180,7 +194,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -201,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -223,7 +241,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +287,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,12 +316,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -394,23 +415,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -480,8 +501,8 @@ EOF
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -494,7 +515,7 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -551,7 +572,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -594,52 +615,52 @@ EOF
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -730,22 +751,22 @@ EOF
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -769,14 +790,14 @@ EOF
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -788,30 +809,35 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:*)
-    	case ${UNAME_MACHINE} in
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -848,15 +874,22 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -866,52 +899,56 @@ EOF
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -930,51 +967,63 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -983,11 +1032,11 @@ EOF
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1019,7 +1068,7 @@ EOF
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1047,13 +1096,13 @@ EOF
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1088,8 +1137,8 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1132,10 +1181,10 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1161,11 +1210,11 @@ EOF
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1178,6 +1227,9 @@ EOF
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1204,19 +1256,21 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		case $UNAME_PROCESSOR in
+		    i386) UNAME_PROCESSOR=x86_64 ;;
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
+	    fi
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1230,7 +1284,10 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1275,13 +1332,13 @@ EOF
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1299,11 +1356,11 @@ EOF
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
@@ -1321,11 +1378,11 @@ main ()
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 
diff --git a/config.h.in b/config.h.in
index 8fbe824..68b19bc 100644
--- a/config.h.in
+++ b/config.h.in
@@ -6,15 +6,30 @@
 /* Define this to disable the built-in file browser. */
 #undef DISABLE_BROWSER
 
+/* Define this to disable syntax highlighting. */
+#undef DISABLE_COLOR
+
+/* Define this to disable extra stuff. */
+#undef DISABLE_EXTRA
+
 /* Define this to disable the help text display. */
 #undef DISABLE_HELP
 
+/* Define this to disable search and position histories. */
+#undef DISABLE_HISTORIES
+
 /* Define this to disable the justify routines. */
 #undef DISABLE_JUSTIFY
 
 /* Define this to disable the mouse support. */
 #undef DISABLE_MOUSE
 
+/* Define this to disable multiple file buffers. */
+#undef DISABLE_MULTIBUFFER
+
+/* Define this to disable the use of .nanorc files. */
+#undef DISABLE_NANORC
+
 /* Define this to disable the setting of the operating directory (chroot of
    sorts). */
 #undef DISABLE_OPERATINGDIR
@@ -25,23 +40,13 @@
 /* Define this to disable the spell checker functions. */
 #undef DISABLE_SPELLER
 
-/* Define to disable the tab completion functions for files and search
+/* Define this to disable the tab completion functions for files and search
    strings. */
 #undef DISABLE_TABCOMP
 
 /* Define this to disable all text wrapping. */
 #undef DISABLE_WRAPPING
 
-/* Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC
-   too! */
-#undef ENABLE_COLOR
-
-/* Define this to enable multiple file buffers. */
-#undef ENABLE_MULTIBUFFER
-
-/* Define this to use .nanorc files. */
-#undef ENABLE_NANORC
-
 /* Define to 1 if translation of program messages to the user's native
    language is requested. */
 #undef ENABLE_NLS
@@ -51,7 +56,7 @@
    mblen(), mbstowcs(), mbtowc(), wctomb(), and wcwidth()). */
 #undef ENABLE_UTF8
 
-/* Define if the system supports GNU-style word boundaries in regexes. */
+/* Define this if the system supports GNU-style word boundaries in regexes. */
 #undef GNU_WORDBOUNDS
 
 /* Define to 1 if you have the <curses.h> header file. */
@@ -103,9 +108,18 @@
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H
 
+/* Define to 1 if you have the `magic' library (-lmagic). */
+#undef HAVE_LIBMAGIC
+
+/* Define to 1 if you have the `z' library (-lz). */
+#undef HAVE_LIBZ
+
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
+/* Define to 1 if you have the <magic.h> header file. */
+#undef HAVE_MAGIC_H
+
 /* Define to 1 if you have the `mblen' function. */
 #undef HAVE_MBLEN
 
@@ -127,6 +141,9 @@
 /* Define to 1 if you have the <regex.h> header file. */
 #undef HAVE_REGEX_H
 
+/* Define to 1 if you have the `snprintf' function. */
+#undef HAVE_SNPRINTF
+
 /* Define to 1 if you have the <stdarg.h> header file. */
 #undef HAVE_STDARG_H
 
@@ -187,8 +204,8 @@
 /* Define to 1 if you have the `wcwidth' function. */
 #undef HAVE_WCWIDTH
 
-/* Define this to enable extra stuff. */
-#undef NANO_EXTRA
+/* Define to 1 if you have the <zlib.h> header file. */
+#undef HAVE_ZLIB_H
 
 /* Define this to make the nano executable as small as possible. */
 #undef NANO_TINY
@@ -224,12 +241,12 @@
 /* Where data are placed to. */
 #undef PKGDATADIR
 
-/* Specify alternate rcfile name (default: .nanorc) */
+/* Specify an alternate rcfile name (default: .nanorc). */
 #undef RCFILE_NAME
 
 /* Define this if you know your curses library allows LINES and COLS to be
    redefined to deal with a resizing bug */
-#undef REDEFINIG_MACROS_OK
+#undef REDEFINING_MACROS_OK
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #undef RETSIGTYPE
@@ -237,7 +254,8 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* Define to use the slang wrappers for curses instead of native curses. */
+/* Define this to use the slang wrappers for curses instead of native curses.
+   */
 #undef USE_SLANG
 
 /* Enable extensions on AIX 3, Interix.  */
@@ -265,6 +283,11 @@
 /* Version number of package */
 #undef VERSION
 
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
diff --git a/config.sub b/config.sub
index 2a55a50..9633db7 100755
--- a/config.sub
+++ b/config.sub
@@ -1,38 +1,31 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2013-08-10'
 
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -75,8 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,13 +115,18 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -152,12 +149,12 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
+	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
-        -bluegene*)
-	        os=-cnk
+	-bluegene*)
+		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -173,10 +170,10 @@ case $os in
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -221,6 +218,12 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -245,20 +248,27 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -276,34 +286,45 @@ case $basic_machine in
 	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
-	| nios | nios2 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| or32 \
+	| open8 \
+	| or1k | or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -313,6 +334,21 @@ case $basic_machine in
 		basic_machine=mt-unknown
 		;;
 
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -327,25 +363,30 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -363,29 +404,34 @@ case $basic_machine in
 	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
-	| nios-* | nios2-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -410,7 +456,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -480,11 +526,20 @@ case $basic_machine in
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -516,7 +571,7 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -674,7 +729,6 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -732,11 +786,15 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-        microblaze)
+	microblaze*)
 		basic_machine=microblaze-xilinx
 		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -771,10 +829,18 @@ case $basic_machine in
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i686-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -839,6 +905,12 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -921,9 +993,10 @@ case $basic_machine in
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -948,7 +1021,11 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1017,6 +1094,9 @@ case $basic_machine in
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1073,20 +1153,8 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1156,6 +1224,9 @@ case $basic_machine in
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1253,11 +1324,11 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
+	-auroraux)
+		os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1281,20 +1352,21 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1341,7 +1413,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1390,7 +1462,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1426,15 +1498,14 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
 	-dicos*)
 		os=-dicos
 		;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1457,10 +1528,10 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1472,8 +1543,23 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	c8051-*)
+		os=-elf
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1493,14 +1579,11 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1509,6 +1592,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
+	or1k-*)
+		os=-elf
+		;;
 	or32-*)
 		os=-coff
 		;;
@@ -1527,7 +1613,7 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
diff --git a/configure b/configure
index 238dbf9..091dad0 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for GNU nano 2.2.6.
+# Generated by GNU Autoconf 2.69 for GNU nano 2.4.0.
 #
 # Report bugs to <nano-devel@gnu.org>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -91,6 +89,7 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -135,6 +134,31 @@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -168,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -213,14 +238,25 @@ IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -319,10 +355,18 @@ $as_echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -359,19 +403,19 @@ else
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -444,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -478,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -499,28 +547,8 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -533,7 +561,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -552,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='GNU nano'
 PACKAGE_TARNAME='nano'
-PACKAGE_VERSION='2.2.6'
-PACKAGE_STRING='GNU nano 2.2.6'
+PACKAGE_VERSION='2.4.0'
+PACKAGE_STRING='GNU nano 2.4.0'
 PACKAGE_BUGREPORT='nano-devel@gnu.org'
 PACKAGE_URL='http://www.gnu.org/software/nano/'
 
@@ -594,19 +622,27 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
+ac_header_list=
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+HAVE_MAKEINFO_FALSE
+HAVE_MAKEINFO_TRUE
+haveit
 GROFF_HTML_FALSE
 GROFF_HTML_TRUE
 CURSES_LIB
+NCURSESW_CONFIG
+NCURSES_LIBS
+NCURSES_CFLAGS
+NCURSESW_LIBS
+NCURSESW_CFLAGS
 GLIB_MKENUMS
 GOBJECT_QUERY
 GLIB_GENMARSHAL
 GLIB_LIBS
 GLIB_CFLAGS
-PKG_CONFIG
 USE_NANORC_FALSE
 USE_NANORC_TRUE
 USE_COLOR_FALSE
@@ -626,6 +662,9 @@ XGETTEXT
 GMSGFMT
 MSGFMT
 MKINSTALLDIRS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
 LN_S
 EGREP
 GREP
@@ -633,6 +672,7 @@ CPP
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -646,6 +686,10 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -669,10 +713,6 @@ am__isrc
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
-target_os
-target_vendor
-target_cpu
-target
 host_os
 host_vendor
 host_cpu
@@ -722,6 +762,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_silent_rules
 enable_dependency_tracking
 enable_largefile
 with_gnu_ld
@@ -729,26 +770,28 @@ enable_rpath
 with_libiconv_prefix
 enable_nls
 with_libintl_prefix
-enable_debug
-enable_tiny
-enable_extra
 enable_browser
+enable_color
+enable_extra
 enable_help
+enable_histories
 enable_justify
+enable_libmagic
 enable_mouse
+enable_multibuffer
+enable_nanorc
 enable_operatingdir
 enable_speller
 enable_tabcomp
 enable_wrapping
 enable_wrapping_as_root
-enable_color
-enable_multibuffer
-enable_nanorc
-enable_all
+enable_debug
+enable_tiny
 enable_utf8
-with_slang
 enable_altrcname
+with_slang
 enable_glibtest
+with_wordbounds
 '
       ac_precious_vars='build_alias
 host_alias
@@ -758,7 +801,14 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
-CPP'
+CPP
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+NCURSESW_CFLAGS
+NCURSESW_LIBS
+NCURSES_CFLAGS
+NCURSES_LIBS'
 
 
 # Initialize some variables set by options.
@@ -821,8 +871,9 @@ do
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -867,7 +918,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -893,7 +944,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1097,7 +1148,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1113,7 +1164,7 @@ do
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1143,8 +1194,8 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1152,7 +1203,7 @@ Try \`$0 --help' for more information."
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1162,7 +1213,7 @@ Try \`$0 --help' for more information."
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1170,13 +1221,13 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1199,7 +1250,7 @@ do
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1213,8 +1264,6 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1229,9 +1278,9 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1270,11 +1319,11 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1300,7 +1349,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU nano 2.2.6 to adapt to many kinds of systems.
+\`configure' configures GNU nano 2.4.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1314,7 +1363,7 @@ Configuration:
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1365,13 +1414,12 @@ Program names:
 System types:
   --build=BUILD     configure for building on BUILD [guessed]
   --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU nano 2.2.6:";;
+     short | recursive ) echo "Configuration of GNU nano 2.4.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1379,29 +1427,36 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
   --disable-largefile     omit support for large files
   --disable-rpath         do not hardcode runtime library paths
   --disable-nls           do not use Native Language Support
-  --enable-debug          Enable debugging (disabled by default)
-  --enable-tiny           Disable features for the sake of size
-  --disable-extra          Disable extra features, currently only easter eggs
   --disable-browser       Disable built-in file browser
+  --disable-color         Disable color and syntax highlighting
+  --disable-extra         Disable extra features, currently only easter eggs
   --disable-help          Disable help functions
+  --disable-histories     Disable search and position histories
   --disable-justify       Disable justify/unjustify functions
+  --disable-libmagic      Disable detection of file types via libmagic
   --disable-mouse         Disable mouse support (and -m flag)
-  --disable-operatingdir  Disable setting of operating directory (chroot of sorts)
+  --disable-multibuffer   Disable multiple file buffers
+  --disable-nanorc        Disable use of .nanorc files
+  --disable-operatingdir  Disable setting of operating directory (chroot of
+                          sorts)
   --disable-speller       Disable spell checker functions
   --disable-tabcomp       Disable tab completion functions
   --disable-wrapping      Disable all wrapping of text (and -w flag)
-  --disable-wrapping-as-root  Disable wrapping of text as root by default
-  --disable-color          Disable color and syntax highlighting
-  --disable-multibuffer    Disable multiple file buffers
-  --disable-nanorc         Disable use of .nanorc files
-  --enable-all            Enable ALL extra nano functionality (ignored for compatibility as all options default to on)
+  --disable-wrapping-as-root
+                          Disable wrapping of text as root by default
+  --enable-debug          Enable debugging (disabled by default)
+  --enable-tiny           Disable features for the sake of size
   --enable-utf8           Enable UTF-8 support
-  --enable-altrcname          Specify alternate rcfile name (default: .nanorc)
+  --enable-altrcname      Specify an alternate rcfile name (default: .nanorc)
   --disable-glibtest      do not try to compile and run a test GLIB program
 
 Optional Packages:
@@ -1412,7 +1467,8 @@ Optional Packages:
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-libintl-prefix=DIR  search for libintl in DIR/include and DIR/lib
   --without-libintl-prefix     don't search for libintl in includedir and libdir
-  --with-slang=DIR      Use the slang library instead of curses
+  --with-slang=DIR        Use the slang library instead of curses
+  --with-wordbounds       Use GNU-style word boundary delimiters
 
 Some influential environment variables:
   CC          C compiler command
@@ -1423,6 +1479,19 @@ Some influential environment variables:
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
+  NCURSESW_CFLAGS
+              C compiler flags for NCURSESW, overriding pkg-config
+  NCURSESW_LIBS
+              linker flags for NCURSESW, overriding pkg-config
+  NCURSES_CFLAGS
+              C compiler flags for NCURSES, overriding pkg-config
+  NCURSES_LIBS
+              linker flags for NCURSES, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1492,10 +1561,10 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU nano configure 2.2.6
-generated by GNU Autoconf 2.65
+GNU nano configure 2.4.0
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1539,7 +1608,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1565,7 +1634,7 @@ $as_echo "$ac_try_echo"; } >&5
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -1576,7 +1645,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -1589,10 +1658,10 @@ fi
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1628,7 +1697,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -1651,17 +1720,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( cat <<\_ASBOX
-## --------------------------------- ##
+( $as_echo "## --------------------------------- ##
 ## Report this to nano-devel@gnu.org ##
-## --------------------------------- ##
-_ASBOX
+## --------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -1670,7 +1737,7 @@ eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
@@ -1711,7 +1778,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -1725,7 +1792,7 @@ ac_fn_c_check_header_compile ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1743,7 +1810,7 @@ fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
@@ -1774,7 +1841,7 @@ $as_echo "$ac_try_echo"; } >&5
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1788,7 +1855,7 @@ fi
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -1801,7 +1868,7 @@ ac_fn_c_check_func ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1856,15 +1923,15 @@ fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU nano $as_me 2.2.6, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+It was created by GNU nano $as_me 2.4.0, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -1974,11 +2041,9 @@ trap 'exit_status=$?
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2012,11 +2077,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2029,11 +2092,9 @@ _ASBOX
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -2047,11 +2108,9 @@ _ASBOX
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -2106,7 +2165,12 @@ _ACEOF
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -2121,7 +2185,11 @@ do
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -2142,6 +2210,8 @@ $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+as_fn_append ac_header_list " magic.h"
+as_fn_append ac_header_list " zlib.h"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -2197,7 +2267,7 @@ if $ac_cache_corrupted; then
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2213,16 +2283,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2236,27 +2312,27 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -2274,14 +2350,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -2289,7 +2365,7 @@ fi
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -2305,46 +2381,7 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$target_alias" = x; then
-  ac_cv_target=$ac_cv_host
-else
-  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-am__api_version='1.11'
+am__api_version='1.14'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2363,7 +2400,7 @@ am__api_version='1.11'
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2383,7 +2420,7 @@ case $as_dir/ in #((
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2441,56 +2478,71 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
    # Ok.
    :
 else
-   as_fn_error "newly created file is older than distributed files!
+   as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -2513,12 +2565,12 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh}" != xset; then
@@ -2530,17 +2582,17 @@ if test x"${install_sh}" != xset; then
   esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -2552,7 +2604,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2580,7 +2632,7 @@ if test -z "$ac_cv_prog_STRIP"; then
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -2592,7 +2644,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2633,7 +2685,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
+  if ${ac_cv_path_mkdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2643,7 +2695,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -2672,19 +2724,13 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -2696,7 +2742,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2724,7 +2770,7 @@ done
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2732,7 +2778,7 @@ SHELL = /bin/sh
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2760,13 +2806,52 @@ else
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -2782,7 +2867,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='nano'
- VERSION='2.2.6'
+ VERSION='2.4.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2810,24 +2895,77 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+
 
-AMTAR=${AMTAR-"${am_missing_run}tar"}
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
 
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
 
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
 
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
 ac_config_headers="$ac_config_headers config.h"
 
 
 
 
 
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -2847,7 +2985,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -2880,6 +3018,7 @@ fi
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -2900,7 +3039,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2912,7 +3051,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2940,7 +3079,7 @@ if test -z "$ac_cv_prog_CC"; then
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2952,7 +3091,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2993,7 +3132,7 @@ if test -z "$CC"; then
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3005,7 +3144,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3033,7 +3172,7 @@ if test -z "$CC"; then
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3046,7 +3185,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3092,7 +3231,7 @@ if test -z "$CC"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3104,7 +3243,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3136,7 +3275,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3148,7 +3287,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3190,8 +3329,8 @@ fi
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3305,9 +3444,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3349,8 +3487,8 @@ done
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3407,9 +3545,9 @@ $as_echo "$ac_try_echo"; } >&5
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -3420,7 +3558,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3460,8 +3598,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -3471,7 +3609,7 @@ OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3508,7 +3646,7 @@ ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -3586,7 +3724,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -3595,8 +3733,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3681,19 +3818,79 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -3727,16 +3924,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -3745,16 +3942,16 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -3821,7 +4018,7 @@ if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -3851,7 +4048,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -3867,11 +4064,11 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -3910,7 +4107,7 @@ else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -3926,18 +4123,18 @@ else
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -3949,7 +4146,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -3963,7 +4160,7 @@ do
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -3998,7 +4195,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -4012,7 +4209,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4029,7 +4226,7 @@ do
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -4064,7 +4261,7 @@ esac
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -4079,7 +4276,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4196,8 +4393,7 @@ do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -4209,7 +4405,7 @@ done
 
 
   ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = x""yes; then :
+if test "x$ac_cv_header_minix_config_h" = xyes; then :
   MINIX=yes
 else
   MINIX=
@@ -4231,14 +4427,14 @@ $as_echo "#define _MINIX 1" >>confdefs.h
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
+if ${ac_cv_safe_to_define___extensions__+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#	  define __EXTENSIONS__ 1
-	  $ac_includes_default
+#         define __EXTENSIONS__ 1
+          $ac_includes_default
 int
 main ()
 {
@@ -4279,7 +4475,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4291,7 +4487,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4319,7 +4515,7 @@ if test -z "$ac_cv_prog_CC"; then
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4331,7 +4527,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4372,7 +4568,7 @@ if test -z "$CC"; then
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4384,7 +4580,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4412,7 +4608,7 @@ if test -z "$CC"; then
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4425,7 +4621,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -4471,7 +4667,7 @@ if test -z "$CC"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4483,7 +4679,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4515,7 +4711,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4527,7 +4723,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4569,8 +4765,8 @@ fi
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4599,7 +4795,7 @@ done
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4636,7 +4832,7 @@ ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -4714,7 +4910,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -4723,8 +4919,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4809,19 +5004,79 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4855,16 +5110,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -4873,16 +5128,16 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -4950,7 +5205,7 @@ fi
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror in -lcposix" >&5
 $as_echo_n "checking for strerror in -lcposix... " >&6; }
-if test "${ac_cv_lib_cposix_strerror+set}" = set; then :
+if ${ac_cv_lib_cposix_strerror+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -4984,7 +5239,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cposix_strerror" >&5
 $as_echo "$ac_cv_lib_cposix_strerror" >&6; }
-if test "x$ac_cv_lib_cposix_strerror" = x""yes; then :
+if test "x$ac_cv_lib_cposix_strerror" = xyes; then :
   LIBS="$LIBS -lcposix"
 fi
 
@@ -4999,7 +5254,7 @@ if test "$enable_largefile" != no; then
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
 $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if test "${ac_cv_sys_largefile_CC+set}" = set; then :
+if ${ac_cv_sys_largefile_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_sys_largefile_CC=no
@@ -5015,7 +5270,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -5050,7 +5305,7 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
+if ${ac_cv_sys_file_offset_bits+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   while :; do
@@ -5061,7 +5316,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -5085,7 +5340,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -5119,7 +5374,7 @@ rm -rf conftest*
   if test $ac_cv_sys_file_offset_bits = unknown; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
 $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if test "${ac_cv_sys_large_files+set}" = set; then :
+if ${ac_cv_sys_large_files+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   while :; do
@@ -5130,7 +5385,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -5154,7 +5409,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -5186,8 +5441,130 @@ _ACEOF
 esac
 rm -rf conftest*
   fi
+
+
+fi
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi
 
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
 
 
 
@@ -5208,7 +5585,7 @@ fi
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+if ${ac_cv_path_MSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
@@ -5245,7 +5622,7 @@ fi
 set dummy gmsgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+if ${ac_cv_path_GMSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -5259,7 +5636,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5287,7 +5664,7 @@ fi
 set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+if ${ac_cv_path_XGETTEXT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
@@ -5326,7 +5703,7 @@ fi
 set dummy msgmerge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+if ${ac_cv_path_MSGMERGE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGMERGE" in
@@ -5449,7 +5826,7 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${acl_cv_path_LD+set}" = set; then :
+if ${acl_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -5482,10 +5859,10 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${acl_cv_prog_gnu_ld+set}" = set; then :
+if ${acl_cv_prog_gnu_ld+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
@@ -5503,7 +5880,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld
 
                                                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
 $as_echo_n "checking for shared library run path origin... " >&6; }
-if test "${acl_cv_rpath+set}" = set; then :
+if ${acl_cv_rpath+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -5959,7 +6336,7 @@ $as_echo "$USE_NLS" >&6; }
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
 $as_echo_n "checking for GNU gettext in libc... " >&6; }
-if test "${gt_cv_func_gnugettext2_libc+set}" = set; then :
+if ${gt_cv_func_gnugettext2_libc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6020,7 +6397,7 @@ $as_echo "$gt_cv_func_gnugettext2_libc" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
 $as_echo_n "checking for iconv... " >&6; }
-if test "${am_cv_func_iconv+set}" = set; then :
+if ${am_cv_func_iconv+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -6473,7 +6850,7 @@ fi
 
           { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
 $as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if test "${gt_cv_func_gnugettext2_libintl+set}" = set; then :
+if ${gt_cv_func_gnugettext2_libintl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   gt_save_CPPFLAGS="$CPPFLAGS"
@@ -6646,367 +7023,314 @@ _ACEOF
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
+for ac_header in getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
+done
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
 
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
 
+# Check whether --enable-browser was given.
+if test "${enable_browser+set}" = set; then :
+  enableval=$enable_browser;
 fi
 
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
+if test "x$enable_browser" = xno; then
 
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
+$as_echo "#define DISABLE_BROWSER 1" >>confdefs.h
 
-else
-  ac_cv_header_stdc=no
 fi
-rm -f conftest*
 
+# Check whether --enable-color was given.
+if test "${enable_color+set}" = set; then :
+  enableval=$enable_color;
 fi
 
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
+if test "x$enable_nanorc" = xno; then
+    if test "x$enable_color" = xyes; then
+	as_fn_error $? "--enable-color cannot work with --disable-nanorc" "$LINENO" 5
+    else
+	# Disabling nanorc silently disables color support.
+	enable_color=no
+    fi
+fi
+if test "x$enable_color" = xno; then
 
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+$as_echo "#define DISABLE_COLOR 1" >>confdefs.h
 
 else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+    if test x$ac_cv_header_regex_h != xyes; then
+	as_fn_error $? "
+*** The header file regex.h was not found.  If you wish to have
+*** color support, this header file is required.  Please either
+*** install C libraries that include the regex.h file, or call
+*** the configure script with --disable-color." "$LINENO" 5
+    else
+	color_support=yes
+    fi
 fi
 
+# Check whether --enable-extra was given.
+if test "${enable_extra+set}" = set; then :
+  enableval=$enable_extra;
 fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+if test "x$enable_extra" = xno; then
 
-fi
-
-for ac_header in getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+$as_echo "#define DISABLE_EXTRA 1" >>confdefs.h
 
 fi
 
-done
-
+# Check whether --enable-help was given.
+if test "${enable_help+set}" = set; then :
+  enableval=$enable_help;
+fi
 
+if test "x$enable_help" = xno; then
 
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then :
-  enableval=$enable_debug; if test x$enableval = xyes; then
+$as_echo "#define DISABLE_HELP 1" >>confdefs.h
 
-$as_echo "#define DEBUG 1" >>confdefs.h
- debug_support=yes
-fi
 fi
 
+# Check whether --enable-histories was given.
+if test "${enable_histories+set}" = set; then :
+  enableval=$enable_histories;
+fi
 
-if test x$debug_support != xyes; then
+if test "x$enable_histories" = xno; then
 
-$as_echo "#define NDEBUG 1" >>confdefs.h
+$as_echo "#define DISABLE_HISTORIES 1" >>confdefs.h
 
 fi
 
-# Check whether --enable-tiny was given.
-if test "${enable_tiny+set}" = set; then :
-  enableval=$enable_tiny; if test x$enableval = xyes; then
+# Check whether --enable-justify was given.
+if test "${enable_justify+set}" = set; then :
+  enableval=$enable_justify;
+fi
 
-$as_echo "#define NANO_TINY 1" >>confdefs.h
- tiny_support=yes
+if test "x$enable_justify" = xno; then
 
-$as_echo "#define DISABLE_BROWSER 1" >>confdefs.h
+$as_echo "#define DISABLE_JUSTIFY 1" >>confdefs.h
 
+fi
 
-$as_echo "#define DISABLE_HELP 1" >>confdefs.h
+# Check whether --enable-libmagic was given.
+if test "${enable_libmagic+set}" = set; then :
+  enableval=$enable_libmagic;
+fi
 
 
-$as_echo "#define DISABLE_JUSTIFY 1" >>confdefs.h
+# Check whether --enable-mouse was given.
+if test "${enable_mouse+set}" = set; then :
+  enableval=$enable_mouse;
+fi
 
+if test "x$enable_mouse" = xno; then
 
 $as_echo "#define DISABLE_MOUSE 1" >>confdefs.h
 
+fi
 
-$as_echo "#define DISABLE_OPERATINGDIR 1" >>confdefs.h
+# Check whether --enable-multibuffer was given.
+if test "${enable_multibuffer+set}" = set; then :
+  enableval=$enable_multibuffer;
+fi
 
+if test "x$enable_multibuffer" = xno; then
 
-$as_echo "#define DISABLE_SPELLER 1" >>confdefs.h
+$as_echo "#define DISABLE_MULTIBUFFER 1" >>confdefs.h
 
+fi
 
-$as_echo "#define DISABLE_TABCOMP 1" >>confdefs.h
+# Check whether --enable-nanorc was given.
+if test "${enable_nanorc+set}" = set; then :
+  enableval=$enable_nanorc;
+fi
 
+if test "x$enable_nanorc" = xno; then
 
-$as_echo "#define DISABLE_WRAPPING 1" >>confdefs.h
+$as_echo "#define DISABLE_NANORC 1" >>confdefs.h
 
-fi
+else
+    nanorc_support=yes
 fi
 
+# Check whether --enable-operatingdir was given.
+if test "${enable_operatingdir+set}" = set; then :
+  enableval=$enable_operatingdir;
+fi
 
+if test "x$enable_operatingdir" = xno; then
 
-# Check whether --enable-extra was given.
-if test "${enable_extra+set}" = set; then :
-  enableval=$enable_extra; if test x$enableval != xno; then
+$as_echo "#define DISABLE_OPERATINGDIR 1" >>confdefs.h
 
-$as_echo "#define NANO_EXTRA 1" >>confdefs.h
- extra_support=yes
 fi
-else
-  if test x$enable_tiny != xyes; then
 
-$as_echo "#define NANO_EXTRA 1" >>confdefs.h
- extra_support=yes
-    fi
+# Check whether --enable-speller was given.
+if test "${enable_speller+set}" = set; then :
+  enableval=$enable_speller;
 fi
 
+if test "x$enable_speller" = xno; then
 
-# Check whether --enable-browser was given.
-if test "${enable_browser+set}" = set; then :
-  enableval=$enable_browser; if test x$enableval != xyes; then
-
-$as_echo "#define DISABLE_BROWSER 1" >>confdefs.h
+$as_echo "#define DISABLE_SPELLER 1" >>confdefs.h
 
 fi
-fi
 
+# Check whether --enable-tabcomp was given.
+if test "${enable_tabcomp+set}" = set; then :
+  enableval=$enable_tabcomp;
+fi
 
-# Check whether --enable-help was given.
-if test "${enable_help+set}" = set; then :
-  enableval=$enable_help; if test x$enableval != xyes; then
+if test "x$enable_tabcomp" = xno; then
 
-$as_echo "#define DISABLE_HELP 1" >>confdefs.h
+$as_echo "#define DISABLE_TABCOMP 1" >>confdefs.h
 
 fi
-fi
 
+# Check whether --enable-wrapping was given.
+if test "${enable_wrapping+set}" = set; then :
+  enableval=$enable_wrapping;
+fi
 
-# Check whether --enable-justify was given.
-if test "${enable_justify+set}" = set; then :
-  enableval=$enable_justify; if test x$enableval != xyes; then
+if test "x$enable_wrapping" = xno; then
 
-$as_echo "#define DISABLE_JUSTIFY 1" >>confdefs.h
+$as_echo "#define DISABLE_WRAPPING 1" >>confdefs.h
 
 fi
+
+# Check whether --enable-wrapping-as-root was given.
+if test "${enable_wrapping_as_root+set}" = set; then :
+  enableval=$enable_wrapping_as_root;
 fi
 
+if test "x$enable_wrapping_as_root" = xno; then
 
-# Check whether --enable-mouse was given.
-if test "${enable_mouse+set}" = set; then :
-  enableval=$enable_mouse; if test x$enableval != xyes; then
-
-$as_echo "#define DISABLE_MOUSE 1" >>confdefs.h
+$as_echo "#define DISABLE_ROOTWRAPPING 1" >>confdefs.h
 
 fi
+
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+  enableval=$enable_debug;
 fi
 
+if test "x$enable_debug" = xyes; then
 
-# Check whether --enable-operatingdir was given.
-if test "${enable_operatingdir+set}" = set; then :
-  enableval=$enable_operatingdir; if test x$enableval != xyes; then
+$as_echo "#define DEBUG 1" >>confdefs.h
 
-$as_echo "#define DISABLE_OPERATINGDIR 1" >>confdefs.h
+else
+
+$as_echo "#define NDEBUG 1" >>confdefs.h
 
-fi
 fi
 
+# Check whether --enable-tiny was given.
+if test "${enable_tiny+set}" = set; then :
+  enableval=$enable_tiny;
+fi
 
-# Check whether --enable-speller was given.
-if test "${enable_speller+set}" = set; then :
-  enableval=$enable_speller; if test x$enableval != xyes; then
+if test "x$enable_tiny" = xyes; then
 
-$as_echo "#define DISABLE_SPELLER 1" >>confdefs.h
+$as_echo "#define NANO_TINY 1" >>confdefs.h
 
-fi
-fi
+    if test "x$enable_browser" != xyes; then
 
+$as_echo "#define DISABLE_BROWSER 1" >>confdefs.h
 
-# Check whether --enable-tabcomp was given.
-if test "${enable_tabcomp+set}" = set; then :
-  enableval=$enable_tabcomp; if test x$enableval != xyes; then
+    fi
+    if test "x$enable_color" != xyes; then
 
-$as_echo "#define DISABLE_TABCOMP 1" >>confdefs.h
+$as_echo "#define DISABLE_COLOR 1" >>confdefs.h
 
-fi
-fi
+	color_support=no
+    else
+	if test "x$enable_nanorc" != xyes; then
+	    as_fn_error $? "--enable-color with --enable-tiny cannot work without --enable-nanorc" "$LINENO" 5
+	fi
+    fi
+    if test "x$enable_extra" != xyes; then
 
+$as_echo "#define DISABLE_EXTRA 1" >>confdefs.h
 
-# Check whether --enable-wrapping was given.
-if test "${enable_wrapping+set}" = set; then :
-  enableval=$enable_wrapping; if test x$enableval != xyes; then
+    fi
+    if test "x$enable_help" != xyes; then
 
-$as_echo "#define DISABLE_WRAPPING 1" >>confdefs.h
+$as_echo "#define DISABLE_HELP 1" >>confdefs.h
 
-fi
-fi
+    fi
+    if test "x$enable_histories" != xyes; then
 
+$as_echo "#define DISABLE_HISTORIES 1" >>confdefs.h
 
-# Check whether --enable-wrapping-as-root was given.
-if test "${enable_wrapping_as_root+set}" = set; then :
-  enableval=$enable_wrapping_as_root; if test x$enableval != xyes; then
+    fi
+    if test "x$enable_justify" != xyes; then
 
-$as_echo "#define DISABLE_ROOTWRAPPING 1" >>confdefs.h
+$as_echo "#define DISABLE_JUSTIFY 1" >>confdefs.h
 
-fi
-fi
+    fi
+    if test "x$enable_libmagic" != xyes; then
+	enable_libmagic=no
+    fi
+    if test "x$enable_mouse" != xyes; then
 
+$as_echo "#define DISABLE_MOUSE 1" >>confdefs.h
 
-# Check whether --enable-color was given.
-if test "${enable_color+set}" = set; then :
-  enableval=$enable_color; if test x$enableval != xno; then
-    if test x$ac_cv_header_regex_h = xyes; then
+    fi
+    if test "x$enable_multibuffer" != xyes; then
 
-$as_echo "#define ENABLE_NANORC 1" >>confdefs.h
- nanorc_support=yes
+$as_echo "#define DISABLE_MULTIBUFFER 1" >>confdefs.h
 
-$as_echo "#define ENABLE_COLOR 1" >>confdefs.h
- color_support=yes
-    else
-	as_fn_error "
-*** The header file regex.h was not found.  If you wish to use color
-*** support this header file is required.  Please either install C
-*** libraries that include the regex.h file or call the configure
-*** script with --disable-color." "$LINENO" 5
     fi
-fi
-else
-  if test x$enable_tiny != xyes; then
-	if test x$ac_cv_header_regex_h = xyes; then
+    if test "x$enable_nanorc" != xyes; then
 
-$as_echo "#define ENABLE_NANORC 1" >>confdefs.h
- nanorc_support=yes
+$as_echo "#define DISABLE_NANORC 1" >>confdefs.h
 
-$as_echo "#define ENABLE_COLOR 1" >>confdefs.h
- color_support=yes
-	else
-	    as_fn_error "
-*** The header file regex.h was not found.  If you wish to use color
-*** support this header file is required.  Please either install C
-*** libraries that include the regex.h file or call the configure
-*** script with --disable-color." "$LINENO" 5
-	fi
     fi
+    if test "x$enable_operatingdir" != xyes; then
 
-fi
-
+$as_echo "#define DISABLE_OPERATINGDIR 1" >>confdefs.h
 
-# Check whether --enable-multibuffer was given.
-if test "${enable_multibuffer+set}" = set; then :
-  enableval=$enable_multibuffer; if test x$enableval != xno; then
+    fi
+    if test "x$enable_speller" != xyes; then
 
-$as_echo "#define ENABLE_MULTIBUFFER 1" >>confdefs.h
- multibuffer_support=yes
-fi
-else
-  if test x$enable_tiny != xyes; then
+$as_echo "#define DISABLE_SPELLER 1" >>confdefs.h
 
-$as_echo "#define ENABLE_MULTIBUFFER 1" >>confdefs.h
- multibuffer_support=yes
     fi
-fi
+    if test "x$enable_tabcomp" != xyes; then
 
+$as_echo "#define DISABLE_TABCOMP 1" >>confdefs.h
 
-# Check whether --enable-nanorc was given.
-if test "${enable_nanorc+set}" = set; then :
-  enableval=$enable_nanorc; if test x$enableval != xno; then
+    fi
+    if test "x$enable_wrapping" != xyes; then
 
-$as_echo "#define ENABLE_NANORC 1" >>confdefs.h
- nanorc_support=yes
-fi
-else
-  if test x$enable_tiny != xyes; then
+$as_echo "#define DISABLE_WRAPPING 1" >>confdefs.h
 
-$as_echo "#define ENABLE_NANORC 1" >>confdefs.h
- nanorc_support=yes
     fi
 fi
 
-
-# Check whether --enable-all was given.
-if test "${enable_all+set}" = set; then :
-  enableval=$enable_all; if test x$enableval = xyes; then
-    echo "--enable-all option no longer needed, ignoring for compatibility"
+ if test x$color_support = xyes; then
+  USE_COLOR_TRUE=
+  USE_COLOR_FALSE='#'
+else
+  USE_COLOR_TRUE='#'
+  USE_COLOR_FALSE=
 fi
+
+ if test x$nanorc_support = xyes; then
+  USE_NANORC_TRUE=
+  USE_NANORC_FALSE='#'
+else
+  USE_NANORC_TRUE='#'
+  USE_NANORC_FALSE=
 fi
 
 
@@ -7014,17 +7338,24 @@ fi
 $as_echo_n "checking whether to enable UTF-8 support... " >&6; }
 # Check whether --enable-utf8 was given.
 if test "${enable_utf8+set}" = set; then :
-  enableval=$enable_utf8; if test x$enableval = xyes; then
-    enable_utf8=yes
-else
-    enable_utf8=no
+  enableval=$enable_utf8;
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_utf8:-auto}" >&5
+$as_echo "${enable_utf8:-auto}" >&6; }
+
+# Check whether --enable-altrcname was given.
+if test "${enable_altrcname+set}" = set; then :
+  enableval=$enable_altrcname; if test x$enableval != no; then
+
+cat >>confdefs.h <<_ACEOF
+#define RCFILE_NAME "$enableval"
+_ACEOF
+ rcfilename=$enableval
 fi
-else
-  enable_utf8=auto
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_utf8" >&5
-$as_echo "$enable_utf8" >&6; }
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use slang" >&5
 $as_echo_n "checking whether to use slang... " >&6; }
@@ -7042,14 +7373,14 @@ $as_echo "no" >&6; }
 $as_echo "yes" >&6; }
 
 	if test x$with_slang != xyes; then
-	    # Add additional search path
+	    # Add additional search path.
 	    LDFLAGS="-L$with_slang/lib $LDFLAGS"
 	    CPPFLAGS="-I$with_slang/include $CPPFLAGS"
 	fi
 
-	if test x$enable_utf8 != xno; then
+	if test "x$enable_utf8" != xno; then
 	    ac_fn_c_check_header_mongrel "$LINENO" "slcurses.h" "ac_cv_header_slcurses_h" "$ac_includes_default"
-if test "x$ac_cv_header_slcurses_h" = x""yes; then :
+if test "x$ac_cv_header_slcurses_h" = xyes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SLutf8_enable in -lslang" >&5
 $as_echo_n "checking for SLutf8_enable in -lslang... " >&6; }
 		_libs=$LIBS
@@ -7073,7 +7404,7 @@ if ac_fn_c_try_run "$LINENO"; then :
 $as_echo "yes" >&6; }
 
 $as_echo "#define USE_SLANG 1" >>confdefs.h
- slang_support=yes
+
 		    CURSES_LIB_WIDE=yes
 		    if test x$with_slang != xyes; then
 			CURSES_LIB="-L${with_slang}/lib -lslang"
@@ -7085,12 +7416,12 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-		    # We might need the term library
+		    # We might need the term library.
 		    for termlib in ncurses curses termcap terminfo termlib; do
 			as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tputs" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tputs in -l${termlib}" >&5
 $as_echo_n "checking for tputs in -l${termlib}... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7125,8 +7456,7 @@ fi
 eval ac_res=\$$as_ac_Lib
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   tcap="-l$termlib"
 fi
 
@@ -7155,7 +7485,7 @@ if ac_fn_c_try_run "$LINENO"; then :
 $as_echo "yes" >&6; }
 
 $as_echo "#define USE_SLANG 1" >>confdefs.h
- slang_support=yes
+
 			CURSES_LIB_WIDE=yes
 			if test x$with_slang != xyes; then
 			    CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
@@ -7167,7 +7497,7 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-			# We might need the math library
+			# We might need the math library.
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SLutf8_enable in -lslang $tcap -lm" >&5
 $as_echo_n "checking for SLutf8_enable in -lslang $tcap -lm... " >&6; }
 			LIBS="$LIBS -lm"
@@ -7190,7 +7520,7 @@ if ac_fn_c_try_run "$LINENO"; then :
 $as_echo "yes" >&6; }
 
 $as_echo "#define USE_SLANG 1" >>confdefs.h
- slang_support=yes
+
 			    CURSES_LIB_WIDE=yes
 			    if test x$with_slang != xyes; then
 				CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
@@ -7217,7 +7547,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 else
-  as_fn_error "
+  as_fn_error $? "
 *** The header file slcurses.h was not found.  If you wish to use
 *** slang support this header file is required.  Please either
 *** install a version of slang that includes the slcurses.h file or
@@ -7228,13 +7558,13 @@ fi
 	fi
 
 	if eval "test x$CURSES_LIB_NAME = x"; then
-	    # Reset libs if the above slang tests failed
-	    if test x$enable_utf8 != xno; then
+	    # Reset libs if the above slang tests failed.
+	    if test "x$enable_utf8" != xno; then
 		LIBS=$_libs
 	    fi
 
 	    ac_fn_c_check_header_mongrel "$LINENO" "slcurses.h" "ac_cv_header_slcurses_h" "$ac_includes_default"
-if test "x$ac_cv_header_slcurses_h" = x""yes; then :
+if test "x$ac_cv_header_slcurses_h" = xyes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SLtt_initialize in -lslang" >&5
 $as_echo_n "checking for SLtt_initialize in -lslang... " >&6; }
 		_libs=$LIBS
@@ -7258,7 +7588,7 @@ if ac_fn_c_try_run "$LINENO"; then :
 $as_echo "yes" >&6; }
 
 $as_echo "#define USE_SLANG 1" >>confdefs.h
- slang_support=yes
+
 		    if test x$with_slang != xyes; then
 			CURSES_LIB="-L${with_slang}/lib -lslang"
 		    else
@@ -7269,12 +7599,12 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-		    # We might need the term library
+		    # We might need the term library.
 		    for termlib in ncurses curses termcap terminfo termlib; do
 			as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tputs" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tputs in -l${termlib}" >&5
 $as_echo_n "checking for tputs in -l${termlib}... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7309,8 +7639,7 @@ fi
 eval ac_res=\$$as_ac_Lib
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   tcap="-l$termlib"
 fi
 
@@ -7339,7 +7668,7 @@ if ac_fn_c_try_run "$LINENO"; then :
 $as_echo "yes" >&6; }
 
 $as_echo "#define USE_SLANG 1" >>confdefs.h
- slang_support=yes
+
 			if test x$with_slang != xyes; then
 			    CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
 			else
@@ -7350,7 +7679,7 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-			# We might need the math library
+			# We might need the math library.
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SLtt_initialize in -lslang $tcap -lm" >&5
 $as_echo_n "checking for SLtt_initialize in -lslang $tcap -lm... " >&6; }
 			LIBS="$LIBS -lm"
@@ -7373,7 +7702,7 @@ if ac_fn_c_try_run "$LINENO"; then :
 $as_echo "yes" >&6; }
 
 $as_echo "#define USE_SLANG 1" >>confdefs.h
- slang_support=yes
+
 			    if test x$with_slang != xyes; then
 				CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
 			    else
@@ -7399,7 +7728,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 else
-  as_fn_error "
+  as_fn_error $? "
 *** The header file slcurses.h was not found.  If you wish to use
 *** slang support this header file is required.  Please either
 *** install a version of slang that includes the slcurses.h file or
@@ -7424,93 +7753,317 @@ $as_echo "no" >&6; }
 fi
 
 
-if test x$CURSES_LIB_NAME = xslang; then
 
-$as_echo "#define NANO_TINY 1" >>confdefs.h
- tiny_support=yes
 
-$as_echo "#define DISABLE_BROWSER 1" >>confdefs.h
+for ac_func in getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen snprintf vsnprintf
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
+fi
+done
 
-$as_echo "#define DISABLE_HELP 1" >>confdefs.h
 
+if test "x$enable_utf8" != xno; then
+    for ac_func in iswalnum iswblank iswpunct iswspace nl_langinfo mblen mbstowcs mbtowc wctomb wcwidth
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
-$as_echo "#define DISABLE_JUSTIFY 1" >>confdefs.h
+fi
+done
 
+fi
 
-$as_echo "#define DISABLE_MOUSE 1" >>confdefs.h
+if test x$ac_cv_func_snprintf = xno; then
+    # Check whether --enable-glibtest was given.
+if test "${enable_glibtest+set}" = set; then :
+  enableval=$enable_glibtest;
+else
+  enable_glibtest=yes
+fi
 
 
-$as_echo "#define DISABLE_OPERATINGDIR 1" >>confdefs.h
+  pkg_config_args=glib-2.0
+  for module in . glib
+  do
+      case "$module" in
+         gmodule)
+             pkg_config_args="$pkg_config_args gmodule-2.0"
+         ;;
+         gmodule-no-export)
+             pkg_config_args="$pkg_config_args gmodule-no-export-2.0"
+         ;;
+         gobject)
+             pkg_config_args="$pkg_config_args gobject-2.0"
+         ;;
+         gthread)
+             pkg_config_args="$pkg_config_args gthread-2.0"
+         ;;
+      esac
+  done
 
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-$as_echo "#define DISABLE_SPELLER 1" >>confdefs.h
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
 
-$as_echo "#define DISABLE_TABCOMP 1" >>confdefs.h
 
+  no_glib=""
 
-$as_echo "#define DISABLE_WRAPPING 1" >>confdefs.h
+  if test x$PKG_CONFIG != xno ; then
+    if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
+      :
+    else
+      echo *** pkg-config too old; version 0.7 or better required.
+      no_glib=yes
+      PKG_CONFIG=no
+    fi
+  else
+    no_glib=yes
+  fi
 
-fi
+  min_glib_version=2.0.0
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB - version >= $min_glib_version" >&5
+$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; }
 
- if test x$color_support = xyes; then
-  USE_COLOR_TRUE=
-  USE_COLOR_FALSE='#'
-else
-  USE_COLOR_TRUE='#'
-  USE_COLOR_FALSE=
-fi
+  if test x$PKG_CONFIG != xno ; then
+    ## don't try to run the test against uninstalled libtool libs
+    if $PKG_CONFIG --uninstalled $pkg_config_args; then
+	  echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
+	  enable_glibtest=no
+    fi
 
- if test x$nanorc_support = xyes; then
-  USE_NANORC_TRUE=
-  USE_NANORC_FALSE='#'
+    if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
+	  :
+    else
+	  no_glib=yes
+    fi
+  fi
+
+  if test x"$no_glib" = x ; then
+    GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+    GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
+    GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+
+    GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
+    GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
+    glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+    glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+    glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+    if test "x$enable_glibtest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GLIB_CFLAGS"
+      LIBS="$GLIB_LIBS $LIBS"
+      rm -f conf.glibtest
+      if test "$cross_compiling" = yes; then :
+  echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
-  USE_NANORC_TRUE='#'
-  USE_NANORC_FALSE=
-fi
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
 
-# Check whether --enable-altrcname was given.
-if test "${enable_altrcname+set}" = set; then :
-  enableval=$enable_altrcname; if test x$enableval != no; then
+int
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.glibtest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_glib_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_glib_version");
+     exit(1);
+   }
+
+  if ((glib_major_version != $glib_config_major_version) ||
+      (glib_minor_version != $glib_config_minor_version) ||
+      (glib_micro_version != $glib_config_micro_version))
+    {
+      printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
+             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
+             glib_major_version, glib_minor_version, glib_micro_version);
+      printf ("*** was found! If pkg-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+      printf("*** to point to the correct configuration files\n");
+    }
+  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
+	   (glib_minor_version != GLIB_MINOR_VERSION) ||
+           (glib_micro_version != GLIB_MICRO_VERSION))
+    {
+      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
+	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     glib_major_version, glib_minor_version, glib_micro_version);
+    }
+  else
+    {
+      if ((glib_major_version > major) ||
+        ((glib_major_version == major) && (glib_minor_version > minor)) ||
+        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
+               glib_major_version, glib_minor_version, glib_micro_version);
+        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
+        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
 
-cat >>confdefs.h <<_ACEOF
-#define RCFILE_NAME "$enableval"
 _ACEOF
- rcfilename=$enableval
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  no_glib=yes
 fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_glib" = x ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
+$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; }
+     :
+  else
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+     if test "$PKG_CONFIG" = "no" ; then
+       echo "*** A new enough version of pkg-config was not found."
+       echo "*** See http://www.freedesktop.org/software/pkgconfig/"
+     else
+       if test -f conf.glibtest ; then
+        :
+       else
+          echo "*** Could not run GLIB test program, checking why..."
+          ac_save_CFLAGS="$CFLAGS"
+          ac_save_LIBS="$LIBS"
+          CFLAGS="$CFLAGS $GLIB_CFLAGS"
+          LIBS="$LIBS $GLIB_LIBS"
+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+#include <glib.h>
+#include <stdio.h>
 
-for ac_func in getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+int
+main ()
+{
+ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version));
+  ;
+  return 0;
+}
 _ACEOF
-
+if ac_fn_c_try_link "$LINENO"; then :
+   echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+else
+   echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
 fi
-done
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GLIB_CFLAGS=""
+     GLIB_LIBS=""
+     GLIB_GENMARSHAL=""
+     GOBJECT_QUERY=""
+     GLIB_MKENUMS=""
+     as_fn_error $? "
+*** snprintf() not found.  GLIB 2.x not found either.
+*** You should install the GLIB 2.x library which can
+*** be found at http://ftp.gtk.org/." "$LINENO" 5
+  fi
 
 
-if test x$enable_utf8 != xno; then
-    for ac_func in iswalnum iswblank iswpunct iswspace nl_langinfo mblen mbstowcs mbtowc wctomb wcwidth
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
 
-fi
-done
+
+
+  rm -f conf.glibtest
 
 fi
 
@@ -7546,7 +8099,7 @@ fi
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -7560,7 +8113,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7784,10 +8337,10 @@ rm -f core conftest.err conftest.$ac_objext \
      GLIB_GENMARSHAL=""
      GOBJECT_QUERY=""
      GLIB_MKENUMS=""
-     as_fn_error "
-*** vsnprintf() not found.  GLIB 2.x not found either.  You should
-*** install the GLIB 2.x library which can be found at
-*** ftp://ftp.gtk.org/." "$LINENO" 5
+     as_fn_error $? "
+*** vsnprintf() not found.  GLIB 2.x not found either.
+*** You should install the GLIB 2.x library which can
+*** be found at http://ftp.gtk.org/." "$LINENO" 5
   fi
 
 
@@ -7799,9 +8352,47 @@ rm -f core conftest.err conftest.$ac_objext \
 fi
 
 
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wall" >&5
+$as_echo_n "checking whether C compiler accepts -Wall... " >&6; }
+if ${ax_cv_check_cflags___Wall+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -Wall"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags___Wall=yes
+else
+  ax_cv_check_cflags___Wall=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Wall" >&5
+$as_echo "$ax_cv_check_cflags___Wall" >&6; }
+if test x"$ax_cv_check_cflags___Wall" = xyes; then :
+  CFLAGS="$CFLAGS -Wall"
+else
+  :
+fi
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
 $as_echo_n "checking return type of signal handlers... " >&6; }
-if test "${ac_cv_type_signal+set}" = set; then :
+if ${ac_cv_type_signal+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7835,13 +8426,13 @@ _ACEOF
 for ac_func in vprintf
 do :
   ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
-if test "x$ac_cv_func_vprintf" = x""yes; then :
+if test "x$ac_cv_func_vprintf" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_VPRINTF 1
 _ACEOF
 
 ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
-if test "x$ac_cv_func__doprnt" = x""yes; then :
+if test "x$ac_cv_func__doprnt" = xyes; then :
 
 $as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
 
@@ -7854,7 +8445,7 @@ done
 for ac_func in getopt_long
 do :
   ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long"
-if test "x$ac_cv_func_getopt_long" = x""yes; then :
+if test "x$ac_cv_func_getopt_long" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETOPT_LONG 1
 _ACEOF
@@ -7863,11 +8454,169 @@ fi
 done
 
 
+
+if eval "test x$CURSES_LIB_NAME = x"; then
+    if test "x$enable_utf8" != xno; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NCURSESW" >&5
+$as_echo_n "checking for NCURSESW... " >&6; }
+
+if test -n "$NCURSESW_CFLAGS"; then
+    pkg_cv_NCURSESW_CFLAGS="$NCURSESW_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncursesw\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ncursesw") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_NCURSESW_CFLAGS=`$PKG_CONFIG --cflags "ncursesw" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$NCURSESW_LIBS"; then
+    pkg_cv_NCURSESW_LIBS="$NCURSESW_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncursesw\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ncursesw") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_NCURSESW_LIBS=`$PKG_CONFIG --libs "ncursesw" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        NCURSESW_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ncursesw" 2>&1`
+        else
+	        NCURSESW_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ncursesw" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$NCURSESW_PKG_ERRORS" >&5
+
+	:
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	:
+else
+	NCURSESW_CFLAGS=$pkg_cv_NCURSESW_CFLAGS
+	NCURSESW_LIBS=$pkg_cv_NCURSESW_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+	    CURSES_LIB=$NCURSESW_LIBS
+	    CPPFLAGS="$NCURSESW_CFLAGS $CPPFLAGS"
+	    CURSES_LIB_NAME=ncursesw
+	    CURSES_LIB_WIDE=yes
+
+fi
+    else
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NCURSES" >&5
+$as_echo_n "checking for NCURSES... " >&6; }
+
+if test -n "$NCURSES_CFLAGS"; then
+    pkg_cv_NCURSES_CFLAGS="$NCURSES_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncurses\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ncurses") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_NCURSES_CFLAGS=`$PKG_CONFIG --cflags "ncurses" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$NCURSES_LIBS"; then
+    pkg_cv_NCURSES_LIBS="$NCURSES_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncurses\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ncurses") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_NCURSES_LIBS=`$PKG_CONFIG --libs "ncurses" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        NCURSES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ncurses" 2>&1`
+        else
+	        NCURSES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ncurses" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$NCURSES_PKG_ERRORS" >&5
+
+	:
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	:
+else
+	NCURSES_CFLAGS=$pkg_cv_NCURSES_CFLAGS
+	NCURSES_LIBS=$pkg_cv_NCURSES_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+	    CURSES_LIB=$NCURSES_LIBS
+	    CPPFLAGS="$NCURSES_CFLAGS $CPPFLAGS"
+	    CURSES_LIB_NAME=ncurses
+
+fi
+    fi
+fi
+
 if eval "test x$CURSES_LIB_NAME = x"; then
     for ac_header in ncurses.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
-if test "x$ac_cv_header_ncurses_h" = x""yes; then :
+if test "x$ac_cv_header_ncurses_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_NCURSES_H 1
 _ACEOF
@@ -7877,10 +8626,148 @@ fi
 done
 
 
-    if test x$enable_utf8 != xno; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for get_wch in -lncursesw" >&5
+    if test "x$enable_utf8" != xno; then
+	OLDLIBS="$LIBS"
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ncursesw5-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ncursesw5-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NCURSESW_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NCURSESW_CONFIG"; then
+  ac_cv_prog_NCURSESW_CONFIG="$NCURSESW_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_NCURSESW_CONFIG="${ac_tool_prefix}ncursesw5-config"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NCURSESW_CONFIG=$ac_cv_prog_NCURSESW_CONFIG
+if test -n "$NCURSESW_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NCURSESW_CONFIG" >&5
+$as_echo "$NCURSESW_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NCURSESW_CONFIG"; then
+  ac_ct_NCURSESW_CONFIG=$NCURSESW_CONFIG
+  # Extract the first word of "ncursesw5-config", so it can be a program name with args.
+set dummy ncursesw5-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NCURSESW_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NCURSESW_CONFIG"; then
+  ac_cv_prog_ac_ct_NCURSESW_CONFIG="$ac_ct_NCURSESW_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_NCURSESW_CONFIG="ncursesw5-config"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NCURSESW_CONFIG=$ac_cv_prog_ac_ct_NCURSESW_CONFIG
+if test -n "$ac_ct_NCURSESW_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NCURSESW_CONFIG" >&5
+$as_echo "$ac_ct_NCURSESW_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NCURSESW_CONFIG" = x; then
+    NCURSESW_CONFIG="no"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NCURSESW_CONFIG=$ac_ct_NCURSESW_CONFIG
+  fi
+else
+  NCURSESW_CONFIG="$ac_cv_prog_NCURSESW_CONFIG"
+fi
+
+	if test "x$NCURSESW_CONFIG" != xno; then
+	    CURSES_LIB=`$NCURSESW_CONFIG --libs`
+	    LIBS="$CURSES_LIB $LIBS"
+	    CPPFLAGS="`$NCURSESW_CONFIG --cflags` $CPPFLAGS"
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for get_wch in -lncursesw" >&5
+$as_echo_n "checking for get_wch in -lncursesw... " >&6; }
+if ${ac_cv_lib_ncursesw_get_wch+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lncursesw  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char get_wch ();
+int
+main ()
+{
+return get_wch ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ncursesw_get_wch=yes
+else
+  ac_cv_lib_ncursesw_get_wch=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_get_wch" >&5
+$as_echo "$ac_cv_lib_ncursesw_get_wch" >&6; }
+if test "x$ac_cv_lib_ncursesw_get_wch" = xyes; then :
+  CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes
+fi
+
+	else
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for get_wch in -lncursesw" >&5
 $as_echo_n "checking for get_wch in -lncursesw... " >&6; }
-if test "${ac_cv_lib_ncursesw_get_wch+set}" = set; then :
+if ${ac_cv_lib_ncursesw_get_wch+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7914,16 +8801,18 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_get_wch" >&5
 $as_echo "$ac_cv_lib_ncursesw_get_wch" >&6; }
-if test "x$ac_cv_lib_ncursesw_get_wch" = x""yes; then :
-  CURSES_LIB="-lncursesw" CPPFLAGS="-I/usr/include/ncursesw $CPPFLAGS" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes
+if test "x$ac_cv_lib_ncursesw_get_wch" = xyes; then :
+  CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes
 fi
 
+	fi
+	LIBS="$OLDLIBS"
     fi
 
     if eval "test x$CURSES_LIB_NAME = x"; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5
 $as_echo_n "checking for initscr in -lncurses... " >&6; }
-if test "${ac_cv_lib_ncurses_initscr+set}" = set; then :
+if ${ac_cv_lib_ncurses_initscr+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7957,7 +8846,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5
 $as_echo "$ac_cv_lib_ncurses_initscr" >&6; }
-if test "x$ac_cv_lib_ncurses_initscr" = x""yes; then :
+if test "x$ac_cv_lib_ncurses_initscr" = xyes; then :
   CURSES_LIB="-lncurses" CURSES_LIB_NAME=ncurses
 fi
 
@@ -7968,7 +8857,7 @@ if eval "test x$CURSES_LIB_NAME = x"; then
     for ac_header in curses.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default"
-if test "x$ac_cv_header_curses_h" = x""yes; then :
+if test "x$ac_cv_header_curses_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CURSES_H 1
 _ACEOF
@@ -7978,10 +8867,10 @@ fi
 done
 
 
-    if test x$enable_utf8 != xno; then
+    if test "x$enable_utf8" != xno; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for get_wch in -lcurses" >&5
 $as_echo_n "checking for get_wch in -lcurses... " >&6; }
-if test "${ac_cv_lib_curses_get_wch+set}" = set; then :
+if ${ac_cv_lib_curses_get_wch+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8015,16 +8904,16 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_get_wch" >&5
 $as_echo "$ac_cv_lib_curses_get_wch" >&6; }
-if test "x$ac_cv_lib_curses_get_wch" = x""yes; then :
+if test "x$ac_cv_lib_curses_get_wch" = xyes; then :
   CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses CURSES_LIB_WIDE=yes
 fi
 
     fi
 
     if eval "test x$CURSES_LIB_NAME = x"; then
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5
 $as_echo_n "checking for initscr in -lcurses... " >&6; }
-if test "${ac_cv_lib_curses_initscr+set}" = set; then :
+if ${ac_cv_lib_curses_initscr+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8058,7 +8947,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_initscr" >&5
 $as_echo "$ac_cv_lib_curses_initscr" >&6; }
-if test "x$ac_cv_lib_curses_initscr" = x""yes; then :
+if test "x$ac_cv_lib_curses_initscr" = xyes; then :
   CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses
 fi
 
@@ -8082,7 +8971,7 @@ fi
 as_ac_Lib=`$as_echo "ac_cv_lib_$CURSES_LIB_NAME''_use_default_colors" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for use_default_colors in -l$CURSES_LIB_NAME" >&5
 $as_echo_n "checking for use_default_colors in -l$CURSES_LIB_NAME... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8117,8 +9006,7 @@ fi
 eval ac_res=\$$as_ac_Lib
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
 $as_echo "#define HAVE_USE_DEFAULT_COLORS 1" >>confdefs.h
 
@@ -8137,7 +9025,7 @@ if test "x$GLIB_LIBS" != "x"; then
     LDFLAGS="$LDFLAGS $GLIB_LIBS"
 fi
 
-if test x$enable_utf8 != xno && \
+if test "x$enable_utf8" != xno && \
     test x$CURSES_LIB_WIDE = xyes && \
     test x$ac_cv_func_iswalnum = xyes && \
     test x$ac_cv_func_iswpunct = xyes && \
@@ -8152,14 +9040,14 @@ if test x$enable_utf8 != xno && \
 $as_echo "#define ENABLE_UTF8 1" >>confdefs.h
 
 else
-    if test x$enable_utf8 = xyes; then
-	as_fn_error "
+    if test "x$enable_utf8" = xyes; then
+	as_fn_error $? "
 *** UTF-8 support was requested, but insufficient UTF-8 support was
 *** detected in your curses and/or C libraries.  Please verify that your
 *** slang was built with UTF-8 support or your curses was built with
 *** wide character support, and that your C library was built with wide
 *** character support." "$LINENO" 5
-    elif test x$enable_utf8 != xno; then
+    elif test "x$enable_utf8" != xno; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
 *** Insufficient UTF-8 support was detected in your curses and/or C
 *** libraries.  If you want UTF-8 support, please verify that your slang
@@ -8176,10 +9064,32 @@ $as_echo "$as_me: WARNING:
 fi
 
 if test x$color_support = xyes; then
-	# now check for the end of word boundary support (/< and />)
+	# Now check for the end-of-word boundary support (/< and />).
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU-style word boundary regex support" >&5
 $as_echo_n "checking for GNU-style word boundary regex support... " >&6; }
-	if test "$cross_compiling" = yes; then :
+
+
+# Check whether --with-wordbounds was given.
+if test "${with_wordbounds+set}" = set; then :
+  withval=$with_wordbounds;  case "$with_wordbounds" in
+	    no)
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		;;
+	    *)
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		# We explicitly don't check if the user forced the option, because
+		# this is needed for cross compilers and we can't test the target.
+
+$as_echo "#define GNU_WORDBOUNDS 1" >>confdefs.h
+ gnu_wordbounds=yes,
+		;;
+	  esac
+
+else
+
+	    if test "$cross_compiling" = yes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Can't check for GNU-style word boundary support when cross-compiling" >&5
 $as_echo "$as_me: WARNING: *** Can't check for GNU-style word boundary support when cross-compiling" >&2;}
 
@@ -8198,9 +9108,9 @@ int main(void)
     regmatch_t pmatch;
 
     if (regcomp(&r, "\\\\>", REG_EXTENDED|REG_NOSUB))
-        return 1;
+	return 1;
     if (regexec(&r, "word boundary", nmatch, &pmatch, 0))
-        return 1;
+	return 1;
     return 0;
 }
 _ACEOF
@@ -8218,6 +9128,10 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
+
+fi
+
+
 #    if test x$CURSES_LIB_NAME = xcurses; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE_EXTENDED is needed" >&5
 $as_echo_n "checking whether _XOPEN_SOURCE_EXTENDED is needed... " >&6; }
@@ -8242,8 +9156,8 @@ else
   if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8303,7 +9217,7 @@ int main(void)
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
 
-$as_echo "#define REDEFINIG_MACROS_OK 1" >>confdefs.h
+$as_echo "#define REDEFINING_MACROS_OK 1" >>confdefs.h
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -8317,17 +9231,138 @@ fi
 
 
 
-# Check for groff html support
+
+
+  for ac_header in $ac_header_list
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+if test "x$enable_libmagic" != "xno"; then :
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic_open in -lmagic" >&5
+$as_echo_n "checking for magic_open in -lmagic... " >&6; }
+if ${ac_cv_lib_magic_magic_open+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmagic  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char magic_open ();
+int
+main ()
+{
+return magic_open ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_magic_magic_open=yes
+else
+  ac_cv_lib_magic_magic_open=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_magic_magic_open" >&5
+$as_echo "$ac_cv_lib_magic_magic_open" >&6; }
+if test "x$ac_cv_lib_magic_magic_open" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBMAGIC 1
+_ACEOF
+
+  LIBS="-lmagic $LIBS"
+
+fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5
+$as_echo_n "checking for inflate in -lz... " >&6; }
+if ${ac_cv_lib_z_inflate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char inflate ();
+int
+main ()
+{
+return inflate ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_z_inflate=yes
+else
+  ac_cv_lib_z_inflate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5
+$as_echo "$ac_cv_lib_z_inflate" >&6; }
+if test "x$ac_cv_lib_z_inflate" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBZ 1
+_ACEOF
+
+  LIBS="-lz $LIBS"
+
+fi
+
+
+fi
+
+# Check for groff html support.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HTML support in groff" >&5
 $as_echo_n "checking for HTML support in groff... " >&6; }
 groff -t -mandoc -Thtml </dev/null >/dev/null
 if test $? -ne 0 ; then
-    echo "no"
-    echo "*** Will not generate HTML version of man pages  ***"
-    echo "*** Consider installing a newer version of groff with HTML support ***"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Will not generate HTML version of man pages  ***
+*** Consider installing a newer version of groff with HTML support ***" >&5
+$as_echo "$as_me: WARNING: *** Will not generate HTML version of man pages  ***
+*** Consider installing a newer version of groff with HTML support ***" >&2;}
     groff_html_support=no
 else
-    echo "yes"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     groff_html_support=yes
 fi
  if test x$groff_html_support = xyes; then
@@ -8339,6 +9374,54 @@ else
 fi
 
 
+# Check for the availability of makeinfo.
+# Extract the first word of "makeinfo", so it can be a program name with args.
+set dummy makeinfo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_haveit+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$haveit"; then
+  ac_cv_prog_haveit="$haveit" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_haveit="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_haveit" && ac_cv_prog_haveit="no"
+fi
+fi
+haveit=$ac_cv_prog_haveit
+if test -n "$haveit"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $haveit" >&5
+$as_echo "$haveit" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ if test x$haveit = xyes; then
+  HAVE_MAKEINFO_TRUE=
+  HAVE_MAKEINFO_FALSE='#'
+else
+  HAVE_MAKEINFO_TRUE='#'
+  HAVE_MAKEINFO_FALSE=
+fi
+
+
 
 ac_config_files="$ac_config_files Makefile doc/Makefile doc/nanorc.sample doc/man/Makefile doc/man/fr/Makefile doc/syntax/Makefile doc/texinfo/Makefile m4/Makefile po/Makefile.in src/Makefile nano.spec"
 
@@ -8407,10 +9490,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -8426,6 +9520,7 @@ DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -8440,6 +9535,14 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -8449,35 +9552,39 @@ else
 fi
 
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error "conditional \"AMDEP\" was never defined.
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_NLS_TRUE}" && test -z "${USE_NLS_FALSE}"; then
-  as_fn_error "conditional \"USE_NLS\" was never defined.
+  as_fn_error $? "conditional \"USE_NLS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_COLOR_TRUE}" && test -z "${USE_COLOR_FALSE}"; then
-  as_fn_error "conditional \"USE_COLOR\" was never defined.
+  as_fn_error $? "conditional \"USE_COLOR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_NANORC_TRUE}" && test -z "${USE_NANORC_FALSE}"; then
-  as_fn_error "conditional \"USE_NANORC\" was never defined.
+  as_fn_error $? "conditional \"USE_NANORC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GROFF_HTML_TRUE}" && test -z "${GROFF_HTML_FALSE}"; then
-  as_fn_error "conditional \"GROFF_HTML\" was never defined.
+  as_fn_error $? "conditional \"GROFF_HTML\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_MAKEINFO_TRUE}" && test -z "${HAVE_MAKEINFO_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_MAKEINFO\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -8578,6 +9685,7 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -8623,19 +9731,19 @@ export LANGUAGE
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -8773,16 +9881,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -8831,7 +9939,7 @@ $as_echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -8842,28 +9950,16 @@ else
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -8884,8 +9980,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GNU nano $as_me 2.2.6, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+This file was extended by GNU nano $as_me 2.4.0, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -8952,11 +10048,11 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-GNU nano config.status 2.2.6
-configured by $0, generated by GNU Autoconf 2.65,
+GNU nano config.status 2.4.0
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -8974,11 +10070,16 @@ ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -9000,6 +10101,7 @@ do
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -9012,7 +10114,7 @@ do
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
+    as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -9021,7 +10123,7 @@ Try \`$0 --help' for more information.";;
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -9041,7 +10143,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -9097,7 +10199,7 @@ do
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "nano.spec") CONFIG_FILES="$CONFIG_FILES nano.spec" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -9120,9 +10222,10 @@ fi
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -9130,12 +10233,13 @@ $debug ||
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -9152,12 +10256,12 @@ if test "x$ac_cr" = x; then
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -9166,18 +10270,18 @@ _ACEOF
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -9185,7 +10289,7 @@ done
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -9233,7 +10337,7 @@ t delim
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -9265,21 +10369,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -9291,7 +10403,7 @@ fi # test -n "$CONFIG_FILES"
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -9303,11 +10415,11 @@ _ACEOF
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -9392,7 +10504,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -9405,7 +10517,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -9424,7 +10536,7 @@ do
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -9433,7 +10545,7 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -9459,8 +10571,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -9596,23 +10708,24 @@ s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -9621,21 +10734,21 @@ which seems to be undefined.  Please make sure it is defined." >&2;}
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -9681,7 +10794,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -9694,7 +10807,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -9728,21 +10841,19 @@ $as_echo X"$mf" |
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
@@ -9881,7 +10992,7 @@ _ACEOF
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -9902,7 +11013,7 @@ if test "$no_create" != yes; then
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff --git a/configure.ac b/configure.ac
index 6388c03..424cf55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Configuration for GNU nano - a small and user-friendly text editor
 #
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+# 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.
 #
 # GNU nano is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -18,15 +18,17 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
 # USA.
 #
-# $Id: configure.ac 4516 2010-08-11 02:42:32Z astyanax $
+# $Id: configure.ac 5127 2015-02-27 17:00:11Z astyanax $
 
-AC_INIT([GNU nano], [2.2.6], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.4.0], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
-AC_CANONICAL_TARGET([])
+AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
 
-AC_PREREQ(2.54)
+dnl Make sure the ONCE macros are available.
+
+AC_PREREQ(2.61)
 
 dnl Checks for programs.
 
@@ -35,6 +37,7 @@ AC_PROG_CC
 AC_PROG_LN_S
 AC_ISC_POSIX
 AC_SYS_LARGEFILE
+PKG_PROG_PKG_CONFIG
 
 dnl Internationalization macros.
 
@@ -49,166 +52,196 @@ AC_DEFINE_DIR([PKGDATADIR], [pkgdatadir], [Where data are placed to.])
 
 dnl Checks for header files.
 
-AC_HEADER_STDC
 AC_CHECK_HEADERS(getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.h)
 
 dnl Checks for options.
 
-AC_ARG_ENABLE(debug,
-[  --enable-debug          Enable debugging (disabled by default)],
-[if test x$enableval = xyes; then
-    AC_DEFINE(DEBUG, 1, [Define this to enable debug messages and assert warnings.]) debug_support=yes
-fi])
-
-if test x$debug_support != xyes; then
-    AC_DEFINE(NDEBUG, 1, [Shut up assert warnings :-)])
-fi
-
-AC_ARG_ENABLE(tiny,
-[  --enable-tiny           Disable features for the sake of size],
-[if test x$enableval = xyes; then
-    AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.]) tiny_support=yes
+AC_ARG_ENABLE(browser,
+AS_HELP_STRING([--disable-browser], [Disable built-in file browser]))
+if test "x$enable_browser" = xno; then
     AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
-    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])
-    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.])
-    AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.])
-    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).])
-    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.])
-    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion functions for files and search strings.])
-    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
-fi])
+fi
 
+AC_ARG_ENABLE(color,
+AS_HELP_STRING([--disable-color], [Disable color and syntax highlighting]))
+if test "x$enable_nanorc" = xno; then
+    if test "x$enable_color" = xyes; then
+	AC_MSG_ERROR([--enable-color cannot work with --disable-nanorc])
+    else
+	# Disabling nanorc silently disables color support.
+	enable_color=no
+    fi
+fi
+if test "x$enable_color" = xno; then
+    AC_DEFINE(DISABLE_COLOR, 1, [Define this to disable syntax highlighting.])
+else
+    if test x$ac_cv_header_regex_h != xyes; then
+	AC_MSG_ERROR([
+*** The header file regex.h was not found.  If you wish to have
+*** color support, this header file is required.  Please either
+*** install C libraries that include the regex.h file, or call
+*** the configure script with --disable-color.])
+    else
+	color_support=yes
+    fi
+fi
 
 AC_ARG_ENABLE(extra,
-[  --disable-extra          Disable extra features, currently only easter eggs],
-[if test x$enableval != xno; then
-    AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes
-fi], 
-    [if test x$enable_tiny != xyes; then
-        AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes
-    fi])
-
-AC_ARG_ENABLE(browser,
-[  --disable-browser       Disable built-in file browser],
-[if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
-fi])
+AS_HELP_STRING([--disable-extra], [Disable extra features, currently only easter eggs]))
+if test "x$enable_extra" = xno; then
+    AC_DEFINE(DISABLE_EXTRA, 1, [Define this to disable extra stuff.])
+fi
 
 AC_ARG_ENABLE(help,
-[  --disable-help          Disable help functions],
-[if test x$enableval != xyes; then
+AS_HELP_STRING([--disable-help], [Disable help functions]))
+if test "x$enable_help" = xno; then
     AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])
-fi])
+fi
+
+AC_ARG_ENABLE(histories,
+AS_HELP_STRING([--disable-histories], [Disable search and position histories]))
+if test "x$enable_histories" = xno; then
+    AC_DEFINE(DISABLE_HISTORIES, 1, [Define this to disable search and position histories.])
+fi
 
 AC_ARG_ENABLE(justify,
-[  --disable-justify       Disable justify/unjustify functions],
-[if test x$enableval != xyes; then
+AS_HELP_STRING([--disable-justify], [Disable justify/unjustify functions]))
+if test "x$enable_justify" = xno; then
     AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.])
-fi])
+fi
+
+AC_ARG_ENABLE(libmagic,
+AS_HELP_STRING([--disable-libmagic], [Disable detection of file types via libmagic]))
 
 AC_ARG_ENABLE(mouse,
-[  --disable-mouse         Disable mouse support (and -m flag)],
-[if test x$enableval != xyes; then
+AS_HELP_STRING([--disable-mouse], [Disable mouse support (and -m flag)]))
+if test "x$enable_mouse" = xno; then
     AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.])
-fi])
+fi
+
+AC_ARG_ENABLE(multibuffer,
+AS_HELP_STRING([--disable-multibuffer], [Disable multiple file buffers]))
+if test "x$enable_multibuffer" = xno; then
+    AC_DEFINE(DISABLE_MULTIBUFFER, 1, [Define this to disable multiple file buffers.])
+fi
+
+AC_ARG_ENABLE(nanorc,
+AS_HELP_STRING([--disable-nanorc], [Disable use of .nanorc files]))
+if test "x$enable_nanorc" = xno; then
+    AC_DEFINE(DISABLE_NANORC, 1, [Define this to disable the use of .nanorc files.])
+else
+    nanorc_support=yes
+fi
 
 AC_ARG_ENABLE(operatingdir,
-[  --disable-operatingdir  Disable setting of operating directory (chroot of sorts)],
-[if test x$enableval != xyes; then
+AS_HELP_STRING([--disable-operatingdir], [Disable setting of operating directory (chroot of sorts)]))
+if test "x$enable_operatingdir" = xno; then
     AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).])
-fi])
+fi
 
 AC_ARG_ENABLE(speller,
-[  --disable-speller       Disable spell checker functions],
-[if test x$enableval != xyes; then
+AS_HELP_STRING([--disable-speller], [Disable spell checker functions]))
+if test "x$enable_speller" = xno; then
     AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.])
-fi])
+fi
 
 AC_ARG_ENABLE(tabcomp,
-[  --disable-tabcomp       Disable tab completion functions],
-[if test x$enableval != xyes; then
-    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion functions for files and search strings.])
-fi])
+AS_HELP_STRING([--disable-tabcomp], [Disable tab completion functions]))
+if test "x$enable_tabcomp" = xno; then
+    AC_DEFINE(DISABLE_TABCOMP, 1, [Define this to disable the tab completion functions for files and search strings.])
+fi
 
 AC_ARG_ENABLE(wrapping,
-[  --disable-wrapping      Disable all wrapping of text (and -w flag)],
-[if test x$enableval != xyes; then
+AS_HELP_STRING([--disable-wrapping], [Disable all wrapping of text (and -w flag)]))
+if test "x$enable_wrapping" = xno; then
     AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
-fi])
+fi
 
 AC_ARG_ENABLE(wrapping-as-root,
-[  --disable-wrapping-as-root  Disable wrapping of text as root by default],
-[if test x$enableval != xyes; then
+AS_HELP_STRING([--disable-wrapping-as-root], [Disable wrapping of text as root by default]))
+if test "x$enable_wrapping_as_root" = xno; then
     AC_DEFINE(DISABLE_ROOTWRAPPING, 1, [Define this to disable text wrapping as root by default.])
-fi])
+fi
 
-AC_ARG_ENABLE(color,
-[  --disable-color          Disable color and syntax highlighting],
-if test x$enableval != xno; then
-    if test x$ac_cv_header_regex_h = xyes; then
-	AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
-	AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC too!]) color_support=yes
-    else
-	AC_MSG_ERROR([
-*** The header file regex.h was not found.  If you wish to use color
-*** support this header file is required.  Please either install C
-*** libraries that include the regex.h file or call the configure
-*** script with --disable-color.])
+AC_ARG_ENABLE(debug,
+AS_HELP_STRING([--enable-debug], [Enable debugging (disabled by default)]))
+if test "x$enable_debug" = xyes; then
+    AC_DEFINE(DEBUG, 1, [Define this to enable debug messages and assert warnings.])
+else
+    AC_DEFINE(NDEBUG, 1, [Shut up assert warnings :-)])
+fi
+
+AC_ARG_ENABLE(tiny,
+AS_HELP_STRING([--enable-tiny], [Disable features for the sake of size]))
+if test "x$enable_tiny" = xyes; then
+    AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.])
+    if test "x$enable_browser" != xyes; then
+	AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
     fi
-fi, 
-    if test x$enable_tiny != xyes; then
-	if test x$ac_cv_header_regex_h = xyes; then
-	    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
-	    AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC too!]) color_support=yes	
-	else
-	    AC_MSG_ERROR([
-*** The header file regex.h was not found.  If you wish to use color
-*** support this header file is required.  Please either install C
-*** libraries that include the regex.h file or call the configure
-*** script with --disable-color.])
+    if test "x$enable_color" != xyes; then
+	AC_DEFINE(DISABLE_COLOR, 1, [Define this to disable syntax highlighting.])
+	color_support=no
+    else
+	if test "x$enable_nanorc" != xyes; then
+	    AC_MSG_ERROR([--enable-color with --enable-tiny cannot work without --enable-nanorc])
 	fi
     fi
-)
+    if test "x$enable_extra" != xyes; then
+	AC_DEFINE(DISABLE_EXTRA, 1, [Define this to disable extra stuff.])
+    fi
+    if test "x$enable_help" != xyes; then
+	AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])
+    fi
+    if test "x$enable_histories" != xyes; then
+	AC_DEFINE(DISABLE_HISTORIES, 1, [Define this to disable search and position histories.])
+    fi
+    if test "x$enable_justify" != xyes; then
+	AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.])
+    fi
+    if test "x$enable_libmagic" != xyes; then
+	enable_libmagic=no
+    fi
+    if test "x$enable_mouse" != xyes; then
+	AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.])
+    fi
+    if test "x$enable_multibuffer" != xyes; then
+	AC_DEFINE(DISABLE_MULTIBUFFER, 1, [Define this to disable multiple file buffers.])
+    fi
+    if test "x$enable_nanorc" != xyes; then
+	AC_DEFINE(DISABLE_NANORC, 1, [Define this to disable the use of .nanorc files.])
+    fi
+    if test "x$enable_operatingdir" != xyes; then
+	AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).])
+    fi
+    if test "x$enable_speller" != xyes; then
+	AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.])
+    fi
+    if test "x$enable_tabcomp" != xyes; then
+	AC_DEFINE(DISABLE_TABCOMP, 1, [Define this to disable the tab completion functions for files and search strings.])
+    fi
+    if test "x$enable_wrapping" != xyes; then
+	AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
+    fi
+fi
 
-AC_ARG_ENABLE(multibuffer,
-[  --disable-multibuffer    Disable multiple file buffers],
-[if test x$enableval != xno; then
-    AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
-fi], 
-    [if test x$enable_tiny != xyes; then
-        AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes
-    fi])
+AM_CONDITIONAL(USE_COLOR, test x$color_support = xyes)
+AM_CONDITIONAL(USE_NANORC, test x$nanorc_support = xyes)
 
-AC_ARG_ENABLE(nanorc,
-[  --disable-nanorc         Disable use of .nanorc files],
-[if test x$enableval != xno; then
-    AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
-fi], 
-    [if test x$enable_tiny != xyes; then
-        AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes
-    fi])
-
-AC_ARG_ENABLE(all,
-[  --enable-all            Enable ALL extra nano functionality (ignored for compatibility as all options default to on)],
-[if test x$enableval = xyes; then
-    echo "--enable-all option no longer needed, ignoring for compatibility"
+AC_MSG_CHECKING([whether to enable UTF-8 support])
+AC_ARG_ENABLE(utf8, AS_HELP_STRING([--enable-utf8], [Enable UTF-8 support]))
+AC_MSG_RESULT(${enable_utf8:-auto})
+
+AC_ARG_ENABLE(altrcname,
+AS_HELP_STRING([--enable-altrcname], [Specify an alternate rcfile name (default: .nanorc)]),
+[if test x$enableval != no; then
+    AC_DEFINE_UNQUOTED(RCFILE_NAME, "$enableval", [Specify an alternate rcfile name (default: .nanorc).]) rcfilename=$enableval
 fi])
 
-AC_MSG_CHECKING([whether to enable UTF-8 support])
-AC_ARG_ENABLE(utf8,
-[  --enable-utf8           Enable UTF-8 support],
-[if test x$enableval = xyes; then
-    enable_utf8=yes
-else
-    enable_utf8=no
-fi],
-[enable_utf8=auto])
-AC_MSG_RESULT($enable_utf8)
 
 AC_MSG_CHECKING([whether to use slang])
 CURSES_LIB_NAME=""
 AC_ARG_WITH(slang,
-[  --with-slang[=DIR]      Use the slang library instead of curses],
+AS_HELP_STRING([--with-slang[=DIR]], [Use the slang library instead of curses]),
 [    case "$with_slang" in
     no)
 	AC_MSG_RESULT(no)
@@ -217,12 +250,12 @@ AC_ARG_WITH(slang,
 	AC_MSG_RESULT(yes)
 
 	if test x$with_slang != xyes; then
-	    # Add additional search path
+	    # Add additional search path.
 	    LDFLAGS="-L$with_slang/lib $LDFLAGS"
 	    CPPFLAGS="-I$with_slang/include $CPPFLAGS"
 	fi
 
-	if test x$enable_utf8 != xno; then
+	if test "x$enable_utf8" != xno; then
 	    AC_CHECK_HEADER(slcurses.h,
 		AC_MSG_CHECKING([for SLutf8_enable in -lslang])
 		_libs=$LIBS
@@ -235,7 +268,7 @@ int main(void)
     return 0;
 }],
 		    [AC_MSG_RESULT(yes)
-		    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+		    AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
 		    CURSES_LIB_WIDE=yes
 		    if test x$with_slang != xyes; then
 			CURSES_LIB="-L${with_slang}/lib -lslang"
@@ -245,7 +278,7 @@ int main(void)
 		    CURSES_LIB_NAME=slang],
 		    [AC_MSG_RESULT(no)
 
-		    # We might need the term library
+		    # We might need the term library.
 		    for termlib in ncurses curses termcap terminfo termlib; do
 			AC_CHECK_LIB([${termlib}], tputs, [tcap="-l$termlib"])
 			test -n "$tcap" && break
@@ -261,7 +294,7 @@ int main(void)
     return 0;
 }],
 			[AC_MSG_RESULT(yes)
-			AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+			AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
 			CURSES_LIB_WIDE=yes
 			if test x$with_slang != xyes; then
 			    CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
@@ -271,7 +304,7 @@ int main(void)
 			CURSES_LIB_NAME=slang],
 			[AC_MSG_RESULT(no)
 
-			# We might need the math library
+			# We might need the math library.
 			AC_MSG_CHECKING([for SLutf8_enable in -lslang $tcap -lm])
 			LIBS="$LIBS -lm"
 			AC_TRY_RUN([
@@ -282,7 +315,7 @@ int main(void)
     return 0;
 }],
 			    [AC_MSG_RESULT(yes)
-			    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+			    AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
 			    CURSES_LIB_WIDE=yes
 			    if test x$with_slang != xyes; then
 				CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
@@ -302,8 +335,8 @@ int main(void)
 	fi
 
 	if eval "test x$CURSES_LIB_NAME = x"; then
-	    # Reset libs if the above slang tests failed
-	    if test x$enable_utf8 != xno; then
+	    # Reset libs if the above slang tests failed.
+	    if test "x$enable_utf8" != xno; then
 		LIBS=$_libs
 	    fi
 
@@ -319,7 +352,7 @@ int main(void)
     return 0;
 }],
 		    [AC_MSG_RESULT(yes)
-		    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+		    AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
 		    if test x$with_slang != xyes; then
 			CURSES_LIB="-L${with_slang}/lib -lslang"
 		    else
@@ -328,7 +361,7 @@ int main(void)
 		    CURSES_LIB_NAME=slang],
 		    [AC_MSG_RESULT(no)
 
-		    # We might need the term library
+		    # We might need the term library.
 		    for termlib in ncurses curses termcap terminfo termlib; do
 			AC_CHECK_LIB([${termlib}], tputs, [tcap="-l$termlib"])
 			test -n "$tcap" && break
@@ -344,7 +377,7 @@ int main(void)
     return 0;
 }],
 			[AC_MSG_RESULT(yes)
-			AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+			AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
 			if test x$with_slang != xyes; then
 			    CURSES_LIB="-L${with_slang}/lib -lslang $tcap"
 			else
@@ -353,7 +386,7 @@ int main(void)
 			CURSES_LIB_NAME=slang],
 			[AC_MSG_RESULT(no)
 
-			# We might need the math library
+			# We might need the math library.
 			AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap -lm])
 			LIBS="$LIBS -lm"
 			AC_TRY_RUN([
@@ -364,7 +397,7 @@ int main(void)
     return 0;
 }],
 			    [AC_MSG_RESULT(yes)
-			    AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes
+			    AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.])
 			    if test x$with_slang != xyes; then
 				CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm"
 			    else
@@ -392,57 +425,79 @@ int main(void)
 	;;
     esac], [AC_MSG_RESULT(no)])
 
-if test x$CURSES_LIB_NAME = xslang; then
-    AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.]) tiny_support=yes
-    AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.])
-    AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.])
-    AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.])
-    AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.])
-    AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).])
-    AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.])
-    AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion functions for files and search strings.])
-    AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.])
-fi
-
-AM_CONDITIONAL(USE_COLOR, test x$color_support = xyes)
-AM_CONDITIONAL(USE_NANORC, test x$nanorc_support = xyes)
-
-AC_ARG_ENABLE(altrcname,
-[  --enable-altrcname          Specify alternate rcfile name (default: .nanorc)],
-[if test x$enableval != no; then
-    AC_DEFINE_UNQUOTED(RCFILE_NAME, "$enableval", [Specify alternate rcfile name (default: .nanorc)]) rcfilename=$enableval
-fi])
 
 dnl Checks for functions.
 
-AC_CHECK_FUNCS(getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf)
+AC_CHECK_FUNCS(getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen snprintf vsnprintf)
 
-if test x$enable_utf8 != xno; then
+if test "x$enable_utf8" != xno; then
     AC_CHECK_FUNCS(iswalnum iswblank iswpunct iswspace nl_langinfo mblen mbstowcs mbtowc wctomb wcwidth)
 fi
 
+if test x$ac_cv_func_snprintf = xno; then
+    AM_PATH_GLIB_2_0(2.0.0,,
+	AC_MSG_ERROR([
+*** snprintf() not found.  GLIB 2.x not found either.
+*** You should install the GLIB 2.x library which can
+*** be found at http://ftp.gtk.org/.]),
+	glib)
+fi
+
 if test x$ac_cv_func_vsnprintf = xno; then
     AM_PATH_GLIB_2_0(2.0.0,,
 	AC_MSG_ERROR([
-*** vsnprintf() not found.  GLIB 2.x not found either.  You should
-*** install the GLIB 2.x library which can be found at
-*** ftp://ftp.gtk.org/.]),
+*** vsnprintf() not found.  GLIB 2.x not found either.
+*** You should install the GLIB 2.x library which can
+*** be found at http://ftp.gtk.org/.]),
 	glib)
 fi
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 
+dnl Checks for available flags.
+
+AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"], [], [])
+
 dnl Checks for library functions.
+
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(getopt_long)
+
 dnl Checks for libraries.
 
 if eval "test x$CURSES_LIB_NAME = x"; then
+    if test "x$enable_utf8" != xno; then
+	PKG_CHECK_MODULES([NCURSESW], [ncursesw], [
+	    CURSES_LIB=$NCURSESW_LIBS
+	    CPPFLAGS="$NCURSESW_CFLAGS $CPPFLAGS"
+	    CURSES_LIB_NAME=ncursesw
+	    CURSES_LIB_WIDE=yes
+	], [:])
+    else
+	PKG_CHECK_MODULES([NCURSES], [ncurses], [
+	    CURSES_LIB=$NCURSES_LIBS
+	    CPPFLAGS="$NCURSES_CFLAGS $CPPFLAGS"
+	    CURSES_LIB_NAME=ncurses
+	], [:])
+    fi
+fi
+
+if eval "test x$CURSES_LIB_NAME = x"; then
     AC_CHECK_HEADERS(ncurses.h)
 
-    if test x$enable_utf8 != xno; then
-	AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CPPFLAGS="-I/usr/include/ncursesw $CPPFLAGS" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
+    if test "x$enable_utf8" != xno; then
+	OLDLIBS="$LIBS"
+	AC_CHECK_TOOL(NCURSESW_CONFIG, ncursesw5-config, no)
+	if test "x$NCURSESW_CONFIG" != xno; then
+	    CURSES_LIB=`$NCURSESW_CONFIG --libs`
+	    LIBS="$CURSES_LIB $LIBS"
+	    CPPFLAGS="`$NCURSESW_CONFIG --cflags` $CPPFLAGS"
+	    AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
+	else
+	    AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes])
+	fi
+	LIBS="$OLDLIBS"
     fi
 
     if eval "test x$CURSES_LIB_NAME = x"; then
@@ -453,12 +508,12 @@ fi
 if eval "test x$CURSES_LIB_NAME = x"; then
     AC_CHECK_HEADERS(curses.h)
 
-    if test x$enable_utf8 != xno; then
+    if test "x$enable_utf8" != xno; then
 	AC_CHECK_LIB(curses, get_wch, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses CURSES_LIB_WIDE=yes])
     fi
 
     if eval "test x$CURSES_LIB_NAME = x"; then
-	 AC_CHECK_LIB(curses, initscr, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses])
+	AC_CHECK_LIB(curses, initscr, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses])
     fi
 fi
 
@@ -486,7 +541,7 @@ if test "x$GLIB_LIBS" != "x"; then
     LDFLAGS="$LDFLAGS $GLIB_LIBS"
 fi
 
-if test x$enable_utf8 != xno && \
+if test "x$enable_utf8" != xno && \
     test x$CURSES_LIB_WIDE = xyes && \
     test x$ac_cv_func_iswalnum = xyes && \
     test x$ac_cv_func_iswpunct = xyes && \
@@ -499,14 +554,14 @@ if test x$enable_utf8 != xno && \
     test x$ac_cv_func_wcwidth = xyes; then
 	AC_DEFINE(ENABLE_UTF8, 1, [Define this if your system has sufficient UTF-8 support (a wide curses library, iswalnum(), iswpunct(), iswblank() or iswspace(), nl_langinfo, mblen(), mbstowcs(), mbtowc(), wctomb(), and wcwidth()).])
 else
-    if test x$enable_utf8 = xyes; then
+    if test "x$enable_utf8" = xyes; then
 	AC_MSG_ERROR([
 *** UTF-8 support was requested, but insufficient UTF-8 support was
 *** detected in your curses and/or C libraries.  Please verify that your
 *** slang was built with UTF-8 support or your curses was built with
 *** wide character support, and that your C library was built with wide
 *** character support.])
-    elif test x$enable_utf8 != xno; then
+    elif test "x$enable_utf8" != xno; then
 	AC_MSG_WARN([
 *** Insufficient UTF-8 support was detected in your curses and/or C
 *** libraries.  If you want UTF-8 support, please verify that your slang
@@ -517,9 +572,24 @@ else
 fi
 
 if test x$color_support = xyes; then
-	# now check for the end of word boundary support (/< and />)
+	# Now check for the end-of-word boundary support (/< and />).
 	AC_MSG_CHECKING([for GNU-style word boundary regex support])
-	AC_TRY_RUN([
+
+	AC_ARG_WITH(wordbounds,
+        AS_HELP_STRING([--with-wordbounds], [Use GNU-style word boundary delimiters]),
+	[ case "$with_wordbounds" in
+	    no)
+		AC_MSG_RESULT(no)
+		;;
+	    *)
+		AC_MSG_RESULT(yes)
+		# We explicitly don't check if the user forced the option, because
+		# this is needed for cross compilers and we can't test the target.
+		AC_DEFINE(GNU_WORDBOUNDS, 1, [Define this if the system supports GNU-style word boundaries in regexes.]) gnu_wordbounds=yes,
+		;;
+	  esac
+	], [
+	    AC_TRY_RUN([
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -531,16 +601,18 @@ int main(void)
     regmatch_t pmatch;
 
     if (regcomp(&r, "\\\\>", REG_EXTENDED|REG_NOSUB))
-        return 1;
+	return 1;
     if (regexec(&r, "word boundary", nmatch, &pmatch, 0))
-        return 1;
+	return 1;
     return 0;
 }],
-	AC_MSG_RESULT(yes)
-	AC_DEFINE(GNU_WORDBOUNDS, 1, [Define if the system supports GNU-style word boundaries in regexes.]) gnu_wordbounds=yes,
-	AC_MSG_RESULT(no),
-        AC_MSG_WARN([*** Can't check for GNU-style word boundary support when cross-compiling])
-)
+	    AC_MSG_RESULT(yes)
+	    AC_DEFINE(GNU_WORDBOUNDS, 1, [Define this if the system supports GNU-style word boundaries in regexes.]) gnu_wordbounds=yes,
+	    AC_MSG_RESULT(no),
+	    AC_MSG_WARN([*** Can't check for GNU-style word boundary support when cross-compiling])
+	)
+])
+
 #    if test x$CURSES_LIB_NAME = xcurses; then
 	AC_MSG_CHECKING([whether _XOPEN_SOURCE_EXTENDED is needed])
 	AC_TRY_RUN([
@@ -577,27 +649,37 @@ int main(void)
     LINES = 80;
     COLS = 25;
     return 0;
-}], 
-AC_DEFINE(REDEFINIG_MACROS_OK, 1, [Define this if you know your curses library allows LINES and COLS to be redefined to deal with a resizing bug])
+}],
+AC_DEFINE(REDEFINING_MACROS_OK, 1, [Define this if you know your curses library allows LINES and COLS to be redefined to deal with a resizing bug])
 AC_MSG_RESULT(yes),
 AC_MSG_RESULT(no),
 AC_MSG_WARN([*** Can't check for macro redefinability when cross-compiling]))
 
+AS_IF([test "x$enable_libmagic" != "xno"], [
+  AC_CHECK_HEADERS_ONCE([magic.h])
+  AC_CHECK_LIB(magic, magic_open)
+  AC_CHECK_HEADERS_ONCE([zlib.h])
+  AC_CHECK_LIB(z, inflate)
+])
 
-# Check for groff html support
+# Check for groff html support.
 AC_MSG_CHECKING([for HTML support in groff])
 groff -t -mandoc -Thtml </dev/null >/dev/null
-if test $? -ne 0 ; then 
-    echo "no"
-    echo "*** Will not generate HTML version of man pages  ***"
-    echo "*** Consider installing a newer version of groff with HTML support ***"
+if test $? -ne 0 ; then
+    AC_MSG_RESULT([no])
+    AC_MSG_WARN([*** Will not generate HTML version of man pages  ***
+*** Consider installing a newer version of groff with HTML support ***])
     groff_html_support=no
 else
-    echo "yes"
+    AC_MSG_RESULT([yes])
     groff_html_support=yes
 fi
 AM_CONDITIONAL(GROFF_HTML, test x$groff_html_support = xyes)
 
+# Check for the availability of makeinfo.
+AC_CHECK_PROG(haveit, makeinfo, yes, no)
+AM_CONDITIONAL(HAVE_MAKEINFO, test x$haveit = xyes)
+
 
 AC_CONFIG_FILES([
 Makefile
diff --git a/depcomp b/depcomp
index df8eea7..4ebd5b3 100755
--- a/depcomp
+++ b/depcomp
@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,9 +27,9 @@ scriptversion=2009-04-28.21; # UTC
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
   -h | --h*)
     cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -40,11 +39,11 @@ as side-effects.
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -57,6 +56,66 @@ EOF
     ;;
 esac
 
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -69,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
 
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -80,18 +142,32 @@ if test "$depmode" = hp; then
 fi
 
 if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
 fi
 
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
-   # This is just like msvisualcpp but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
-   depmode=msvisualcpp
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
 fi
 
 case "$depmode" in
@@ -114,8 +190,7 @@ gcc3)
   done
   "$@"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -123,13 +198,17 @@ gcc3)
   ;;
 
 gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
   if test -z "$gccflag"; then
@@ -137,31 +216,31 @@ gcc)
   fi
   "$@" -Wp,"$gccflag$tmpdepfile"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -179,8 +258,7 @@ sgi)
     "$@" -MDupdate "$tmpdepfile"
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -188,43 +266,41 @@ sgi)
 
   if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
     echo "$object : \\" > "$depfile"
-
     # Clip off the initial element (the dependent).  Don't try to be
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
-
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> "$depfile"
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
   else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.u
     tmpdepfile2=$base.u
@@ -237,9 +313,7 @@ aix)
     "$@" -M
   fi
   stat=$?
-
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
@@ -248,44 +322,100 @@ aix)
   do
     test -f "$tmpdepfile" && break
   done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
   fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\' :
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
 
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -297,8 +427,8 @@ icc)
   sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
   # Some versions of the HPUX 10.20 sed can't process this invocation
   # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -309,9 +439,8 @@ hp2)
   # 'foo.d', which lands next to the object file, wherever that
   # happens to be.
   # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from  "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir.libs/$base.d
@@ -322,8 +451,7 @@ hp2)
     "$@" +Maked
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
      rm -f "$tmpdepfile1" "$tmpdepfile2"
      exit $stat
   fi
@@ -333,77 +461,107 @@ hp2)
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
     sed -ne '2,${
-	       s/^ *//
-	       s/ \\*$//
-	       s/$/:/
-	       p
-	     }' "$tmpdepfile" >> "$depfile"
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
   else
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile" "$tmpdepfile2"
   ;;
 
 tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
 
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
@@ -422,7 +580,7 @@ dashmstdout)
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -442,18 +600,18 @@ dashmstdout)
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
+  # Require at least two characters before searching for ':'
   # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -503,12 +661,15 @@ makedepend)
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile" "$tmpdepfile".bak
   ;;
 
@@ -525,7 +686,7 @@ cpp)
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -544,10 +705,10 @@ cpp)
     esac
   done
 
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
@@ -579,23 +740,23 @@ msvisualcpp)
       shift
       ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
+        set fnord "$@"
+        shift
+        shift
+        ;;
     *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
     esac
   done
   "$@" -E 2>/dev/null |
   sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 15f35ee..c197ceb 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,11 @@
+SUBDIRS = man
+
+if HAVE_MAKEINFO
+SUBDIRS += texinfo
+endif
+
 if USE_COLOR
-SUBDIRS = man syntax texinfo
-else
-SUBDIRS = man texinfo
+SUBDIRS += syntax
 endif
 
-EXTRA_DIST = faq.html
+dist_html_DATA = faq.html
diff --git a/doc/Makefile.in b/doc/Makefile.in
index b30918f..d7461b4 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,7 +13,53 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -33,12 +78,15 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-target_triplet = @target@
+@HAVE_MAKEINFO_TRUE@am__append_1 = texinfo
+@USE_COLOR_TRUE@am__append_2 = syntax
 subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/nanorc.sample.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/mkinstalldirs $(srcdir)/nanorc.sample.in \
+	$(dist_html_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
+	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -50,20 +98,87 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = nanorc.sample
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(htmldir)"
+DATA = $(dist_html_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = man texinfo syntax
@@ -95,6 +210,7 @@ am__relativize = \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -140,6 +256,11 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NCURSESW_CFLAGS = @NCURSESW_CFLAGS@
+NCURSESW_CONFIG = @NCURSESW_CONFIG@
+NCURSESW_LIBS = @NCURSESW_LIBS@
+NCURSES_CFLAGS = @NCURSES_CFLAGS@
+NCURSES_LIBS = @NCURSES_LIBS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -151,6 +272,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKGDATADIR = @PKGDATADIR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -180,6 +303,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+haveit = @haveit@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -204,17 +328,12 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-target = @target@
 target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@USE_COLOR_FALSE@SUBDIRS = man texinfo
-@USE_COLOR_TRUE@SUBDIRS = man syntax texinfo
-EXTRA_DIST = faq.html
+SUBDIRS = man $(am__append_1) $(am__append_2)
+dist_html_DATA = faq.html
 all: all-recursive
 
 .SUFFIXES:
@@ -250,24 +369,48 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 nanorc.sample: $(top_builddir)/config.status $(srcdir)/nanorc.sample.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-dist_htmlDATA: $(dist_html_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
+	done
+
+uninstall-dist_htmlDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -282,57 +425,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -348,12 +446,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -365,15 +458,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -382,6 +471,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -418,13 +522,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -446,9 +547,12 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(htmldir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -459,10 +563,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -494,7 +603,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am:
+install-data-am: install-dist_htmlDATA
 
 install-dvi: install-dvi-recursive
 
@@ -538,23 +647,22 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-dist_htmlDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic ctags \
-	ctags-recursive distclean distclean-generic distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic cscopelist-am ctags ctags-am \
+	distclean distclean-generic distclean-tags distdir dvi dvi-am \
+	html html-am info info-am install install-am install-data \
+	install-data-am install-dist_htmlDATA install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
-	tags-recursive uninstall uninstall-am
+	tags-am uninstall uninstall-am uninstall-dist_htmlDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/doc/faq.html b/doc/faq.html
index 70baba5..d24a895 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -24,7 +24,6 @@
 <blockquote><p><a href="#3.1">3.1. How do I install the RPM or DEB package?</a><br>
   <a href="#3.2">3.2. Compiling from source: WHAT THE HECK DO I DO NOW?</a><br>
   <a href="#3.3">3.3. Why does everything go into /usr/local?</a><br>
-  <a href="#3.4">3.4. I get errors about 'bindtextdomain','gettext', and/or 'gettextdomain'. What can I do about it?</a><br>
   <a href="#3.5">3.5. nano should automatically run strip on the binary when installing it!</a><br>
   <a href="#3.6">3.6. How can I make the executable smaller? This is too bloated!</a><br>
   <a href="#3.7">3.7. Tell me more about this multibuffer stuff!</a><br>
@@ -46,7 +45,8 @@
   <a href="#4.11">4.11. How do I make nano my default editor (in Pine, mutt, etc.)?</a><br>
   <a href="#4.12">4.12. I've compiled nano with color support, but I don't see any color when I run it!</a><br>
   <a href="#4.13">4.13. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</a><br>
-  <a href="#4.14">4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</a></p></blockquote>
+  <a href="#4.14">4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</a><br>
+  <a href="#4.15">4.15. On startup I get a message that says "Detected a legacy nano history file".  Now older nano versions can't find my search history!</a></p></blockquote>
 <h2><a href="#5">5. Internationalization</a></h2>
 <blockquote><p><a href="#5.1">5.1. There's no translation for my language!</a><br>
   <a href="#5.2">5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</a><br>
@@ -84,7 +84,7 @@
 <h2><a name="1.5"></a>1.5. Why the name change from TIP?</h2>
 <blockquote><p>On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program &quot;establishes a full duplex terminal connection to a remote host&quot;, and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).</p></blockquote>
 <h2><a name="1.6"></a>1.6. What is the current version of nano?</h2>
-<blockquote><p>The current version of nano *should* be 2.2.0. Of course, you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
+<blockquote><p>The current stable version of nano *should* be 2.2.6. Of course, you should always check the nano homepage to see what the latest and greatest version is.</p></blockquote>
 <h2><a name="1.7"></a>1.7. I want to read the man page without having to download the program!</h2>
 <blockquote><p>Jeez, demanding, aren't we? Okay, look <a href="http://www.nano-editor.org/dist/v2.2/nano.1.html">here</a>.</p></blockquote>
 <hr width="100%">
@@ -93,7 +93,6 @@
 <blockquote><p>The nano distribution can be downloaded at the following fine web and ftp sites:</p>
   <ul>
     <li><a href="http://www.nano-editor.org/dist/">http://www.nano-editor.org/dist/</a></li>
-    <li><a href="http://www.ewtoo.org/~astyanax/nano/dist/">http://www.ewtoo.org/~astyanax/nano/dist/</a></li>
     <li><a href="ftp://ftp.gnu.org/pub/gnu/nano/">ftp://ftp.gnu.org/pub/gnu/nano/</a></li>
   </ul>
 </blockquote>
@@ -101,18 +100,17 @@
 <blockquote>
   <ul>
     <li><a href="http://www.nano-editor.org/dist/v2.2/RPMS/">http://www.nano-editor.org/dist/v2.2/RPMS/</a></li>
-    <li><a href="http://www.ewtoo.org/~astyanax/nano/dist/v2.2/RPMS/">http://www.ewtoo.org/~astyanax/nano/dist/v2.2/RPMS/</a></li>
   </ul>
 </blockquote>
 <h2><a name="2.3"></a>2.3. Debian (.deb) packages.</h2>
 <blockquote><p>Debian users can check out the current nano packages for:</p>
   <ul>
-    <li><a href="http://packages.debian.org/stable/editors/nano.html">stable</a></li>
-    <li><a href="http://packages.debian.org/testing/editors/nano.html">testing</a></li>
-    <li><a href="http://packages.debian.org/unstable/editors/nano.html">unstable</a></li>
+    <li><a href="http://packages.debian.org/stable/editors/nano">stable</a></li>
+    <li><a href="http://packages.debian.org/testing/editors/nano">testing</a></li>
+    <li><a href="http://packages.debian.org/unstable/editors/nano">unstable</a></li>
   </ul>
   <p>You can also have a look at the <a href="ftp://ftp.debian.org/debian/pool/main/n/nano/">Package Pool</a> to see all the available binary and source packages.</p>
-  <p>Note that versions &lt; 0.9.10 are probably not for those wanting to get serious work done, so if you are using Debian 2.2, check that you have updated to 2.2r3, which comes with nano 0.9.23. If you're tracking unstable, you probably have the newest version already.</p></blockquote>
+</blockquote>
 <h2><a name="2.4"></a>2.4. By subversion (for the brave).</h2>
 <blockquote><p>For the 'bleeding edge' current version of nano, you can use subversion to download the current source code. <b>Note:</b> believe it or not, by downloading code that has not yet stabilized into an official release, there could quite possibly be bugs, in fact the code may not even compile! Anyway, see <a href="http://svn.savannah.gnu.org/viewvc/trunk/nano/README.SVN?root=nano&view=markup">the nano SVN document</a> for info on anonymous SVN access to the nano source.</p></blockquote>
 <hr width="100%">
@@ -121,10 +119,8 @@
 <blockquote><p>It's simple really! As root, type <b>rpm -Uvh nano-x.y.z-1.i386.rpm</b> if you have a RedHat-ish system or <b>dpkg -i nano_x.y.z-1.deb</b> if you have a Debian-ish system, where <b>x.y.z</b> is the release of nano. There are other programs to install packages, and if you wish to use those, knock yourself out.</p></blockquote>
 <h2><a name="3.2"></a>3.2. Compiling from source: WHAT THE HECK DO I DO NOW?</h2>
 <blockquote><p>Okay, take a deep breath, this really isn't hard. Unpack the nano source with a command like:</p>
-  <p><b>tar -zxvf nano-x.y.z.tar.gz</b></p>
-  <p>If you get error messages about the -z option, try this:</p>
-  <p><b>gzip -dc nano-x.y.z.tar.gz | tar xvf -</b></p>
-  <p>(again, where x.y.z is the version number in question). Then you need to run configure with any options you might want (if any).</p>
+  <p><b>tar -xvf nano-x.y.z.tar.gz</b></p>
+  <p>Then you need to run <b>configure</b> with any options you might want (if any).</p>
   <p>The average case is this:</p>
   <p><b>cd nano-x.y.z/</b><br>
   <b>./configure</b><br>
@@ -134,73 +130,67 @@
 <blockquote><p>Well, that's what the <b>configure</b> script defaults to. If you wish to change this, simply do this:</p>
   <p><b>./configure --prefix=/usr</b></p>
   <p>to put nano into /usr/bin when you run <b>make install</b>.</p></blockquote>
-<h2><a name="3.4"></a>3.4. I get errors about 'bindtextdomain', 'gettext', and/or 'gettextdomain'. What can I do about it?</h2>
-<blockquote><p>Try doing a <b>./configure --with-included-gettext</b> and see if that solves your problem. You may need to do a <b>make clean; make</b> to get it to work fully.</p></blockquote>
 <h2><a name="3.5"></a>3.5. nano should automatically run strip on the binary when installing it!</h2>
 <blockquote><p>Actually, it does, but you have to use <b>make install-strip</b>. The default make install does not, and will not, run strip automatically.</p></blockquote>
 <h2><a name="3.6"></a>3.6. How can I make the executable smaller? This is too bloated!</h2>
 <blockquote><p>Actually, there are several parts of the editor that can be disabled. You can pass arguments to the <b>configure</b> script that disable certain features. Here's a brief list:</p>
   <pre>
-  <b>--disable-tabcomp</b>       Disable tab completion functions
-  <b>--disable-justify</b>       Disable justify/unjustify functions
-  <b>--disable-speller</b>       Disable spell checker functions
-  <b>--disable-help</b>          Disable help functions
   <b>--disable-browser</b>       Disable built-in file browser
-  <b>--disable-wrapping</b>      Disable all wrapping of text (and -w flag)
+  <b>--disable-color</b>         Disable color and syntax highlighting
+  <b>--disable-extra</b>         Disable extra features, currently only an easter egg
+  <b>--disable-help</b>          Disable help functions
+  <b>--disable-justify</b>       Disable justify/unjustify functions
   <b>--disable-mouse</b>         Disable mouse support (and -m flag)
-  <b>--disable-operatingdir</b>  Disable setting of operating directory</pre>
-  <p>There's also the <b>--enable-tiny</b> option which disables everything above, as well as some larger chunks of the program (like the marker code that you use Control-^ to select with). Also, if you know you aren't going to be using other languages you can use <b>--disable-nls</b> to disable internationalization and save a few K to a few dozen K depending on if you have locale support on your system. And finally there's always good old <b>strip</b> to strip all debugging code and code that exists in libraries on your system.</p>
-  <p>If, on the other hand, you can't live without bells and whistles, you could try:</p>
-  <pre>
-  <b>--enable-extra</b>          Enable extra features, currently only easter eggs
-  <b>--enable-nanorc</b>         Enable use of .nanorc files
-  <b>--enable-color</b>          Enable color and syntax highlighting
-  <b>--enable-multibuffer</b>    Enable having multiple file buffers open
-  <b>--enable-all</b>            Enable all of the above features
-  <b>--disable-wrapping-as-root</b>
-                          Disable text wrapping by default when the user is
-                          root</pre></blockquote>
+  <b>--disable-multibuffer</b>   Disable having multiple file buffers open
+  <b>--disable-nanorc</b>        Disable the use of .nanorc files
+  <b>--disable-operatingdir</b>  Disable setting of operating directory
+  <b>--disable-speller</b>       Disable spell checker functions
+  <b>--disable-tabcomp</b>       Disable tab completion functions
+  <b>--disable-wrapping</b>      Disable all wrapping of text (and -w flag)</pre>
+  <p>There's also the <b>--enable-tiny</b> option which disables everything above, as well as some larger chunks of the program (like the marker code that you use with Control-^ to select text). Also, if you know you aren't going to be using other languages you can use <b>--disable-nls</b> to disable internationalization and save a few K to a few dozen K depending on if you have locale support on your system. And finally there's always good old <b>strip</b> to strip all debugging code and code that exists in libraries on your system.</p>
+  <p>With <b>--disable-wrapping-as-root</b> you can disable any hard-wrapping by default when the user is root, useful to prevent accidentally changing long lines in system configuration files.</p>
+</blockquote>
 <h2><a name="3.7"></a>3.7. Tell me more about this multibuffer stuff!</h2>
-<blockquote><p>To use multiple file buffers, you must be using nano 1.1.0 or newer, and you must have configured nano with <b>--enable-multibuffer</b> (use nano -V to check). Then when you want to enable inserting a file into its own buffer instead of into the current file, just hit <b>Meta-F</b>, then insert the file as normal with <b>^R</b>. If you always want files to be loaded into their own buffers, use the <b>--multibuffer</b> or <b>-F</b> flag when you invoke nano.</p>
+<blockquote><p>To use multiple file buffers, you must be using nano 1.1.0 or newer, and you must not have configured it with <b>--disable-multibuffer</b> nor with <b>--enable-tiny</b> (use <b>nano -V</b> to check the compilation options). Then when you want to insert a file into its own buffer instead of into the current file, just hit <b>Meta-F</b>, then insert the file as normal with <b>^R</b>. If you always want files to be loaded into their own buffers, use the <b>--multibuffer</b> or <b>-F</b> flag when you invoke nano.</p>
   <p>You can move between the buffers you have open with the <b>Meta-&lt;</b> and <b>Meta-&gt;</b> keys, or more easily with <b>Meta-,</b> and <b>Meta-.</b> (clear as mud, right? =-). When you have more than one file buffer open, the ^X shortcut will say &quot;Close&quot;, instead of the normal &quot;Exit&quot; when only one buffer is open.</p></blockquote>
 <h2><a name="3.8"></a>3.8. Tell me more about this verbatim input stuff!</h2>
-<blockquote><p>To use verbatim input, you must be using nano 1.3.1 or newer. When you want to insert a literal character into the file you're editing, such as a control character that nano usually treats as a command, first press <b>Meta-V</b>. (If you're not at a prompt, you'll get the message &quot;Verbatim Input&quot;.) Then press the key(s) that generate the character you want.</p>
-  <p>Alternatively, if you've enabled Unicode support (see section <a href="#5.3">5.3</a>), you can press <b>Meta-V</b> and then type a six-digit hexadecimal code from 000000 to 10FFFF (case-insensitive), and the character with the corresponding value will be inserted instead. The prompt will change to &quot;Unicode Input&quot; when you do this.</p></blockquote>
+<blockquote><p>To use verbatim input, you must be using nano 1.3.1 or newer. When you want to insert a literal character into the file you're editing, such as a control character that nano usually treats as a command, first press <b>Meta-V</b> (if you're not at a prompt, you'll get the message &quot;Verbatim Input&quot;), then press the key(s) that generate the character you want.</p>
+  <p>Alternatively, if you've enabled Unicode support (see section <a href="#5.3">5.3</a>), you can press <b>Meta-V</b> and then type a six-digit hexadecimal code (from 000000 to 10FFFF, case-insensitive), and the character with the corresponding value will be inserted instead. The prompt will change to &quot;Unicode Input&quot; when you do this.</p></blockquote>
 <h2><a name="3.9"></a>3.9. How do I make a .nanorc file that nano will read when I start it?</h2>
-<blockquote><p>It's not hard at all! But, your version of nano must have been compiled with <b>--enable-nanorc</b>, and again must be version 1.1.12 or newer (use nano -V to check your version and compiled features). Then simply copy the <b>nanorc.sample</b> that came with the nano source or your nano package (most likely in /usr/doc/nano) to .nanorc in your home directory. If you didn't get one, the syntax is simple. Flags are turned on and off by using the word <b>set</b> and the getopt_long flag for the feature, for example &quot;set nowrap&quot; or &quot;set suspend&quot;.</p></blockquote>
+<blockquote><p>It's not hard at all! But, your version of nano must not have been compiled with <b>--disable-nanorc</b>, and must be version 1.1.12 or newer (use nano -V to check your version and compiled features). Then simply copy the <b>nanorc.sample</b> that came with the nano source or your nano package (most likely in /usr/doc/nano) to .nanorc in your home directory. If you didn't get one, the syntax is simple. Flags are turned on and off by using the word <b>set</b> and the getopt_long flag for the feature, for example &quot;set nowrap&quot; or &quot;set suspend&quot;.</p></blockquote>
 <h2><a name="3.9.1"></a>3.9. How about in Win32?</h2>
 <blockquote><p>If you're using the official nano .zip file and have extracted all the files, you should take the file nano.rc and place it somewhere on your Win32 system (for example if you have write permission to do so, at the top of C:\).  Then you must create an Environment variable called HOME which points to the directory where you put nano.rc.  In Windows XP, you can get to Environment variables by right-clicking "My Computer" either on the desktop or in the Start Menu, and selecting Properties.  This should bring up the System Properties panel.  Then click the Advanced Tab, and there should be a button called Environment Variables.  Click that to bring up the Environment Variables section. Now, under User Variables you should be able to click the New button, and make a new Variables Name called HOME, with the Variable Value of whatever path you copied nano.rc into (just the directory name; don't add nano.rc onto the end).</p>
-<p>We're still working on documentatino for enabling synax highlighting on Win32; please bear with us</p>
-<p>Note that the nano.rc file must remain Unix formated in order for nano to unerstand it.  In other words, you should use probably only use nano to edit its config file.  Other programs like Wordpad and Notepad will either convert the file to DOS format when saving, and the latter does not even properly read Unix-formatted files to begin with.</p></blockquote>
+<p>We're still working on documentation for enabling synax highlighting on Win32; please bear with us.</p>
+<p>Note that the nano.rc file must remain Unix-formated in order for nano to understand it.  In other words, you should probably use only nano to edit its config file.  Other programs like Wordpad and Notepad will convert the file to DOS format when saving, and the latter does not even properly read Unix-formatted files to begin with.</p></blockquote>
 <hr width="100%">
 <h1><a name="4"></a>4. Running</h1>
 <h2><a name="4.1"></a>4.1. How do I open a file with a name beginning with '+' from the command line?</h2>
-<blockquote><p>If a command line option that begins with '+' is followed by another option, the former is always treated as a starting line and column number and the latter is always treated as a filename. If a command line option that begins with '+' isn't followed by another option, it's always treated as a filename. Examples:</p>
+<blockquote><p>If a command-line option that begins with '+' is followed by another option, the former is always treated as a starting line and column number, and the latter is always treated as a filename. If a command-line option that begins with '+' isn't followed by another option, it's always treated as a filename. Examples:</p>
   <p>To open '+filename.txt' starting on line 1: <b>nano +filename.txt</b><br>
   To open '+filename.txt' starting on line 10: <b>nano +10 +filename.txt</b><br>
   To open '+filename.txt' starting on line 1, column 20: <b>nano +,20 +filename.txt</b><br>
   To open '+filename.txt' starting on line 10, column 20: <b>nano +10,20 +filename.txt</b><br>
-  To open '+filename.txt' starting on line 1 and 'filename.txt' starting on line 10 (if nano has been compiled with multibuffer support): <b>nano +1 +filename.txt +20 filename.txt</b></p></blockquote>
+  To open '+filename.txt' starting on line 1 and 'filename.txt' starting on line 40 (if nano has been compiled with multibuffer support): <b>nano +1 +filename.txt +40 filename.txt</b></p></blockquote>
 <h2><a name="4.2"></a>4.2. Ack! My Backspace/Delete/Enter/Meta/double bucky key doesn't seem to work! What can I do?</h2>
 <blockquote><p>Try setting your $TERM variable to 'vt100'. nano doesn't yet support every term entry under the sun.</p>
   <p>Bourne shell users (bash and sh): <b>export TERM=vt100</b><br>
   C Shell users (tcsh and csh): <b>setenv TERM vt100</b></p></blockquote>
 <h2><a name="4.3"></a>4.3. Ack! My numeric keypad's keys don't work properly when NumLock is off! What can I do?</h2>
-<blockquote><p>You can use the <b>-K</b> or <b>--rebindkeypad</b> options on the command line, or add the line <b>set rebindkeypad</b> to your .nanorc. However, nano's mouse support won't work properly if you do any of these things.</p></blockquote>
+<blockquote><p>You can use the <b>-K</b> or <b>--rebindkeypad</b> option on the command line, or add the line <b>set rebindkeypad</b> to your .nanorc. However, nano's mouse support won't work properly if you do any of these things.</p></blockquote>
 <h2><a name="4.4"></a>4.4. Ack! When I hold down a Meta key combination for a while, the character of the held key gets inserted now and then. What gives?</h2>
 <blockquote><p>This is a bug in the terminal, not in nano. When a key is repeating faster than nano can process it, the keyboard buffer becomes full and starts dropping incoming keystrokes. Unfortunately, it doesn't just drop whole keystrokes; it can also drop parts of multibyte key combinations, resulting in nano's receiving a wrong key.</p></blockquote>
 <h2><a name="4.5"></a>4.5. How do I type the F13-F16 keys shown in the help browser? My keyboard only has F1-F12!</h2>
 <blockquote><p>It depends on the terminal type you're using. On some terminals, such as the FreeBSD console, xterm, konsole, and gnome-terminal, Shift-F1 to Shift-F4 will generate F13 to F16. On other terminals, such as the Linux console, rxvt, and Eterm, Shift-F3 to Shift-F6 will generate F13 to F16.</p></blockquote>
 <h2><a name="4.6"></a>4.6. nano crashes when I type &lt;insert keystroke here&gt;!</h2>
-<blockquote><p>If you aren't trying some bizarre keystroke combination with some bizarre $TERM entry, chances are you have found a bug. You are welcome to submit it to the <a href="mailto:nano-devel@gnu.org">nano-devel</a> list or to <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a>.</p></blockquote>
+<blockquote><p>If you aren't trying some bizarre keystroke combination with some bizarre $TERM entry, chances are you have found a bug. You are welcome to submit it to the <a href="mailto:nano-devel@gnu.org">nano-devel</a> list or in the <a href="https://savannah.gnu.org/bugs/?group=nano">bug database</a> on Savannah.</p></blockquote>
 <h2><a name="4.7"></a>4.7. nano crashes when I resize my window. How can I fix that?</h2>
-<blockquote><p>Older versions of nano had this problem, please upgrade to a newer version (at least 0.9.9 would be great, 0.9.12 is recommended).</p></blockquote>
+<blockquote><p>Older versions of nano had this problem, please upgrade to a newer version (at least 0.9.9, but 2.2.6 is recommended).</p></blockquote>
 <h2><a name="4.8"></a>4.8. [version 1.3.12 and later] I'm using glibc 2.2.3, and nano crashes when I use color support or do regular expression searches. How can I fix that?</h2>
 <blockquote><p>It's a bug in glibc 2.2.3. You should upgrade to at least glibc 2.2.4.</p></blockquote>
 <h2><a name="4.9"></a>4.9. [version 1.1.12 and earlier] Why does nano show ^\ in the shortcut list instead of ^J?</h2>
-<blockquote><p>The help (^G) and justify (^J) function were among the last to be written. To show the improvements that nano had over Pico (go to line # and replace), ^_ and ^\ were put on the shortcut list. Later, ^G came back in place of ^_ as it proved to be very valuable for new Unix users. If you use the <b>-p</b> option to nano (or hit Meta-P) you will get the same shortcuts at the bottom as Pico.</p></blockquote>
+<blockquote><p>The help (^G) and justify (^J) functions were among the last to be written. To show the improvements that nano had over Pico (go to line number, and replace), ^_ and ^\ were put on the shortcut list. Later, ^G came back in place of ^_ as it proved to be very valuable for new Unix users.</p></blockquote>
 <h2><a name="4.10a"></a>4.10a. [version 1.1.12 and earlier] When I type in a search string, the string I last searched for is already in front of my cursor! What happened?!</h2>
-<blockquote><p>In nano version 0.9.20, the default is to have a completely consistent user interface across all user input functions. This means that regardless of whether you're being asked for a filename to insert or write, or a string to search for, the previous value is already inserted before the cursor. If you prefer the old behavior, use the Pico emulation mode (-p or --pico) or just hit Meta-P while in nano (see the ^G help text for more details).</p></blockquote>
+<blockquote><p>Since nano version 0.9.20, the default was to have a completely consistent user interface across all user input functions. This means that regardless of whether you're being asked for a filename to insert or write, or a string to search for, the previous value is already inserted before the cursor.</p></blockquote>
 <h2><a name="4.10b"></a>4.10b. [version 1.1.99pre1 and later] Hey, the search string behavior has reverted, it's now like Pico, what happened to the consistency?</h2>
 <blockquote><p>It was decided that consistency was nice, but people are used to Pico's inconsistent behavior. Also, in version 1.1.99pre1, search and replace history was introduced. If you wish to edit your previous search/replace entry (or any previous entry), you can do so by hitting the up arrow to cycle through your history. This method allows the best of both worlds: You don't need to erase the previous string if you want to enter a new one, but you can with one keystroke recall previous entries for editing. Therefore there is now no "Pico mode", nano is and has always been a Pico <b>clone</b>, and clones by default should be compatible.</p></blockquote>
 <h2><a name="4.11"></a>4.11. How do I make nano my default editor (in Pine, mutt, etc.)?</h2>
@@ -208,7 +198,7 @@
   <p><b>export EDITOR=/usr/local/bin/nano</b></p>
   <p>or, if you use tcsh, put this in your <b>.cshrc</b> file:</p>
   <p><b>setenv EDITOR /usr/local/bin/nano</b></p>
-  <p>Change /usr/local/bin/nano to wherever nano is installed on your system. Type &quot;which nano&quot; to find out. This will not take effect until the next time you login. So log out and back in again.</p>
+  <p>Change /usr/local/bin/nano to wherever nano is installed on your system. Type &quot;which nano&quot; to find out. This will not take effect until the next time you log in. So log out and back in again.</p>
   <p>Then, on top of that, if you use Pine, you must go into setup (type <b>S</b> at the main menu), and then configure (type <b>C</b>). Hit Enter on the lines that say:</p>
   <p><b>[ ] enable-alternate-editor-cmd</b><br>
   <b>[ ] enable-alternate-editor-implicitly</b></p>
@@ -217,19 +207,24 @@
   <p><b>my_hdr X-Composer: nano x.y.z</b></p>
   <p>Again, replace x.y.z with the version of nano you use.</p></blockquote>
 <h2><a name="4.12"></a>4.12. I've compiled nano with color support, but I don't see any color when I run it!</h2>
-<blockquote><p>If you want nano to actually use color, you have to specify the color configurations you want it to use in your .nanorc. Some example configurations are in the <b>nanorc.sample</b> that comes with the nano source or your nano package. See Section <a href="#3.9">3.9</a>.</p></blockquote>
+<blockquote><p>If you want nano to actually use color, you have to specify the color configurations you want it to use in your .nanorc. Several example configurations are in the <b>doc/syntax</b> subdirectory of the nano source, which are normally installed to <b>/usr/local/share/nano</b>. To enable all of them, uncomment the line <b># include "/usr/local/share/nano/*.nanorc"</b> in your nanorc. See also section <a href="#3.9">3.9</a>.</p></blockquote>
 <h2><a name="4.13"></a>4.13. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?</h2>
 <blockquote><p>Try holding down the Shift key and selecting or pasting the text as you normally would.</p></blockquote>
 <h2><a name="4.14"></a>4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?</h2>
 <blockquote><p>You have the autoindent feature turned on. Hit Meta-I to turn it off, paste your text, and then hit Meta-I again to turn it back on.</p></blockquote>
+<h2><a name="4.15"></a>4.15. On startup I get a message that says "Detected a legacy nano history file".  Now older nano versions can't find my search history!</h2>
+<blockquote><p>In nano 2.3.0, cursor-position history was introduced, and both history files now reside under a .nano directory in your home.  nano was trying to move this file into the new location so it could continue to use it.  This means that if you try and use an earlier version of nano, it will be unable to see your current search history.  To fix this, run the following commands:<br>
+mv ~/.nano/search_history ~/.nano_history<br>
+ln -sf ~/.nano_history ~/.nano/search_history<br>
+</p></blockquote>
 <hr width="100%">
 <h1><a name="5"></a>5. Internationalization</h1>
 <h2><a name="5.1"></a>5.1. There's no translation for my language!</h2>
-<blockquote><p>On June of 2001, GNU nano entered the <a href="http://translationproject.org/html/welcome.html">Free Translation Project</a> and since then, translations should be managed from there.</p>
-  <p>If there isn't a translation for your language, you could ask <a href="http://translationproject.org/team/">your language team</a> to translate nano, or better still, join your team and do it yourself. Joining a team is easy. You just need to ask the <a href="mailto:coordinator@translationproject.org">TP coordinator</a> to add you to your team, and send a <a href="http://translationproject.org/disclaim.txt">translation disclaimer to the FSF</a> (this is necessary as nano is an official GNU package, but it does <b>not</b> mean that you transfer the rights of your work to the FSF, it's just so the FSF can legally manage them).</p>
-  <p>In any case, translating nano is very easy. Just grab the <b>nano.pot</b> file from the latest and greatest nano distribution (it's in the <b>po/</b> directory) and translate each line into your native language on the <b>msgstr</b> line. When you're done, you should send it to the TP's central po repository.</p></blockquote>
+<blockquote><p>On June of 2001, GNU nano entered the <a href="http://translationproject.org/html/welcome.html">Translation Project</a> and since then, translations should be managed from there.</p>
+  <p>If there isn't a translation for your language, you could ask <a href="http://translationproject.org/team/">your language team</a> to translate nano, or better still, join that team and do it yourself. Joining a team is easy. You just need to ask the team leader to add you, and then send a <a href="http://translationproject.org/disclaim.txt">translation disclaimer to the FSF</a> (this is necessary as nano is an official GNU package, but it does <b>not</b> mean that you transfer the rights of your work to the FSF, it's just so the FSF can legally manage them).</p>
+  <p>In any case, translating nano is very easy. Just grab the latest <b>nano.pot</b> file listed on <a href="http://translationproject.org/domain/nano.html">nano's page</a> at the TP, and translate each <b>msgid</b> line into your native language on the <b>msgstr</b> line. When you're done, you should send it to the TP's central po repository.</p></blockquote>
 <h2><a name="5.2"></a>5.2. I don't like the translation for &lt;x&gt; in my language. How can I fix it?</h2>
-<blockquote><p>The best way would probably be to e-mail the person listed in the <code>Last-Translator:</code> field in the <b>&lt;your_language&gt;.po</b> file with your suggested corrections and they can make the changes reach the nano-devel list.</p></blockquote>
+<blockquote><p>The best way would probably be to send an e-mail to the team's mailing listed mentione in the <code>Language-Team:</code> field in the <b>&lt;your_language&gt;.po</b> file with your suggested corrections, and then they can make the changes reach the nano-devel list.</p></blockquote>
 <h2><a name="5.3"></a>5.3. What is the status of Unicode support?</h2>
 <blockquote><p>In version 1.3.12 or later, Unicode should be usable. With your terminal, locale (LC_ALL and similar environment variables), and encoding configured to properly support UTF-8, you should be able to enter and save Unicode text.</p></blockquote>
 <hr width="100%">
@@ -246,22 +241,23 @@ Of course, due to the license change you can now use the <A HREF="http://www.was
 <hr width="100%">
 <h1><a name="7"></a>7. Miscellaneous</h1>
 <h2><a name="7.1"></a>7.1. nano-related mailing lists.</h2>
-<blockquote><p>There are three mailing lists for nano hosted at <a href="http://savannah.gnu.org/">Savannah</a>, info-nano, help-nano and nano-devel. info-nano is a very low traffic list where new versions of nano are announced (surprise!). help-nano is for getting help with the editor without needing to hear all of the development issues surrounding it. nano-devel is a normally low, sometimes high traffic list for discussing the present and future development of nano. Here are links to where you can sign up for a given list:</p>
+<blockquote><p>There are three mailing lists for nano hosted at <a href="http://savannah.gnu.org/">Savannah</a>: info-nano, help-nano and nano-devel. info-nano is a very low traffic list where new versions of nano are announced (surprise!). help-nano is for getting help with the editor without needing to hear all of the development issues surrounding it. nano-devel is a normally low, sometimes high traffic list for discussing the present and future development of nano. Here are links to where you can sign up for a given list:</p>
   <p>info-nano - <a href="http://mail.gnu.org/mailman/listinfo/info-nano/">http://mail.gnu.org/mailman/listinfo/info-nano/</a><br>
   help-nano - <a href="http://mail.gnu.org/mailman/listinfo/help-nano/">http://mail.gnu.org/mailman/listinfo/help-nano/</a><br>
   nano-devel - <a href="http://mail.gnu.org/mailman/listinfo/nano-devel/">http://mail.gnu.org/mailman/listinfo/nano-devel/</a></p></blockquote>
 <h2><a name="7.2"></a>7.2. I want to send the development team a big load of cash (or just a thank you).</h2>
-<blockquote><p>That's fine. Send it <a href="mailto:nano-devel@gnu.org">our way</a>! Better yet, fix a <a href="http://www.nano-editor.org/dist/v2.2/BUGS">bug</a> in the program or implement a <a href="http://www.nano-editor.org/dist/v2.2/TODO">cool feature</a> and send us that instead (though cash is fine too).</p></blockquote>
+<blockquote><p>That's fine. Send it <a href="mailto:nano-devel@gnu.org">our way</a>! Better yet, fix a <a href="https://savannah.gnu.org/bugs/?group=nano">bug</a> in the program or implement a <a href="http://www.nano-editor.org/dist/v2.3/TODO">cool feature</a> and send us that instead (though cash is fine too).</p></blockquote>
 <h2><a name="7.3"></a>7.3. How do I submit a bug report or patch?</h2>
 <blockquote>
-<p>The best place to submit bugs is to the <A HREF="https://savannah.gnu.org/bugs/?group=nano">Savannah bug tracker</A> as you can check whether the bug you are submitting has already been submitted.
+<p>The best place to submit bugs is to the <a href="https://savannah.gnu.org/bugs/?group=nano">Savannah bug tracker</a> as you can check whether the bug you are submitting has already been submitted.
 <p>Please submit patches for nano via the <a href="https://savannah.gnu.org/patch/?group=nano">Savannah project's patch manager</a> for the nano project.</p></blockquote>
 <h2><a name="7.4"></a>7.4. How do I join the development team?</h2>
-<blockquote><p>The easiest way is to consistently send in good patches that add some needed functionality, fix a bug or two and/or make the program more optimized/efficient. Then ask nicely and you will probably be added to the Savannah development list and be given SVN write access after awhile. There is a lot of responsibility that goes along with being a team member, so don't think it's just something to add to your resume.</p></blockquote>
+<blockquote><p>The easiest way is to consistently send in good patches that add some needed functionality, fix a bug or two, and/or make the program more optimized/efficient. Then ask nicely and you will probably be added to the Savannah development list and be given SVN write access after a while. There is a lot of responsibility that goes along with being a team member, so don't think it's just something to add to your resume.</p></blockquote>
 <h2><a name="7.5"></a>7.5. Can I have write access to the subversion tree?</h2>
 <blockquote><p>Re-read Section <a href="#7.4">7.4</a> and you should know the answer.</p></blockquote>
 <h2><a name="8"></a>8. ChangeLog</h2>
-<blockquote><p>2009/11/30 - Update various bits for nano 2.2.x. (DLR)<br>
+<blockquote><p>2014/04/24 - A bunch of small fixes and updates. (Benno)<br>
+2009/11/30 - Update various bits for nano 2.2.x. (DLR)<br>
 2009/11/18 - Typo fix. (j.mader@gmail.com)<br>
 2008/03/16 - Update docs to refer to subversion instead of CVS, add more words about Alpine, and refer to Savannah for bugs and patches. (chrisa)<br>
 2007/12/21 - Update maintainer information. (DLR)<br>
@@ -326,6 +322,6 @@ Of course, due to the license change you can now use the <A HREF="http://www.was
 2000/11/18 - Previous string display (4.5).<br>
 2000/09/27 - Moved addresses to nano-editor.org.<br>
 2000/06/31 - Initial framework.</p></blockquote>
-<p>$Id: faq.html 4521 2010-11-15 06:58:22Z astyanax $</p>
+<p>$Id: faq.html 4814 2014-04-24 20:22:32Z bens $</p>
 </body>
 </html>
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index fbcdce8..f7ad09a 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,27 +1,18 @@
-if USE_NLS
-SUBDIRS = fr
-else
 SUBDIRS =
+BUILT_SOURCES =
+
+if USE_NLS
+SUBDIRS += fr
 endif
 
+dist_man_MANS = nano.1 rnano.1
+html_pages = nano.1.html rnano.1.html
+
 if USE_NANORC
-man_MANS = nano.1 nanorc.5 rnano.1
-if GROFF_HTML
-BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
-endif
-else
-man_MANS = nano.1 rnano.1
-if GROFF_HTML
-BUILT_SOURCES = nano.1.html rnano.1.html
-endif
+dist_man_MANS += nanorc.5
+html_pages += nanorc.5.html
 endif
 
-nano_man_mans = nano.1 nanorc.5 rnano.1
-if GROFF_HTML
-htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html
-htmlmandir = $(datadir)/nano/man-html
-nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
-
 nano.1.html: nano.1
 	groff -t -mandoc -Thtml < $? > $@
 nanorc.5.html: nanorc.5
@@ -29,7 +20,9 @@ nanorc.5.html: nanorc.5
 rnano.1.html: rnano.1
 	groff -t -mandoc -Thtml < $? > $@
 
-EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)
-else 
-EXTRA_DIST = $(nano_man_mans)
+if GROFF_HTML
+BUILT_SOURCES += $(html_pages)
+dist_html_DATA = $(html_pages)
 endif
+
+EXTRA_DIST = $(BUILT_SOURCES)
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index a48d914..b09d383 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,11 +78,17 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-target_triplet = @target@
+@USE_NLS_TRUE@am__append_1 = fr
+@USE_NANORC_TRUE@am__append_2 = nanorc.5
+@USE_NANORC_TRUE@am__append_3 = nanorc.5.html
+@GROFF_HTML_TRUE@am__append_4 = $(html_pages)
 subdir = doc/man
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/mkinstalldirs $(dist_man_MANS) \
+	$(am__dist_html_DATA_DIST)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
+	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -50,15 +100,33 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -80,18 +148,45 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
-	"$(DESTDIR)$(htmlmandir)"
+	"$(DESTDIR)$(htmldir)"
 man5dir = $(mandir)/man5
 NROFF = nroff
-MANS = $(man_MANS)
-DATA = $(htmlman_DATA)
+MANS = $(dist_man_MANS)
+am__dist_html_DATA_DIST = nano.1.html rnano.1.html nanorc.5.html
+DATA = $(dist_html_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = fr
@@ -123,6 +218,7 @@ am__relativize = \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -168,6 +264,11 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NCURSESW_CFLAGS = @NCURSESW_CFLAGS@
+NCURSESW_CONFIG = @NCURSESW_CONFIG@
+NCURSESW_LIBS = @NCURSESW_LIBS@
+NCURSES_CFLAGS = @NCURSES_CFLAGS@
+NCURSES_LIBS = @NCURSES_LIBS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -179,6 +280,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKGDATADIR = @PKGDATADIR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -208,6 +311,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+haveit = @haveit@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -232,26 +336,16 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-target = @target@
 target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@USE_NLS_FALSE@SUBDIRS = 
-@USE_NLS_TRUE@SUBDIRS = fr
-@USE_NANORC_FALSE@man_MANS = nano.1 rnano.1
-@USE_NANORC_TRUE@man_MANS = nano.1 nanorc.5 rnano.1
-@GROFF_HTML_TRUE@@USE_NANORC_FALSE@BUILT_SOURCES = nano.1.html rnano.1.html
-@GROFF_HTML_TRUE@@USE_NANORC_TRUE@BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
-nano_man_mans = nano.1 nanorc.5 rnano.1
-@GROFF_HTML_TRUE@htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html
-@GROFF_HTML_TRUE@htmlmandir = $(datadir)/nano/man-html
-@GROFF_HTML_TRUE@nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
-@GROFF_HTML_FALSE@EXTRA_DIST = $(nano_man_mans)
-@GROFF_HTML_TRUE@EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)
+SUBDIRS = $(am__append_1)
+BUILT_SOURCES = $(am__append_4)
+dist_man_MANS = nano.1 rnano.1 $(am__append_2)
+html_pages = nano.1.html rnano.1.html $(am__append_3)
+@GROFF_HTML_TRUE@dist_html_DATA = $(html_pages)
+EXTRA_DIST = $(BUILT_SOURCES)
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -286,13 +380,20 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-man1: $(man_MANS)
+install-man1: $(dist_man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(dist_man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -317,20 +418,25 @@ uninstall-man1:
 	@$(NORMAL_UNINSTALL)
 	@list=''; test -n "$(man1dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
-install-man5: $(man_MANS)
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+install-man5: $(dist_man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
-	@list=''; test -n "$(man5dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.5[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(dist_man_MANS)'; \
+	test -n "$(man5dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.5[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -355,51 +461,53 @@ uninstall-man5:
 	@$(NORMAL_UNINSTALL)
 	@list=''; test -n "$(man5dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 	  sed -n '/\.5[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
-install-htmlmanDATA: $(htmlman_DATA)
+	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
+install-dist_htmlDATA: $(dist_html_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmlmandir)" || $(MKDIR_P) "$(DESTDIR)$(htmlmandir)"
-	@list='$(htmlman_DATA)'; test -n "$(htmlmandir)" || list=; \
+	@list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmlmandir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(htmlmandir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
 	done
 
-uninstall-htmlmanDATA:
+uninstall-dist_htmlDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(htmlman_DATA)'; test -n "$(htmlmandir)" || list=; \
+	@list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(htmlmandir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(htmlmandir)" && rm -f $$files
+	dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -414,57 +522,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -480,12 +543,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -497,15 +555,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -514,24 +568,26 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -563,13 +619,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -595,7 +648,7 @@ check: $(BUILT_SOURCES)
 all-am: Makefile $(MANS) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(htmlmandir)"; do \
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(htmldir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -609,10 +662,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -645,7 +703,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-htmlmanDATA install-man
+install-data-am: install-dist_htmlDATA install-man
 
 install-dvi: install-dvi-recursive
 
@@ -689,36 +747,35 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-htmlmanDATA uninstall-man
+uninstall-am: uninstall-dist_htmlDATA uninstall-man
 
 uninstall-man: uninstall-man1 uninstall-man5
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
-	ctags-recursive install install-am install-strip \
-	tags-recursive
+.MAKE: $(am__recursive_targets) all check install install-am \
+	install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic ctags \
-	ctags-recursive distclean distclean-generic distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic cscopelist-am ctags ctags-am \
+	distclean distclean-generic distclean-tags distdir dvi dvi-am \
+	html html-am info info-am install install-am install-data \
+	install-data-am install-dist_htmlDATA install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-htmlmanDATA install-info \
-	install-info-am install-man install-man1 install-man5 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
-	tags-recursive uninstall uninstall-am uninstall-htmlmanDATA \
-	uninstall-man uninstall-man1 uninstall-man5
-
-
-@GROFF_HTML_TRUE@nano.1.html: nano.1
-@GROFF_HTML_TRUE@	groff -t -mandoc -Thtml < $? > $@
-@GROFF_HTML_TRUE@nanorc.5.html: nanorc.5
-@GROFF_HTML_TRUE@	groff -t -mandoc -Thtml < $? > $@
-@GROFF_HTML_TRUE@rnano.1.html: rnano.1
-@GROFF_HTML_TRUE@	groff -t -mandoc -Thtml < $? > $@
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-man5 install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-dist_htmlDATA uninstall-man uninstall-man1 \
+	uninstall-man5
+
+
+nano.1.html: nano.1
+	groff -t -mandoc -Thtml < $? > $@
+nanorc.5.html: nanorc.5
+	groff -t -mandoc -Thtml < $? > $@
+rnano.1.html: rnano.1
+	groff -t -mandoc -Thtml < $? > $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/doc/man/fr/Makefile.am b/doc/man/fr/Makefile.am
index 7a43052..d8c2d18 100644
--- a/doc/man/fr/Makefile.am
+++ b/doc/man/fr/Makefile.am
@@ -1,23 +1,15 @@
 mandir = @mandir@/fr
+htmldir = @htmldir@/fr
 
-if USE_NANORC
-man_MANS = nano.1 nanorc.5 rnano.1
-if GROFF_HTML
-BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
-endif
-else
-man_MANS = nano.1 rnano.1
-if GROFF_HTML
-BUILT_SOURCES = nano.1.html rnano.1.html
-endif
-endif
+BUILT_SOURCES =
 
-nano_man_mans = nano.1 nanorc.5 rnano.1
-if GROFF_HTML
-htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html
-htmlmandir = $(datadir)/nano/man-html/fr
+dist_man_MANS = nano.1 rnano.1
+html_pages = nano.1.html rnano.1.html
 
-nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
+if USE_NANORC
+dist_man_MANS += nanorc.5
+html_pages += nanorc.5.html
+endif
 
 nano.1.html: nano.1
 	groff -t -mandoc -Thtml < $? > $@
@@ -26,8 +18,9 @@ nanorc.5.html: nanorc.5
 rnano.1.html: rnano.1
 	groff -t -mandoc -Thtml < $? > $@
 
-EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)
-else
-EXTRA_DIST = $(nano_man_mans)
+if GROFF_HTML
+BUILT_SOURCES += $(html_pages)
+dist_html_DATA = $(html_pages)
 endif
 
+EXTRA_DIST = $(BUILT_SOURCES)
diff --git a/doc/man/fr/Makefile.in b/doc/man/fr/Makefile.in
index 79d5987..3e3e3ac 100644
--- a/doc/man/fr/Makefile.in
+++ b/doc/man/fr/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,11 +78,16 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-target_triplet = @target@
+@USE_NANORC_TRUE@am__append_1 = nanorc.5
+@USE_NANORC_TRUE@am__append_2 = nanorc.5.html
+@GROFF_HTML_TRUE@am__append_3 = $(html_pages)
 subdir = doc/man/fr
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/mkinstalldirs $(dist_man_MANS) \
+	$(am__dist_html_DATA_DIST)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
+	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -50,8 +99,25 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -73,16 +139,25 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
-	"$(DESTDIR)$(htmlmandir)"
+	"$(DESTDIR)$(htmldir)"
 man5dir = $(mandir)/man5
 NROFF = nroff
-MANS = $(man_MANS)
-DATA = $(htmlman_DATA)
+MANS = $(dist_man_MANS)
+am__dist_html_DATA_DIST = nano.1.html rnano.1.html nanorc.5.html
+DATA = $(dist_html_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -128,6 +203,11 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NCURSESW_CFLAGS = @NCURSESW_CFLAGS@
+NCURSESW_CONFIG = @NCURSESW_CONFIG@
+NCURSESW_LIBS = @NCURSESW_LIBS@
+NCURSES_CFLAGS = @NCURSES_CFLAGS@
+NCURSES_LIBS = @NCURSES_LIBS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -139,6 +219,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKGDATADIR = @PKGDATADIR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -168,12 +250,13 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+haveit = @haveit@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
-htmldir = @htmldir@
+htmldir = @htmldir@/fr
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
@@ -192,24 +275,15 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-target = @target@
 target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@USE_NANORC_FALSE@man_MANS = nano.1 rnano.1
-@USE_NANORC_TRUE@man_MANS = nano.1 nanorc.5 rnano.1
-@GROFF_HTML_TRUE@@USE_NANORC_FALSE@BUILT_SOURCES = nano.1.html rnano.1.html
-@GROFF_HTML_TRUE@@USE_NANORC_TRUE@BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
-nano_man_mans = nano.1 nanorc.5 rnano.1
-@GROFF_HTML_TRUE@htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html
-@GROFF_HTML_TRUE@htmlmandir = $(datadir)/nano/man-html/fr
-@GROFF_HTML_TRUE@nano_built_sources = nano.1.html nanorc.5.html rnano.1.html
-@GROFF_HTML_FALSE@EXTRA_DIST = $(nano_man_mans)
-@GROFF_HTML_TRUE@EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)
+BUILT_SOURCES = $(am__append_3)
+dist_man_MANS = nano.1 rnano.1 $(am__append_1)
+html_pages = nano.1.html rnano.1.html $(am__append_2)
+@GROFF_HTML_TRUE@dist_html_DATA = $(html_pages)
+EXTRA_DIST = $(BUILT_SOURCES)
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -244,13 +318,20 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-man1: $(man_MANS)
+install-man1: $(dist_man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(dist_man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -275,20 +356,25 @@ uninstall-man1:
 	@$(NORMAL_UNINSTALL)
 	@list=''; test -n "$(man1dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
-install-man5: $(man_MANS)
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+install-man5: $(dist_man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
-	@list=''; test -n "$(man5dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.5[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(dist_man_MANS)'; \
+	test -n "$(man5dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.5[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -313,54 +399,40 @@ uninstall-man5:
 	@$(NORMAL_UNINSTALL)
 	@list=''; test -n "$(man5dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 	  sed -n '/\.5[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
-install-htmlmanDATA: $(htmlman_DATA)
+	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
+install-dist_htmlDATA: $(dist_html_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmlmandir)" || $(MKDIR_P) "$(DESTDIR)$(htmlmandir)"
-	@list='$(htmlman_DATA)'; test -n "$(htmlmandir)" || list=; \
+	@list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmlmandir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(htmlmandir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
 	done
 
-uninstall-htmlmanDATA:
+uninstall-dist_htmlDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(htmlman_DATA)'; test -n "$(htmlmandir)" || list=; \
+	@list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(htmlmandir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(htmlmandir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -395,7 +467,7 @@ check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(MANS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(htmlmandir)"; do \
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(htmldir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -409,10 +481,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -445,7 +522,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-htmlmanDATA install-man
+install-data-am: install-dist_htmlDATA install-man
 
 install-dvi: install-dvi-am
 
@@ -489,32 +566,33 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-htmlmanDATA uninstall-man
+uninstall-am: uninstall-dist_htmlDATA uninstall-man
 
 uninstall-man: uninstall-man1 uninstall-man5
 
 .MAKE: all check install install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dist_htmlDATA install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-htmlmanDATA install-info \
-	install-info-am install-man install-man1 install-man5 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-htmlmanDATA uninstall-man uninstall-man1 \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-man5 install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am \
+	uninstall-dist_htmlDATA uninstall-man uninstall-man1 \
 	uninstall-man5
 
 
-@GROFF_HTML_TRUE@nano.1.html: nano.1
-@GROFF_HTML_TRUE@	groff -t -mandoc -Thtml < $? > $@
-@GROFF_HTML_TRUE@nanorc.5.html: nanorc.5
-@GROFF_HTML_TRUE@	groff -t -mandoc -Thtml < $? > $@
-@GROFF_HTML_TRUE@rnano.1.html: rnano.1
-@GROFF_HTML_TRUE@	groff -t -mandoc -Thtml < $? > $@
+nano.1.html: nano.1
+	groff -t -mandoc -Thtml < $? > $@
+nanorc.5.html: nanorc.5
+	groff -t -mandoc -Thtml < $? > $@
+rnano.1.html: rnano.1
+	groff -t -mandoc -Thtml < $? > $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/doc/man/fr/nano.1 b/doc/man/fr/nano.1
index f840374..fdfb3cd 100644
--- a/doc/man/fr/nano.1
+++ b/doc/man/fr/nano.1
@@ -2,14 +2,14 @@
 .\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 .\" Free Software Foundation, Inc.
 .\"
-.\" Le travail d'adaptation française de cette page de manuel a été
-.\" réalisé par Jean-Philippe Guérard, en 2003, 2004, 2005, 2006 et 2007.
+.\" Le travail d'adaptation française de cette page de manuel a été
+.\" réalisé par Jean-Philippe Guérard, en 2003, 2004, 2005, 2006 et 2007.
 .\" Ce travail d'adaptation est dans le domaine public. Attention, la
 .\" page traduite reste soumise au droit d'auteur de ses auteurs
 .\" originaux.
 .\"
 .\" The French translation of this document is a public domain work of
-.\" Jean-Philippe Guérard. This translation work was made in 2003, 2004,
+.\" Jean-Philippe Guérard. This translation work was made in 2003, 2004,
 .\" 2005, 2006 and 2007. The translated man page in itself is still
 .\" subject to the copyright of its original authors.
 .\"
@@ -29,92 +29,92 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.\" Ce document est publié sous une double licence. Vous pouvez
+.\" Ce document est publié sous une double licence. Vous pouvez
 .\" le distribuer et le modifier selon les termes de l'une des deux
-.\" licences ci-dessous :
+.\" licences ci-dessous :
 .\"
-.\" * La Licence publique générale GNU (GNU GPL) version 3 ou, à
-.\"   votre choix, supérieure, telle que publiée par la Free 
-.\"   Software Foundation. Vous devriez avoir reçu une copie de la 
-.\"   Licence publique générale GNU avec ce programme. Si ce n'est pas 
+.\" * La Licence publique générale GNU (GNU GPL) version 3 ou, à
+.\"   votre choix, supérieure, telle que publiée par la Free 
+.\"   Software Foundation. Vous devriez avoir reçu une copie de la 
+.\"   Licence publique générale GNU avec ce programme. Si ce n'est pas 
 .\"   le cas, consultez <http://www.gnu.org/licenses/>.
 .\"
 .\" * La Licence de documentation libre GNU (GNU FDL), version 1.2 ou,
-.\"   à votre choix, supérieure, telle que publiée par la Free
+.\"   à votre choix, supérieure, telle que publiée par la Free
 .\"   Software Foundation, sans section invariante, ni texte de
-.\"   première ou de quatrième de couverture. Vous devriez avoir reçu 
+.\"   première ou de quatrième de couverture. Vous devriez avoir reçu 
 .\"   une copie de la Licence de documentation libre GNU avec ce 
 .\"   programme. Si ce n'est pas le cas, consultez 
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.\" $Id: nano.1 4443 2009-11-27 02:50:12Z astyanax $
+.\" $Id: nano.1 5071 2014-07-16 17:25:55Z jordi $
 .TH NANO 1 "version 2.0.0" "29\ novembre\ 2007"
 .\" Please adjust this date whenever revising the manpage.
-.\" Merci de modifier ces dates à chaque mise à jour de cette page.
+.\" Merci de modifier ces dates à chaque mise à jour de cette page.
 .\"
 
 .SH NOM
-nano \- NAno un NOuvel éditeur, un clone libre et amélioré de Pico
+nano \- NAno un NOuvel éditeur, un clone libre et amélioré de Pico
 
 .SH SYNOPSIS
 .B nano
-.I [OPTIONS]\ [[\+LIGNE,COLONNE]\ FICHIER]...
+.I [OPTIONS]\ [[+LIGNE,COLONNE]\ FICHIER]...
 .br
 
 .SH DESCRIPTION
-Cette page de manuel décrit brièvement la commande \fBnano\fR.
+Cette page de manuel décrit brièvement la commande \fBnano\fR.
 .PP
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invoke bold face and italics,
 .\" respectively.
-\fBnano\fR est un éditeur petit, sympathique et libre, qui vise à remplacer
-Pico, l'éditeur par défaut du logiciel non libre Pine. \fBnano\fR ne se
+\fBnano\fR est un éditeur petit, sympathique et libre, qui vise à remplacer
+Pico, l'éditeur par défaut du logiciel non libre Pine. \fBnano\fR ne se
 contentant pas de copier l'interface et l'ergonomie de Pico, il offre
-également certaines fonctions manquantes (ou désactivées par défaut)
-dans Pico. Ces fonctionnalités sont, par exemple, les fonctions de
-recherche et de remplacement, et la possibilité de sauter directement à 
-une ligne et à une colonne précise.
+également certaines fonctions manquantes (ou désactivées par défaut)
+dans Pico. Ces fonctionnalités sont, par exemple, les fonctions de
+recherche et de remplacement, et la possibilité de sauter directement à 
+une ligne et à une colonne précise.
 
 .SH OPTIONS
 .TP
-.B \+\fILIGNE\fP,\fICOLONNE\fP
-Démarre avec le curseur positionné à la colonne \fICOLONNE\fP de 
-la ligne \fILIGNE\fR (l'un des deux, au moins, devant être spécifié) au 
-lieu de démarrer à la colonne\ 1, ligne\ 1.
+.B +\fILIGNE\fP,\fICOLONNE\fP
+Démarre avec le curseur positionné à la colonne \fICOLONNE\fP de 
+la ligne \fILIGNE\fR (l'un des deux, au moins, devant être spécifié) au 
+lieu de démarrer à la colonne\ 1, ligne\ 1.
 .TP
 .B \-?
-Identique à \fB-h (\-\-help)\fP.
+Identique à \fB\-h (\-\-help)\fP.
 .TP
 .B \-A (\-\-smarthome)
-Rend plus malin le fonctionnement de la touche «\ Début\ ». Lorsque l'on
-appuie sur cette touche à n'importe quel endroit excepté au tout début
-du texte d'une ligne (i.\ e. au premier caractère non blanc), le curseur
-se positionnera au début du texte de la ligne (qu'il soit en avant ou en
-arrière). Si le curseur est déjà là, il se placera au vrai début de la
+Rend plus malin le fonctionnement de la touche «\ Début\ ». Lorsque l'on
+appuie sur cette touche à n'importe quel endroit excepté au tout début
+du texte d'une ligne (i.\ e. au premier caractère non blanc), le curseur
+se positionnera au début du texte de la ligne (qu'il soit en avant ou en
+arrière). Si le curseur est déjà là, il se placera au vrai début de la
 ligne.
 .TP
 .B \-B (\-\-backup)
-Lors de l'écriture d'un fichier, crée une copie de sécurité de la
-version précédente, en ajoutant un tilde (~) au nom du fichier.
+Lors de l'écriture d'un fichier, crée une copie de sécurité de la
+version précédente, en ajoutant un tilde (~) au nom du fichier.
 .TP
 .B \-D (\-\-boldtext)
-Utilise des caractères gras à la place de la vidéo inverse.
+Utilise des caractères gras à la place de la vidéo inverse.
 .TP
-.B \-C \fIrépertoire\fP (\-\-backupdir=\fIrépertoire\fP)
-Définit le répertoire utilisé par \fBnano\fP pour enregistrer les copies 
-de sécurité uniques si celles-ci sont activées.
+.B \-C \fIrépertoire\fP (\-\-backupdir=\fIrépertoire\fP)
+Définit le répertoire utilisé par \fBnano\fP pour enregistrer les copies 
+de sécurité uniques si celles-ci sont activées.
 .TP
 .B \-E (\-\-tabstospaces)
 Convertit les tabulations clavier en espaces.
 .TP
 .B \-F (\-\-multibuffer)
-Active le mode multi-espace, autorisant l'édition simultanée de 
+Active le mode multi-espace, autorisant l'édition simultanée de 
 plusieurs fichiers, si ce mode est disponible.
 .TP
 .B \-H (\-\-historylog)
-Enregistre les chaînes ayant fait l'objet d'une recherche ou d'un
+Enregistre les chaînes ayant fait l'objet d'une recherche ou d'un
 remplacement dans le fichier \fI~/.nano_history\fR afin de permettre leur
-réutilisation. Ceci n'est possible que si \fBnano\fR est configuré pour
+réutilisation. Ceci n'est possible que si \fBnano\fR est configuré pour
 utiliser les fichiers nanorc.
 .TP
 .B \-I (\-\-ignorercfiles)
@@ -122,63 +122,63 @@ Ne pas utiliser pas les fichiers \fISYSCONFDIR/nanorc\fR et
 \fI~/.nanorc\fR (si \fBnano\fR est capable de les utiliser).
 .TP
 .B \-K (\-\-rebindkeypad)
-Interprète les touches du pavé numérique afin qu'elles fonctionnent 
+Interprète les touches du pavé numérique afin qu'elles fonctionnent 
 toutes correctement. Vous ne devriez utiliser cette option que si ce 
 n'est pas le cas, car nano ne sera plus capable d'utiliser la souris 
-correctement lorsque cette option sera activée.
+correctement lorsque cette option sera activée.
 .TP
 .B \-L (\-\-nonewlines)
-Ne pas ajouter de passage à la ligne à la fin des fichiers.
+Ne pas ajouter de passage à la ligne à la fin des fichiers.
 .TP
 .B \-N (\-\-noconvert)
-Désactive la conversion automatique des fichiers depuis les formats Mac et
+Désactive la conversion automatique des fichiers depuis les formats Mac et
 DOS.
 .TP
 .B \-O (\-\-morespace)
-Utiliser la ligne blanche située sous la ligne de titre comme
-espace supplémentaire d'édition.
+Utiliser la ligne blanche située sous la ligne de titre comme
+espace supplémentaire d'édition.
 .TP
-.B \-Q \fIchaîne\fP (\-\-quotestr=\fIchaîne\fP)
-Définit le préfixe par défaut des citations. Nano utilise ce préfixe
-pour réaliser une justification correcte des citations. Si nano est
-capable d'utiliser des expressions rationnelles, le préfixe par défaut
+.B \-Q \fIchaîne\fP (\-\-quotestr=\fIchaîne\fP)
+Définit le préfixe par défaut des citations. Nano utilise ce préfixe
+pour réaliser une justification correcte des citations. Si nano est
+capable d'utiliser des expressions rationnelles, le préfixe par défaut
 sera "\fI^([\ \\t]*[#:>\\|}])+\fP", sinon, ce sera "\fI>\ \fP". Dans 
-l'expression rationnelle précédente, «\ \fI\\t\fP\ » représente une 
+l'expression rationnelle précédente, «\ \fI\\t\fP\ » représente une 
 tabulation.
 .TP
 .B \-R (\-\-restricted)
-Mode restreint\ : aucune lecture ou écriture de fichiers non indiqués 
+Mode restreint\ : aucune lecture ou écriture de fichiers non indiqués 
 sur la ligne de commande, pas de lecture des fichiers nanorc, 
-interdiction de suspendre, interdiction d'ajouter au début, à la fin, 
-de sauvegarder un fichier ayant déjà un nom sous un nom différent, 
-d'utiliser une copie de sécurité ou le correcteur orthographique. Cette 
-option peut aussi être activée en appelant \fBnano\fP sous un nom 
-commençant par «\ r\ » (par exemple «\ rnano\ »).
+interdiction de suspendre, interdiction d'ajouter au début, à la fin, 
+de sauvegarder un fichier ayant déjà un nom sous un nom différent, 
+d'utiliser une copie de sécurité ou le correcteur orthographique. Cette 
+option peut aussi être activée en appelant \fBnano\fP sous un nom 
+commençant par «\ r\ » (par exemple «\ rnano\ »).
 .TP
 .B \-S (\-\-smooth)
-Active le défilement progressif. Le texte défilera ligne-par-ligne au lieu
-de défiler morceau-par-morceau.
+Active le défilement progressif. Le texte défilera ligne-par-ligne au lieu
+de défiler morceau-par-morceau.
 .TP
 .B \-T \fInombre\fP (\-\-tabsize=\fInombre\fP)
-Définit la taille (largeur) des tabulations en nombre de colonnes. Le 
-nombre indiqué doit être strictement supérieur à 0. La valeur par défaut 
+Définit la taille (largeur) des tabulations en nombre de colonnes. Le 
+nombre indiqué doit être strictement supérieur à 0. La valeur par défaut 
 est de 8.
 .TP
 .B \-U (\-\-quickblank)
-Effacement rapide de la ligne d'état. Les messages affichés par la ligne 
-d'état disparaîtront après une frappe clavier au lieu de 25. Notez que
+Effacement rapide de la ligne d'état. Les messages affichés par la ligne 
+d'état disparaîtront après une frappe clavier au lieu de 25. Notez que
 l'option \fB-c\fP prend le pas sur cette option.
 .TP
 .B \-V (\-\-version)
-Affiche la version, puis s'arrête.
+Affiche la version, puis s'arrête.
 .TP
 .B \-W (\-\-wordbounds)
-Détection plus précise des limites de mots, obtenue en considérant les 
-caractères de ponctuation comme faisant partie des mots.
+Détection plus précise des limites de mots, obtenue en considérant les 
+caractères de ponctuation comme faisant partie des mots.
 .TP
-.B \-Y \fIchaîne\fP (\-\-syntax=\fIchaîne\fP)
+.B \-Y \fIchaîne\fP (\-\-syntax=\fIchaîne\fP)
 Indique quel mode de colorisation syntaxique adopter, parmi les modes
-définis dans le fichier \fI.nanorc\fR, si cette fonctionnalité est
+définis dans le fichier \fI.nanorc\fR, si cette fonctionnalité est
 disponible.
 .TP
 .B \-c (\-\-const)
@@ -186,111 +186,111 @@ Affiche en permanence la position du curseur. Notez que cette option
 prend le pas sur l'option \fB-U\fP.
 .TP
 .B \-d (\-\-rebinddelete)
-Interprète différemment la touche «\ Supprimer\ », afin que les touches 
-«\ Effacement arrière\ » et «\ Supprimer\ » fonctionnent correctement. 
-Vous ne devriez avoir besoin de cette option que si, sur votre système, 
-la touche «\ Effacement arrière\ » produit l'effet de la touche
-«\ Supprimer\ ».
+Interprète différemment la touche «\ Supprimer\ », afin que les touches 
+«\ Effacement arrière\ » et «\ Supprimer\ » fonctionnent correctement. 
+Vous ne devriez avoir besoin de cette option que si, sur votre système, 
+la touche «\ Effacement arrière\ » produit l'effet de la touche
+«\ Supprimer\ ».
 .TP
 .B \-h (\-\-help)
-Affiche un résumé des options de lancement de nano, puis s'arrête.
+Affiche un résumé des options de lancement de nano, puis s'arrête.
 .TP
 .B \-i (\-\-autoindent)
-Indentation automatique. Commence chaque nouvelle ligne au même niveau que
-la ligne précédente. Utile pour l'édition de code source.
+Indentation automatique. Commence chaque nouvelle ligne au même niveau que
+la ligne précédente. Utile pour l'édition de code source.
 .TP
 .B \-k (\-\-cut)
-Coupe le texte du curseur à la fin de la ligne, au lieu de couper la 
-ligne entière.
+Coupe le texte du curseur à la fin de la ligne, au lieu de couper la 
+ligne entière.
 .TP
 .B \-l (\-\-nofollow)
-Si le fichier édité est un lien symbolique, au lieu de le suivre, 
-remplace le lien par le nouveau fichier. Sans doute utile pour éditer 
+Si le fichier édité est un lien symbolique, au lieu de le suivre, 
+remplace le lien par le nouveau fichier. Sans doute utile pour éditer 
 les fichiers de \fI/tmp\fR, non\ ?
 .TP
 .B \-m (\-\-mouse)
 Active l'utilisation de la souris, si elle est disponible pour votre
-système. Lorsque celle-ci est activée, il est possible d'utiliser la 
+système. Lorsque celle-ci est activée, il est possible d'utiliser la 
 souris pour positionner le curseur, pour marquer le texte (avec un 
 double-clic) et pour lancer les fonctions correspondant aux raccourcis. 
 Il est possible d'utiliser la souris sous X\ Window ou en mode console 
 avec gpm.
 .TP
-.B \-o \fIrépertoire\fP (\-\-operatingdir=\fIrépertoire\fP)
-Définit le répertoire de travail. Demande à \fBnano\fP de mettre en place
-quelque chose de similaire à un environnement d'exécution restreint
+.B \-o \fIrépertoire\fP (\-\-operatingdir=\fIrépertoire\fP)
+Définit le répertoire de travail. Demande à \fBnano\fP de mettre en place
+quelque chose de similaire à un environnement d'exécution restreint
 (\fIchroot\fR).
 .TP
 .B \-p (\-\-preserve)
-Préserve les séquences XON et XOFF (^Q et ^S), afin qu'elle soient reçues
+Préserve les séquences XON et XOFF (^Q et ^S), afin qu'elle soient reçues
 par le terminal.
 .TP
 .B \-r \fIcolonne\fP (\-\-fill=\fIcolonne\fP)
-Passe automatiquement à la ligne une fois arrivé à la colonne 
-\fIcolonne\fR. Si la valeur indiquée est de 0 ou moins, le point de 
-passage à la ligne aura lieu à la taille de l'écran moins \fIcolonne\fR. 
-Cela permet de faire varier le point de passage à la ligne lorsque l'on 
-change la taille de l'écran. La valeur par défaut est de \-8.
+Passe automatiquement à la ligne une fois arrivé à la colonne 
+\fIcolonne\fR. Si la valeur indiquée est de 0 ou moins, le point de 
+passage à la ligne aura lieu à la taille de l'écran moins \fIcolonne\fR. 
+Cela permet de faire varier le point de passage à la ligne lorsque l'on 
+change la taille de l'écran. La valeur par défaut est de \-8.
 .TP
 .B \-s \fIprogramme\fP (\-\-speller=\fIprogramme\fP)
 Choix d'un correcteur orthographique de remplacement.
 .TP
 .B \-t (\-\-tempfile)
-S'il a été modifié, le fichier sera sauvegardé automatiquement sans
-demande de confirmation. Identique à l'option \fB-t\fP de Pico.
+S'il a été modifié, le fichier sera sauvegardé automatiquement sans
+demande de confirmation. Identique à l'option \fB-t\fP de Pico.
 .TP
 .B \-v (\-\-view)
 Mode visualisation (lecture seule).
 .TP
 .B \-w (\-\-nowrap)
-Désactive le passage automatique à la ligne.
+Désactive le passage automatique à la ligne.
 .TP
 .B \-x (\-\-nohelp)
-Désactive la barre d'aide affichée en bas de l'écran.
+Désactive la barre d'aide affichée en bas de l'écran.
 .TP
 .B \-z (\-\-suspend)
-Autorise à suspendre l'éditeur.
+Autorise à suspendre l'éditeur.
 .TP
 .B \-a, \-b, \-e, \-f, \-g, \-j
-Ignoré, pour être compatible avec Pico.
+Ignoré, pour être compatible avec Pico.
 
 .SH "FICHIERS D'INITIALISATION"
 \fBnano\fR lit les fichiers d'initialisation dans l'ordre suivant\ : 
-\fISYSCONFDIR/nanorc\fR, puis \fI~/.nanorc\fR. Référez-vous à la page de 
+\fISYSCONFDIR/nanorc\fR, puis \fI~/.nanorc\fR. Référez-vous à la page de 
 manuel de \fBnanorc(5)\fR et au fichier d'exemple \fInanorc.sample\fR, 
-qui devraient tous les deux être livrés avec \fBnano\fR.
+qui devraient tous les deux être livrés avec \fBnano\fR.
 
 .SH NOTES
-Si aucun correcteur orthographique de remplacement n'est indiqué dans la 
+Si aucun correcteur orthographique de remplacement n'est indiqué dans la 
 ligne de commande ou dans l'un des fichiers nanorc, \fBnano\fR prendra 
-la commande indiquée par la variable d'environnement \fBSPELL\fR si 
-elle est définie.
+la commande indiquée par la variable d'environnement \fBSPELL\fR si 
+elle est définie.
 
 Dans certains cas, \fBnano\fR essaiera de sauvegarder le fichier en cours
-d'édition dans un fichier de secours. Cela arrivera principalement si
-\fBnano\fR reçoit un signal SIGHUP ou SIGTERM, ou bien se trouve à court de
-mémoire. Le nom de ce fichier de secours sera \fInano.save\fR si le fichier en
-cours n'avait pas encore de nom, ou sera composé du nom du fichier en cours
-suivi du suffixe «\ .save\ ». Si un fichier de ce nom existe déjà dans
-le répertoire, un «\ .save\ » et un nombre seront ajoutés à la fin du
+d'édition dans un fichier de secours. Cela arrivera principalement si
+\fBnano\fR reçoit un signal SIGHUP ou SIGTERM, ou bien se trouve à court de
+mémoire. Le nom de ce fichier de secours sera \fInano.save\fR si le fichier en
+cours n'avait pas encore de nom, ou sera composé du nom du fichier en cours
+suivi du suffixe «\ .save\ ». Si un fichier de ce nom existe déjà dans
+le répertoire, un «\ .save\ » et un nombre seront ajoutés à la fin du
 nom du fichier en cours afin de le rendre unique (par exemple,
-«\ .save.1\ »). En mode multi-espace, \fBnano\fR réalisera une
+«\ .save.1\ »). En mode multi-espace, \fBnano\fR réalisera une
 sauvegarde de tous les fichiers en cours dans leurs fichiers de secours
 respectifs.
 
 .SH BOGUES
 Merci de nous faire parvenir vos commentaires et de nous signaler les
-bogues, en écrivant, en anglais, à \fBnano@nano-editor.org\fR.
+bogues, en écrivant, en anglais, à \fBnano@nano-editor.org\fR.
 
-La liste de discussion anglophone \fBnano\fR est disponible à l'adresse
+La liste de discussion anglophone \fBnano\fR est disponible à l'adresse
 \fBnano-devel@gnu.org\fR.
 
-Pour vous abonner, envoyez un courrier électronique à
-\fBnano-devel-request@gnu.org\fR, ayant pour objet «\ subscribe\ ».
+Pour vous abonner, envoyez un courrier électronique à
+\fBnano-devel-request@gnu.org\fR, ayant pour objet «\ subscribe\ ».
 
-N'hésitez pas également à envoyez vos commentaires, suggestions et 
-corrections relatives à l'adaptation française de cette page de manuel 
-ou du logiciel à \fBjean-philippe.guerard@tigreraye.org\fR.
+N'hésitez pas également à envoyez vos commentaires, suggestions et 
+corrections relatives à l'adaptation française de cette page de manuel 
+ou du logiciel à \fBjean-philippe.guerard@tigreraye.org\fR.
 
 .SH "SITE INTERNET"
 http://www.nano-editor.org/
@@ -300,27 +300,27 @@ http://www.nano-editor.org/
 .TP
 \fBnanorc\fR(5)
 .PP
-\fI/usr/share/doc/nano/\fR (ou son équivalent sur votre système)
+\fI/usr/share/doc/nano/\fR (ou son équivalent sur votre système)
 
 .SH AUTEUR
 Chris Allegretta <chrisa@asty.org> et d'autres (voir les fichiers 
 \fIAUTHORS\fR et \fITHANKS\fR pour plus d'information). Cette page de 
-manuel a été initialement rédigée par Jordi Mallach <jordi@gnu.org> pour 
-le système Debian (mais elle peut être utilisée par d'autres).
+manuel a été initialement rédigée par Jordi Mallach <jordi@gnu.org> pour 
+le système Debian (mais elle peut être utilisée par d'autres).
 
 .SH TRADUCTION
-Cette adaptation française a été réalisée par Jean-Philippe\ Guérard 
-<jean-philippe.guerard@tigreraye.org> le 29\ novembre\ 2007 à partir 
+Cette adaptation française a été réalisée par Jean-Philippe\ Guérard 
+<jean-philippe.guerard@tigreraye.org> le 29\ novembre\ 2007 à partir 
 de la version 1.54 du 11\ octobre\ 2007 de la page de manuel de nano 
-2.0.0. Cette page a été relue par Gérard Delafond.
+2.0.0. Cette page a été relue par Gérard Delafond.
 
-Un maximum de soin a été apporté lors de l'élaboration de cette
-traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si
-vous en rencontrez, que ce soit dans la version française ou dans la
-version originale, n'hésitez pas à les signaler à l'auteur ou au
+Un maximum de soin a été apporté lors de l'élaboration de cette
+traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si
+vous en rencontrez, que ce soit dans la version française ou dans la
+version originale, n'hésitez pas à les signaler à l'auteur ou au
 traducteur.
 
-La version originale la plus à jour de ce document est toujours 
+La version originale la plus à jour de ce document est toujours 
 consultable via la commande\ :
 
 LANGUAGE=en man nano
diff --git a/doc/man/fr/nano.1.html b/doc/man/fr/nano.1.html
index e8f9548..e7085e9 100644
--- a/doc/man/fr/nano.1.html
+++ b/doc/man/fr/nano.1.html
@@ -1,5 +1,5 @@
-<!-- Creator     : groff version 1.20.1 -->
-<!-- CreationDate: Tue Aug 10 22:44:00 2010 -->
+<!-- Creator     : groff version 1.22.2 -->
+<!-- CreationDate: Thu Jul 17 11:02:17 2014 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -41,8 +41,8 @@
 
 
 <p style="margin-left:11%; margin-top: 1em">nano &minus;
-NAno un NOuvel &eacute;diteur, un clone libre et
-am&eacute;lior&eacute; de Pico</p>
+NAno un NOuvel &Atilde;&copy;diteur, un clone libre et
+am&Atilde;&copy;lior&Atilde;&copy; de Pico</p>
 
 <h2>SYNOPSIS
 <a name="SYNOPSIS"></a>
@@ -58,21 +58,23 @@ am&eacute;lior&eacute; de Pico</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Cette page de
-manuel d&eacute;crit bri&egrave;vement la commande
-<b>nano</b>.</p>
+manuel d&Atilde;&copy;crit bri&Atilde;&uml;vement la
+commande <b>nano</b>.</p>
 
 <p style="margin-left:11%; margin-top: 1em"><b>nano</b> est
-un &eacute;diteur petit, sympathique et libre, qui vise
-&agrave; remplacer Pico, l&rsquo;&eacute;diteur par
-d&eacute;faut du logiciel non libre Pine. <b>nano</b> ne se
-contentant pas de copier l&rsquo;interface et
-l&rsquo;ergonomie de Pico, il offre &eacute;galement
-certaines fonctions manquantes (ou d&eacute;sactiv&eacute;es
-par d&eacute;faut) dans Pico. Ces fonctionnalit&eacute;s
-sont, par exemple, les fonctions de recherche et de
-remplacement, et la possibilit&eacute; de sauter directement
-&agrave; une ligne et &agrave; une colonne
-pr&eacute;cise.</p>
+un &Atilde;&copy;diteur petit, sympathique et libre, qui
+vise &Atilde;&nbsp; remplacer Pico,
+l&rsquo;&Atilde;&copy;diteur par d&Atilde;&copy;faut du
+logiciel non libre Pine. <b>nano</b> ne se contentant pas de
+copier l&rsquo;interface et l&rsquo;ergonomie de Pico, il
+offre &Atilde;&copy;galement certaines fonctions manquantes
+(ou d&Atilde;&copy;sactiv&Atilde;&copy;es par
+d&Atilde;&copy;faut) dans Pico. Ces
+fonctionnalit&Atilde;&copy;s sont, par exemple, les
+fonctions de recherche et de remplacement, et la
+possibilit&Atilde;&copy; de sauter directement
+&Atilde;&nbsp; une ligne et &Atilde;&nbsp; une colonne
+pr&Atilde;&copy;cise.</p>
 
 <h2>OPTIONS
 <a name="OPTIONS"></a>
@@ -82,11 +84,12 @@ pr&eacute;cise.</p>
 
 <p style="margin-left:11%; margin-top: 1em"><b>+</b><i>LIGNE</i><b>,</b><i>COLONNE</i></p>
 
-<p style="margin-left:22%;">D&eacute;marre avec le curseur
-positionn&eacute; &agrave; la colonne <i>COLONNE</i> de la
-ligne <i>LIGNE</i> (l&rsquo;un des deux, au moins, devant
-&ecirc;tre sp&eacute;cifi&eacute;) au lieu de
-d&eacute;marrer &agrave; la colonne&nbsp;1,
+<p style="margin-left:22%;">D&Atilde;&copy;marre avec le
+curseur positionn&Atilde;&copy; &Atilde;&nbsp; la colonne
+<i>COLONNE</i> de la ligne <i>LIGNE</i> (l&rsquo;un des
+deux, au moins, devant &Atilde;&ordf;tre
+sp&Atilde;&copy;cifi&Atilde;&copy;) au lieu de
+d&Atilde;&copy;marrer &Atilde;&nbsp; la colonne&nbsp;1,
 ligne&nbsp;1.</p>
 
 <table width="100%" border="0" rules="none" frame="void"
@@ -98,11 +101,12 @@ ligne&nbsp;1.</p>
 
 <p><b>&minus;?</b></p></td>
 <td width="8%"></td>
-<td width="36%">
+<td width="38%">
 
 
-<p>Identique &agrave; <b>-h (&minus;&minus;help)</b>.</p></td>
-<td width="42%">
+<p>Identique &Atilde;&nbsp; <b>&minus;h
+(&minus;&minus;help)</b>.</p> </td>
+<td width="40%">
 </td></tr>
 </table>
 
@@ -111,39 +115,42 @@ ligne&nbsp;1.</p>
 
 <p style="margin-left:22%;">Rend plus malin le
 fonctionnement de la touche
-&laquo;&nbsp;D&eacute;but&nbsp;&raquo;. Lorsque l&rsquo;on
-appuie sur cette touche &agrave; n&rsquo;importe quel
-endroit except&eacute; au tout d&eacute;but du texte
-d&rsquo;une ligne (i.&nbsp;e. au premier caract&egrave;re
-non blanc), le curseur se positionnera au d&eacute;but du
-texte de la ligne (qu&rsquo;il soit en avant ou en
-arri&egrave;re). Si le curseur est d&eacute;j&agrave;
-l&agrave;, il se placera au vrai d&eacute;but de la
-ligne.</p>
+&Acirc;&laquo;&nbsp;D&Atilde;&copy;but&nbsp;&Acirc;&raquo;.
+Lorsque l&rsquo;on appuie sur cette touche &Atilde;&nbsp;
+n&rsquo;importe quel endroit except&Atilde;&copy; au tout
+d&Atilde;&copy;but du texte d&rsquo;une ligne (i.&nbsp;e. au
+premier caract&Atilde;&uml;re non blanc), le curseur se
+positionnera au d&Atilde;&copy;but du texte de la ligne
+(qu&rsquo;il soit en avant ou en arri&Atilde;&uml;re). Si le
+curseur est d&Atilde;&copy;j&Atilde;&nbsp; l&Atilde;&nbsp;,
+il se placera au vrai d&Atilde;&copy;but de la ligne.</p>
 
 <p style="margin-left:11%;"><b>&minus;B
 (&minus;&minus;backup)</b></p>
 
-<p style="margin-left:22%;">Lors de l&rsquo;&eacute;criture
-d&rsquo;un fichier, cr&eacute;e une copie de
-s&eacute;curit&eacute; de la version
-pr&eacute;c&eacute;dente, en ajoutant un tilde (~) au nom du
-fichier.</p>
+<p style="margin-left:22%;">Lors de
+l&rsquo;&Atilde;&copy;criture d&rsquo;un fichier,
+cr&Atilde;&copy;e une copie de
+s&Atilde;&copy;curit&Atilde;&copy; de la version
+pr&Atilde;&copy;c&Atilde;&copy;dente, en ajoutant un tilde
+(~) au nom du fichier.</p>
 
 <p style="margin-left:11%;"><b>&minus;D
 (&minus;&minus;boldtext)</b></p>
 
-<p style="margin-left:22%;">Utilise des caract&egrave;res
-gras &agrave; la place de la vid&eacute;o inverse.</p>
+<p style="margin-left:22%;">Utilise des
+caract&Atilde;&uml;res gras &Atilde;&nbsp; la place de la
+vid&Atilde;&copy;o inverse.</p>
 
 <p style="margin-left:11%;"><b>&minus;C</b>
-<i>r&eacute;pertoire</i>
-<b>(&minus;&minus;backupdir=</b><i>r&eacute;pertoire</i><b>)</b></p>
+<i>r&Atilde;&copy;pertoire</i>
+<b>(&minus;&minus;backupdir=</b><i>r&Atilde;&copy;pertoire</i><b>)</b></p>
 
-<p style="margin-left:22%;">D&eacute;finit le
-r&eacute;pertoire utilis&eacute; par <b>nano</b> pour
-enregistrer les copies de s&eacute;curit&eacute; uniques si
-celles-ci sont activ&eacute;es.</p>
+<p style="margin-left:22%;">D&Atilde;&copy;finit le
+r&Atilde;&copy;pertoire utilis&Atilde;&copy; par <b>nano</b>
+pour enregistrer les copies de
+s&Atilde;&copy;curit&Atilde;&copy; uniques si celles-ci sont
+activ&Atilde;&copy;es.</p>
 
 <p style="margin-left:11%;"><b>&minus;E
 (&minus;&minus;tabstospaces)</b></p>
@@ -155,18 +162,20 @@ clavier en espaces.</p>
 (&minus;&minus;multibuffer)</b></p>
 
 <p style="margin-left:22%;">Active le mode multi-espace,
-autorisant l&rsquo;&eacute;dition simultan&eacute;e de
-plusieurs fichiers, si ce mode est disponible.</p>
+autorisant l&rsquo;&Atilde;&copy;dition
+simultan&Atilde;&copy;e de plusieurs fichiers, si ce mode
+est disponible.</p>
 
 <p style="margin-left:11%;"><b>&minus;H
 (&minus;&minus;historylog)</b></p>
 
-<p style="margin-left:22%;">Enregistre les cha&icirc;nes
-ayant fait l&rsquo;objet d&rsquo;une recherche ou d&rsquo;un
-remplacement dans le fichier <i>~/.nano_history</i> afin de
-permettre leur r&eacute;utilisation. Ceci n&rsquo;est
-possible que si <b>nano</b> est configur&eacute; pour
-utiliser les fichiers nanorc.</p>
+<p style="margin-left:22%;">Enregistre les
+cha&Atilde;&reg;nes ayant fait l&rsquo;objet d&rsquo;une
+recherche ou d&rsquo;un remplacement dans le fichier
+<i>~/.nano_history</i> afin de permettre leur
+r&Atilde;&copy;utilisation. Ceci n&rsquo;est possible que si
+<b>nano</b> est configur&Atilde;&copy; pour utiliser les
+fichiers nanorc.</p>
 
 <p style="margin-left:11%;"><b>&minus;I
 (&minus;&minus;ignorercfiles)</b></p>
@@ -178,110 +187,120 @@ fichiers <i>SYSCONFDIR/nanorc</i> et <i>~/.nanorc</i> (si
 <p style="margin-left:11%;"><b>&minus;K
 (&minus;&minus;rebindkeypad)</b></p>
 
-<p style="margin-left:22%;">Interpr&egrave;te les touches
-du pav&eacute; num&eacute;rique afin qu&rsquo;elles
-fonctionnent toutes correctement. Vous ne devriez utiliser
-cette option que si ce n&rsquo;est pas le cas, car nano ne
-sera plus capable d&rsquo;utiliser la souris correctement
-lorsque cette option sera activ&eacute;e.</p>
+<p style="margin-left:22%;">Interpr&Atilde;&uml;te les
+touches du pav&Atilde;&copy; num&Atilde;&copy;rique afin
+qu&rsquo;elles fonctionnent toutes correctement. Vous ne
+devriez utiliser cette option que si ce n&rsquo;est pas le
+cas, car nano ne sera plus capable d&rsquo;utiliser la
+souris correctement lorsque cette option sera
+activ&Atilde;&copy;e.</p>
 
 <p style="margin-left:11%;"><b>&minus;L
 (&minus;&minus;nonewlines)</b></p>
 
 <p style="margin-left:22%;">Ne pas ajouter de passage
-&agrave; la ligne &agrave; la fin des fichiers.</p>
+&Atilde;&nbsp; la ligne &Atilde;&nbsp; la fin des
+fichiers.</p>
 
 <p style="margin-left:11%;"><b>&minus;N
 (&minus;&minus;noconvert)</b></p>
 
-<p style="margin-left:22%;">D&eacute;sactive la conversion
-automatique des fichiers depuis les formats Mac et DOS.</p>
+<p style="margin-left:22%;">D&Atilde;&copy;sactive la
+conversion automatique des fichiers depuis les formats Mac
+et DOS.</p>
 
 <p style="margin-left:11%;"><b>&minus;O
 (&minus;&minus;morespace)</b></p>
 
 <p style="margin-left:22%;">Utiliser la ligne blanche
-situ&eacute;e sous la ligne de titre comme espace
-suppl&eacute;mentaire d&rsquo;&eacute;dition.</p>
+situ&Atilde;&copy;e sous la ligne de titre comme espace
+suppl&Atilde;&copy;mentaire
+d&rsquo;&Atilde;&copy;dition.</p>
 
 <p style="margin-left:11%;"><b>&minus;Q</b>
-<i>cha&icirc;ne</i>
-<b>(&minus;&minus;quotestr=</b><i>cha&icirc;ne</i><b>)</b></p>
-
-<p style="margin-left:22%;">D&eacute;finit le
-pr&eacute;fixe par d&eacute;faut des citations. Nano utilise
-ce pr&eacute;fixe pour r&eacute;aliser une justification
-correcte des citations. Si nano est capable d&rsquo;utiliser
-des expressions rationnelles, le pr&eacute;fixe par
-d&eacute;faut sera
+<i>cha&Atilde;&reg;ne</i>
+<b>(&minus;&minus;quotestr=</b><i>cha&Atilde;&reg;ne</i><b>)</b></p>
+
+<p style="margin-left:22%;">D&Atilde;&copy;finit le
+pr&Atilde;&copy;fixe par d&Atilde;&copy;faut des citations.
+Nano utilise ce pr&Atilde;&copy;fixe pour
+r&Atilde;&copy;aliser une justification correcte des
+citations. Si nano est capable d&rsquo;utiliser des
+expressions rationnelles, le pr&Atilde;&copy;fixe par
+d&Atilde;&copy;faut sera
 &quot;<i>^([&nbsp;\t]*[#:&gt;\|}])+</i>&quot;, sinon, ce
 sera &quot;<i>&gt;&nbsp;</i>&quot;. Dans l&rsquo;expression
-rationnelle pr&eacute;c&eacute;dente,
-&laquo;&nbsp;<i>\t&nbsp;</i>&raquo; repr&eacute;sente une
-tabulation.</p>
+rationnelle pr&Atilde;&copy;c&Atilde;&copy;dente,
+&Acirc;&laquo;&nbsp;<i>\t&nbsp;</i>&Acirc;&raquo;
+repr&Atilde;&copy;sente une tabulation.</p>
 
 <p style="margin-left:11%;"><b>&minus;R
 (&minus;&minus;restricted)</b></p>
 
 <p style="margin-left:22%;">Mode restreint&nbsp;: aucune
-lecture ou &eacute;criture de fichiers non indiqu&eacute;s
-sur la ligne de commande, pas de lecture des fichiers
-nanorc, interdiction de suspendre, interdiction
-d&rsquo;ajouter au d&eacute;but, &agrave; la fin, de
-sauvegarder un fichier ayant d&eacute;j&agrave; un nom sous
-un nom diff&eacute;rent, d&rsquo;utiliser une copie de
-s&eacute;curit&eacute; ou le correcteur orthographique.
-Cette option peut aussi &ecirc;tre activ&eacute;e en
-appelant <b>nano</b> sous un nom commen&ccedil;ant par
-&laquo;&nbsp;r&nbsp;&raquo; (par exemple
-&laquo;&nbsp;rnano&nbsp;&raquo;).</p>
+lecture ou &Atilde;&copy;criture de fichiers non
+indiqu&Atilde;&copy;s sur la ligne de commande, pas de
+lecture des fichiers nanorc, interdiction de suspendre,
+interdiction d&rsquo;ajouter au d&Atilde;&copy;but,
+&Atilde;&nbsp; la fin, de sauvegarder un fichier ayant
+d&Atilde;&copy;j&Atilde;&nbsp; un nom sous un nom
+diff&Atilde;&copy;rent, d&rsquo;utiliser une copie de
+s&Atilde;&copy;curit&Atilde;&copy; ou le correcteur
+orthographique. Cette option peut aussi &Atilde;&ordf;tre
+activ&Atilde;&copy;e en appelant <b>nano</b> sous un nom
+commen&Atilde;&sect;ant par
+&Acirc;&laquo;&nbsp;r&nbsp;&Acirc;&raquo; (par exemple
+&Acirc;&laquo;&nbsp;rnano&nbsp;&Acirc;&raquo;).</p>
 
 <p style="margin-left:11%;"><b>&minus;S
 (&minus;&minus;smooth)</b></p>
 
-<p style="margin-left:22%;">Active le d&eacute;filement
-progressif. Le texte d&eacute;filera ligne-par-ligne au lieu
-de d&eacute;filer morceau-par-morceau.</p>
+<p style="margin-left:22%;">Active le
+d&Atilde;&copy;filement progressif. Le texte
+d&Atilde;&copy;filera ligne-par-ligne au lieu de
+d&Atilde;&copy;filer morceau-par-morceau.</p>
 
 <p style="margin-left:11%;"><b>&minus;T</b> <i>nombre</i>
 <b>(&minus;&minus;tabsize=</b><i>nombre</i><b>)</b></p>
 
-<p style="margin-left:22%;">D&eacute;finit la taille
+<p style="margin-left:22%;">D&Atilde;&copy;finit la taille
 (largeur) des tabulations en nombre de colonnes. Le nombre
-indiqu&eacute; doit &ecirc;tre strictement sup&eacute;rieur
-&agrave; 0. La valeur par d&eacute;faut est de 8.</p>
+indiqu&Atilde;&copy; doit &Atilde;&ordf;tre strictement
+sup&Atilde;&copy;rieur &Atilde;&nbsp; 0. La valeur par
+d&Atilde;&copy;faut est de 8.</p>
 
 <p style="margin-left:11%;"><b>&minus;U
 (&minus;&minus;quickblank)</b></p>
 
 <p style="margin-left:22%;">Effacement rapide de la ligne
-d&rsquo;&eacute;tat. Les messages affich&eacute;s par la
-ligne d&rsquo;&eacute;tat dispara&icirc;tront apr&egrave;s
-une frappe clavier au lieu de 25. Notez que l&rsquo;option
-<b>-c</b> prend le pas sur cette option.</p>
+d&rsquo;&Atilde;&copy;tat. Les messages
+affich&Atilde;&copy;s par la ligne d&rsquo;&Atilde;&copy;tat
+dispara&Atilde;&reg;tront apr&Atilde;&uml;s une frappe
+clavier au lieu de 25. Notez que l&rsquo;option <b>-c</b>
+prend le pas sur cette option.</p>
 
 <p style="margin-left:11%;"><b>&minus;V
 (&minus;&minus;version)</b></p>
 
 <p style="margin-left:22%;">Affiche la version, puis
-s&rsquo;arr&ecirc;te.</p>
+s&rsquo;arr&Atilde;&ordf;te.</p>
 
 <p style="margin-left:11%;"><b>&minus;W
 (&minus;&minus;wordbounds)</b></p>
 
-<p style="margin-left:22%;">D&eacute;tection plus
-pr&eacute;cise des limites de mots, obtenue en
-consid&eacute;rant les caract&egrave;res de ponctuation
-comme faisant partie des mots.</p>
+<p style="margin-left:22%;">D&Atilde;&copy;tection plus
+pr&Atilde;&copy;cise des limites de mots, obtenue en
+consid&Atilde;&copy;rant les caract&Atilde;&uml;res de
+ponctuation comme faisant partie des mots.</p>
 
 <p style="margin-left:11%;"><b>&minus;Y</b>
-<i>cha&icirc;ne</i>
-<b>(&minus;&minus;syntax=</b><i>cha&icirc;ne</i><b>)</b></p>
+<i>cha&Atilde;&reg;ne</i>
+<b>(&minus;&minus;syntax=</b><i>cha&Atilde;&reg;ne</i><b>)</b></p>
 
 <p style="margin-left:22%;">Indique quel mode de
 colorisation syntaxique adopter, parmi les modes
-d&eacute;finis dans le fichier <i>.nanorc</i>, si cette
-fonctionnalit&eacute; est disponible.</p>
+d&Atilde;&copy;finis dans le fichier <i>.nanorc</i>, si
+cette fonctionnalit&Atilde;&copy; est disponible.</p>
 
 <p style="margin-left:11%;"><b>&minus;c
 (&minus;&minus;const)</b></p>
@@ -293,89 +312,95 @@ l&rsquo;option <b>-U</b>.</p>
 <p style="margin-left:11%;"><b>&minus;d
 (&minus;&minus;rebinddelete)</b></p>
 
-<p style="margin-left:22%;">Interpr&egrave;te
-diff&eacute;remment la touche
-&laquo;&nbsp;Supprimer&nbsp;&raquo;, afin que les touches
-&laquo;&nbsp;Effacement arri&egrave;re&nbsp;&raquo; et
-&laquo;&nbsp;Supprimer&nbsp;&raquo; fonctionnent
-correctement. Vous ne devriez avoir besoin de cette option
-que si, sur votre syst&egrave;me, la touche
-&laquo;&nbsp;Effacement arri&egrave;re&nbsp;&raquo; produit
+<p style="margin-left:22%;">Interpr&Atilde;&uml;te
+diff&Atilde;&copy;remment la touche
+&Acirc;&laquo;&nbsp;Supprimer&nbsp;&Acirc;&raquo;, afin que
+les touches &Acirc;&laquo;&nbsp;Effacement
+arri&Atilde;&uml;re&nbsp;&Acirc;&raquo; et
+&Acirc;&laquo;&nbsp;Supprimer&nbsp;&Acirc;&raquo;
+fonctionnent correctement. Vous ne devriez avoir besoin de
+cette option que si, sur votre syst&Atilde;&uml;me, la
+touche &Acirc;&laquo;&nbsp;Effacement
+arri&Atilde;&uml;re&nbsp;&Acirc;&raquo; produit
 l&rsquo;effet de la touche
-&laquo;&nbsp;Supprimer&nbsp;&raquo;.</p>
+&Acirc;&laquo;&nbsp;Supprimer&nbsp;&Acirc;&raquo;.</p>
 
 <p style="margin-left:11%;"><b>&minus;h
 (&minus;&minus;help)</b></p>
 
-<p style="margin-left:22%;">Affiche un r&eacute;sum&eacute;
-des options de lancement de nano, puis
-s&rsquo;arr&ecirc;te.</p>
+<p style="margin-left:22%;">Affiche un
+r&Atilde;&copy;sum&Atilde;&copy; des options de lancement de
+nano, puis s&rsquo;arr&Atilde;&ordf;te.</p>
 
 <p style="margin-left:11%;"><b>&minus;i
 (&minus;&minus;autoindent)</b></p>
 
 <p style="margin-left:22%;">Indentation automatique.
-Commence chaque nouvelle ligne au m&ecirc;me niveau que la
-ligne pr&eacute;c&eacute;dente. Utile pour
-l&rsquo;&eacute;dition de code source.</p>
+Commence chaque nouvelle ligne au m&Atilde;&ordf;me niveau
+que la ligne pr&Atilde;&copy;c&Atilde;&copy;dente. Utile
+pour l&rsquo;&Atilde;&copy;dition de code source.</p>
 
 <p style="margin-left:11%;"><b>&minus;k
 (&minus;&minus;cut)</b></p>
 
 <p style="margin-left:22%;">Coupe le texte du curseur
-&agrave; la fin de la ligne, au lieu de couper la ligne
-enti&egrave;re.</p>
+&Atilde;&nbsp; la fin de la ligne, au lieu de couper la
+ligne enti&Atilde;&uml;re.</p>
 
 <p style="margin-left:11%;"><b>&minus;l
 (&minus;&minus;nofollow)</b></p>
 
 <p style="margin-left:22%;">Si le fichier
-&eacute;dit&eacute; est un lien symbolique, au lieu de le
-suivre, remplace le lien par le nouveau fichier. Sans doute
-utile pour &eacute;diter les fichiers de <i>/tmp</i>,
-non&nbsp;?</p>
+&Atilde;&copy;dit&Atilde;&copy; est un lien symbolique, au
+lieu de le suivre, remplace le lien par le nouveau fichier.
+Sans doute utile pour &Atilde;&copy;diter les fichiers de
+<i>/tmp</i>, non&nbsp;?</p>
 
 <p style="margin-left:11%;"><b>&minus;m
 (&minus;&minus;mouse)</b></p>
 
 <p style="margin-left:22%;">Active l&rsquo;utilisation de
-la souris, si elle est disponible pour votre syst&egrave;me.
-Lorsque celle-ci est activ&eacute;e, il est possible
-d&rsquo;utiliser la souris pour positionner le curseur, pour
-marquer le texte (avec un double-clic) et pour lancer les
-fonctions correspondant aux raccourcis. Il est possible
+la souris, si elle est disponible pour votre
+syst&Atilde;&uml;me. Lorsque celle-ci est
+activ&Atilde;&copy;e, il est possible d&rsquo;utiliser la
+souris pour positionner le curseur, pour marquer le texte
+(avec un double-clic) et pour lancer les fonctions
+correspondant aux raccourcis. Il est possible
 d&rsquo;utiliser la souris sous X&nbsp;Window ou en mode
 console avec gpm.</p>
 
 <p style="margin-left:11%;"><b>&minus;o</b>
-<i>r&eacute;pertoire</i>
-<b>(&minus;&minus;operatingdir=</b><i>r&eacute;pertoire</i><b>)</b></p>
-
-<p style="margin-left:22%;">D&eacute;finit le
-r&eacute;pertoire de travail. Demande &agrave; <b>nano</b>
-de mettre en place quelque chose de similaire &agrave; un
-environnement d&rsquo;ex&eacute;cution restreint
+<i>r&Atilde;&copy;pertoire</i>
+<b>(&minus;&minus;operatingdir=</b><i>r&Atilde;&copy;pertoire</i><b>)</b></p>
+
+<p style="margin-left:22%;">D&Atilde;&copy;finit le
+r&Atilde;&copy;pertoire de travail. Demande &Atilde;&nbsp;
+<b>nano</b> de mettre en place quelque chose de similaire
+&Atilde;&nbsp; un environnement
+d&rsquo;ex&Atilde;&copy;cution restreint
 (<i>chroot</i>).</p>
 
 <p style="margin-left:11%;"><b>&minus;p
 (&minus;&minus;preserve)</b></p>
 
-<p style="margin-left:22%;">Pr&eacute;serve les
-s&eacute;quences XON et XOFF (^Q et ^S), afin qu&rsquo;elle
-soient re&ccedil;ues par le terminal.</p>
+<p style="margin-left:22%;">Pr&Atilde;&copy;serve les
+s&Atilde;&copy;quences XON et XOFF (^Q et ^S), afin
+qu&rsquo;elle soient re&Atilde;&sect;ues par le
+terminal.</p>
 
 <p style="margin-left:11%;"><b>&minus;r</b> <i>colonne</i>
 <b>(&minus;&minus;fill=</b><i>colonne</i><b>)</b></p>
 
-<p style="margin-left:22%;">Passe automatiquement &agrave;
-la ligne une fois arriv&eacute; &agrave; la colonne
-<i>colonne</i>. Si la valeur indiqu&eacute;e est de 0 ou
-moins, le point de passage &agrave; la ligne aura lieu
-&agrave; la taille de l&rsquo;&eacute;cran moins
-<i>colonne</i>. Cela permet de faire varier le point de
-passage &agrave; la ligne lorsque l&rsquo;on change la
-taille de l&rsquo;&eacute;cran. La valeur par d&eacute;faut
-est de &minus;8.</p>
+<p style="margin-left:22%;">Passe automatiquement
+&Atilde;&nbsp; la ligne une fois arriv&Atilde;&copy;
+&Atilde;&nbsp; la colonne <i>colonne</i>. Si la valeur
+indiqu&Atilde;&copy;e est de 0 ou moins, le point de passage
+&Atilde;&nbsp; la ligne aura lieu &Atilde;&nbsp; la taille
+de l&rsquo;&Atilde;&copy;cran moins <i>colonne</i>. Cela
+permet de faire varier le point de passage &Atilde;&nbsp; la
+ligne lorsque l&rsquo;on change la taille de
+l&rsquo;&Atilde;&copy;cran. La valeur par
+d&Atilde;&copy;faut est de &minus;8.</p>
 
 <p style="margin-left:11%;"><b>&minus;s</b>
 <i>programme</i>
@@ -387,10 +412,11 @@ orthographique de remplacement.</p>
 <p style="margin-left:11%;"><b>&minus;t
 (&minus;&minus;tempfile)</b></p>
 
-<p style="margin-left:22%;">S&rsquo;il a &eacute;t&eacute;
-modifi&eacute;, le fichier sera sauvegard&eacute;
-automatiquement sans demande de confirmation. Identique
-&agrave; l&rsquo;option <b>-t</b> de Pico.</p>
+<p style="margin-left:22%;">S&rsquo;il a
+&Atilde;&copy;t&Atilde;&copy; modifi&Atilde;&copy;, le
+fichier sera sauvegard&Atilde;&copy; automatiquement sans
+demande de confirmation. Identique &Atilde;&nbsp;
+l&rsquo;option <b>-t</b> de Pico.</p>
 
 <p style="margin-left:11%;"><b>&minus;v
 (&minus;&minus;view)</b></p>
@@ -401,27 +427,27 @@ seule).</p>
 <p style="margin-left:11%;"><b>&minus;w
 (&minus;&minus;nowrap)</b></p>
 
-<p style="margin-left:22%;">D&eacute;sactive le passage
-automatique &agrave; la ligne.</p>
+<p style="margin-left:22%;">D&Atilde;&copy;sactive le
+passage automatique &Atilde;&nbsp; la ligne.</p>
 
 <p style="margin-left:11%;"><b>&minus;x
 (&minus;&minus;nohelp)</b></p>
 
-<p style="margin-left:22%;">D&eacute;sactive la barre
-d&rsquo;aide affich&eacute;e en bas de
-l&rsquo;&eacute;cran.</p>
+<p style="margin-left:22%;">D&Atilde;&copy;sactive la barre
+d&rsquo;aide affich&Atilde;&copy;e en bas de
+l&rsquo;&Atilde;&copy;cran.</p>
 
 <p style="margin-left:11%;"><b>&minus;z
 (&minus;&minus;suspend)</b></p>
 
-<p style="margin-left:22%;">Autorise &agrave; suspendre
-l&rsquo;&eacute;diteur.</p>
+<p style="margin-left:22%;">Autorise &Atilde;&nbsp;
+suspendre l&rsquo;&Atilde;&copy;diteur.</p>
 
 <p style="margin-left:11%;"><b>&minus;a, &minus;b,
 &minus;e, &minus;f, &minus;g, &minus;j</b></p>
 
-<p style="margin-left:22%;">Ignor&eacute;, pour &ecirc;tre
-compatible avec Pico.</p>
+<p style="margin-left:22%;">Ignor&Atilde;&copy;, pour
+&Atilde;&ordf;tre compatible avec Pico.</p>
 
 <h2>FICHIERS D&rsquo;INITIALISATION
 <a name="FICHIERS D&rsquo;INITIALISATION"></a>
@@ -431,10 +457,11 @@ compatible avec Pico.</p>
 <p style="margin-left:11%; margin-top: 1em"><b>nano</b> lit
 les fichiers d&rsquo;initialisation dans l&rsquo;ordre
 suivant&nbsp;: <i>SYSCONFDIR/nanorc</i>, puis
-<i>~/.nanorc</i>. R&eacute;f&eacute;rez-vous &agrave; la
-page de manuel de <b>nanorc(5)</b> et au fichier
-d&rsquo;exemple <i>nanorc.sample</i>, qui devraient tous les
-deux &ecirc;tre livr&eacute;s avec <b>nano</b>.</p>
+<i>~/.nanorc</i>. R&Atilde;&copy;f&Atilde;&copy;rez-vous
+&Atilde;&nbsp; la page de manuel de <b>nanorc(5)</b> et au
+fichier d&rsquo;exemple <i>nanorc.sample</i>, qui devraient
+tous les deux &Atilde;&ordf;tre livr&Atilde;&copy;s avec
+<b>nano</b>.</p>
 
 <h2>NOTES
 <a name="NOTES"></a>
@@ -443,28 +470,31 @@ deux &ecirc;tre livr&eacute;s avec <b>nano</b>.</p>
 
 <p style="margin-left:11%; margin-top: 1em">Si aucun
 correcteur orthographique de remplacement n&rsquo;est
-indiqu&eacute; dans la ligne de commande ou dans l&rsquo;un
-des fichiers nanorc, <b>nano</b> prendra la commande
-indiqu&eacute;e par la variable d&rsquo;environnement
-<b>SPELL</b> si elle est d&eacute;finie.</p>
+indiqu&Atilde;&copy; dans la ligne de commande ou dans
+l&rsquo;un des fichiers nanorc, <b>nano</b> prendra la
+commande indiqu&Atilde;&copy;e par la variable
+d&rsquo;environnement <b>SPELL</b> si elle est
+d&Atilde;&copy;finie.</p>
 
 <p style="margin-left:11%; margin-top: 1em">Dans certains
 cas, <b>nano</b> essaiera de sauvegarder le fichier en cours
-d&rsquo;&eacute;dition dans un fichier de secours. Cela
-arrivera principalement si <b>nano</b> re&ccedil;oit un
-signal SIGHUP ou SIGTERM, ou bien se trouve &agrave; court
-de m&eacute;moire. Le nom de ce fichier de secours sera
-<i>nano.save</i> si le fichier en cours n&rsquo;avait pas
-encore de nom, ou sera compos&eacute; du nom du fichier en
-cours suivi du suffixe &laquo;&nbsp;.save&nbsp;&raquo;. Si
-un fichier de ce nom existe d&eacute;j&agrave; dans le
-r&eacute;pertoire, un &laquo;&nbsp;.save&nbsp;&raquo; et un
-nombre seront ajout&eacute;s &agrave; la fin du nom du
+d&rsquo;&Atilde;&copy;dition dans un fichier de secours.
+Cela arrivera principalement si <b>nano</b>
+re&Atilde;&sect;oit un signal SIGHUP ou SIGTERM, ou bien se
+trouve &Atilde;&nbsp; court de m&Atilde;&copy;moire. Le nom
+de ce fichier de secours sera <i>nano.save</i> si le fichier
+en cours n&rsquo;avait pas encore de nom, ou sera
+compos&Atilde;&copy; du nom du fichier en cours suivi du
+suffixe &Acirc;&laquo;&nbsp;.save&nbsp;&Acirc;&raquo;. Si un
+fichier de ce nom existe d&Atilde;&copy;j&Atilde;&nbsp; dans
+le r&Atilde;&copy;pertoire, un
+&Acirc;&laquo;&nbsp;.save&nbsp;&Acirc;&raquo; et un nombre
+seront ajout&Atilde;&copy;s &Atilde;&nbsp; la fin du nom du
 fichier en cours afin de le rendre unique (par exemple,
-&laquo;&nbsp;.save.1&nbsp;&raquo;). En mode multi-espace,
-<b>nano</b> r&eacute;alisera une sauvegarde de tous les
-fichiers en cours dans leurs fichiers de secours
-respectifs.</p>
+&Acirc;&laquo;&nbsp;.save.1&nbsp;&Acirc;&raquo;). En mode
+multi-espace, <b>nano</b> r&Atilde;&copy;alisera une
+sauvegarde de tous les fichiers en cours dans leurs fichiers
+de secours respectifs.</p>
 
 <h2>BOGUES
 <a name="BOGUES"></a>
@@ -473,24 +503,25 @@ respectifs.</p>
 
 <p style="margin-left:11%; margin-top: 1em">Merci de nous
 faire parvenir vos commentaires et de nous signaler les
-bogues, en &eacute;crivant, en anglais, &agrave;
+bogues, en &Atilde;&copy;crivant, en anglais, &Atilde;&nbsp;
 <b>nano@nano-editor.org</b>.</p>
 
 <p style="margin-left:11%; margin-top: 1em">La liste de
-discussion anglophone <b>nano</b> est disponible &agrave;
-l&rsquo;adresse <b>nano-devel@gnu.org</b>.</p>
+discussion anglophone <b>nano</b> est disponible
+&Atilde;&nbsp; l&rsquo;adresse
+<b>nano-devel@gnu.org</b>.</p>
 
 <p style="margin-left:11%; margin-top: 1em">Pour vous
-abonner, envoyez un courrier &eacute;lectronique &agrave;
-<b>nano-devel-request@gnu.org</b>, ayant pour objet
-&laquo;&nbsp;subscribe&nbsp;&raquo;.</p>
+abonner, envoyez un courrier &Atilde;&copy;lectronique
+&Atilde;&nbsp; <b>nano-devel-request@gnu.org</b>, ayant pour
+objet &Acirc;&laquo;&nbsp;subscribe&nbsp;&Acirc;&raquo;.</p>
 
 
-<p style="margin-left:11%; margin-top: 1em">N&rsquo;h&eacute;sitez
-pas &eacute;galement &agrave; envoyez vos commentaires,
-suggestions et corrections relatives &agrave;
-l&rsquo;adaptation fran&ccedil;aise de cette page de manuel
-ou du logiciel &agrave;
+<p style="margin-left:11%; margin-top: 1em">N&rsquo;h&Atilde;&copy;sitez
+pas &Atilde;&copy;galement &Atilde;&nbsp; envoyez vos
+commentaires, suggestions et corrections relatives
+&Atilde;&nbsp; l&rsquo;adaptation fran&Atilde;&sect;aise de
+cette page de manuel ou du logiciel &Atilde;&nbsp;
 <b>jean-philippe.guerard@tigreraye.org</b>.</p>
 
 <h2>SITE INTERNET
@@ -509,8 +540,8 @@ ou du logiciel &agrave;
 
 <p style="margin-left:11%; margin-top: 1em"><b>nanorc</b>(5)
 <i><br>
-/usr/share/doc/nano/</i> (ou son &eacute;quivalent sur votre
-syst&egrave;me)</p>
+/usr/share/doc/nano/</i> (ou son &Atilde;&copy;quivalent sur
+votre syst&Atilde;&uml;me)</p>
 
 <h2>AUTEUR
 <a name="AUTEUR"></a>
@@ -521,9 +552,10 @@ syst&egrave;me)</p>
 Allegretta &lt;chrisa@asty.org&gt; et d&rsquo;autres (voir
 les fichiers <i>AUTHORS</i> et <i>THANKS</i> pour plus
 d&rsquo;information). Cette page de manuel a
-&eacute;t&eacute; initialement r&eacute;dig&eacute;e par
-Jordi Mallach &lt;jordi@gnu.org&gt; pour le syst&egrave;me
-Debian (mais elle peut &ecirc;tre utilis&eacute;e par
+&Atilde;&copy;t&Atilde;&copy; initialement
+r&Atilde;&copy;dig&Atilde;&copy;e par Jordi Mallach
+&lt;jordi@gnu.org&gt; pour le syst&Atilde;&uml;me Debian
+(mais elle peut &Atilde;&ordf;tre utilis&Atilde;&copy;e par
 d&rsquo;autres).</p>
 
 <h2>TRADUCTION
@@ -532,26 +564,30 @@ d&rsquo;autres).</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Cette
-adaptation fran&ccedil;aise a &eacute;t&eacute;
-r&eacute;alis&eacute;e par Jean-Philippe&nbsp;Gu&eacute;rard
+adaptation fran&Atilde;&sect;aise a
+&Atilde;&copy;t&Atilde;&copy;
+r&Atilde;&copy;alis&Atilde;&copy;e par
+Jean-Philippe&nbsp;Gu&Atilde;&copy;rard
 &lt;jean-philippe.guerard@tigreraye.org&gt; le
-29&nbsp;novembre&nbsp;2007 &agrave; partir de la version
-1.54 du 11&nbsp;octobre&nbsp;2007 de la page de manuel de
-nano 2.0.0. Cette page a &eacute;t&eacute; relue par
-G&eacute;rard Delafond.</p>
+29&nbsp;novembre&nbsp;2007 &Atilde;&nbsp; partir de la
+version 1.54 du 11&nbsp;octobre&nbsp;2007 de la page de
+manuel de nano 2.0.0. Cette page a
+&Atilde;&copy;t&Atilde;&copy; relue par G&Atilde;&copy;rard
+Delafond.</p>
 
 <p style="margin-left:11%; margin-top: 1em">Un maximum de
-soin a &eacute;t&eacute; apport&eacute; lors de
-l&rsquo;&eacute;laboration de cette traduction&nbsp;;
-n&eacute;anmoins, quelques imperfections peuvent subsister.
-Si vous en rencontrez, que ce soit dans la version
-fran&ccedil;aise ou dans la version originale,
-n&rsquo;h&eacute;sitez pas &agrave; les signaler &agrave;
-l&rsquo;auteur ou au traducteur.</p>
+soin a &Atilde;&copy;t&Atilde;&copy; apport&Atilde;&copy;
+lors de l&rsquo;&Atilde;&copy;laboration de cette
+traduction&nbsp;; n&Atilde;&copy;anmoins, quelques
+imperfections peuvent subsister. Si vous en rencontrez, que
+ce soit dans la version fran&Atilde;&sect;aise ou dans la
+version originale, n&rsquo;h&Atilde;&copy;sitez pas
+&Atilde;&nbsp; les signaler &Atilde;&nbsp; l&rsquo;auteur ou
+au traducteur.</p>
 
 <p style="margin-left:11%; margin-top: 1em">La version
-originale la plus &agrave; jour de ce document est toujours
-consultable via la commande&nbsp;:</p>
+originale la plus &Atilde;&nbsp; jour de ce document est
+toujours consultable via la commande&nbsp;:</p>
 
 <p style="margin-left:11%; margin-top: 1em">LANGUAGE=en man
 nano</p>
diff --git a/doc/man/fr/nanorc.5 b/doc/man/fr/nanorc.5
index 0607045..9c25635 100644
--- a/doc/man/fr/nanorc.5
+++ b/doc/man/fr/nanorc.5
@@ -2,14 +2,14 @@
 .\" Copyright (C) 2003, 2004, 2005, 2006, 2007
 .\" Free Software Foundation, Inc.
 .\"
-.\" Le travail d'adaptation française de cette page de manuel a été
-.\" réalisé par Jean-Philippe Guérard, en 2003, 2004, 2005, 2006 et 2007.
+.\" Le travail d'adaptation française de cette page de manuel a été
+.\" réalisé par Jean-Philippe Guérard, en 2003, 2004, 2005, 2006 et 2007.
 .\" Ce travail d'adaptation est dans le domaine public. Attention, la
 .\" page traduite reste soumise au droit d'auteur de ses auteurs
 .\" originaux.
 .\"
 .\" The French translation of this document is a public domain work of
-.\" Jean-Philippe Guérard. This translation work was made in 2003, 2004,
+.\" Jean-Philippe Guérard. This translation work was made in 2003, 2004,
 .\" 2005, 2006 and 2007. The translated man page in itself is still
 .\" subject to the copyright of its original authors.
 .\"
@@ -29,71 +29,71 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.\" Ce document est publié sous une double licence. Vous pouvez
+.\" Ce document est publié sous une double licence. Vous pouvez
 .\" le distribuer et le modifier selon les termes de l'une des deux
-.\" licences ci-dessous :
+.\" licences ci-dessous :
 .\"
-.\" * La Licence publique générale GNU (GNU GPL) version 3 ou, à
-.\"   votre choix, supérieure, telle que publiée par la Free
-.\"   Software Foundation. Vous devriez avoir reçu une copie de la
-.\"   Licence publique générale GNU avec ce programme. Si ce n'est 
+.\" * La Licence publique générale GNU (GNU GPL) version 3 ou, à
+.\"   votre choix, supérieure, telle que publiée par la Free
+.\"   Software Foundation. Vous devriez avoir reçu une copie de la
+.\"   Licence publique générale GNU avec ce programme. Si ce n'est 
 .\"   pas le cas, consultez <http://www.gnu.org/licenses/>.
 .\"
 .\" * La Licence de documentation libre GNU (GNU FDL), version 1.2 
-.\"   ou, à votre choix, supérieure, telle que publiée par la Free
+.\"   ou, à votre choix, supérieure, telle que publiée par la Free
 .\"   Software Foundation, sans section invariante, ni texte de
-.\"   première ou de quatrième de couverture. Vous devriez avoir reçu
+.\"   première ou de quatrième de couverture. Vous devriez avoir reçu
 .\"   une copie de la Licence de documentation libre GNU avec ce
 .\"   programme. Si ce n'est pas le cas, consultez
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.\" $Id: nanorc.5 4443 2009-11-27 02:50:12Z astyanax $
+.\" $Id: nanorc.5 5071 2014-07-16 17:25:55Z jordi $
 .TH NANORC 5 "version 2.0.0" "29\ novembre\ 2007"
 .\" Please adjust this date whenever revising the manpage.
-.\" Merci de modifier ces dates à chaque mise à jour de cette page.
+.\" Merci de modifier ces dates à chaque mise à jour de cette page.
 
 .SH NOM
-nanorc \- fichier de configuration de l'éditeur nano du projet GNU 
+nanorc \- fichier de configuration de l'éditeur nano du projet GNU 
 
 .SH DESCRIPTION
-Cette page de manuel décrit brièvement le fichier de configuration de 
-l'éditeur \fBnano\fP GNU.
+Cette page de manuel décrit brièvement le fichier de configuration de 
+l'éditeur \fBnano\fP GNU.
 .PP
-\fBnano\fP est un petit éditeur sympathique et libre, qui vise à 
-remplacer Pico, l'éditeur par défaut du logiciel non libre Pine. 
+\fBnano\fP est un petit éditeur sympathique et libre, qui vise à 
+remplacer Pico, l'éditeur par défaut du logiciel non libre Pine. 
 \fBnano\fP ne se contentant pas de copier l'interface et l'ergonomie de 
-Pico, il offre également certaines fonctionnalités manquantes (ou 
-désactivées par défaut) de Pico. Ces fonctionnalités sont, par exemple, 
-les fonctions de recherche et de remplacement et la possibilité de 
-sauter directement à une ligne et à une colonne précise.
+Pico, il offre également certaines fonctionnalités manquantes (ou 
+désactivées par défaut) de Pico. Ces fonctionnalités sont, par exemple, 
+les fonctions de recherche et de remplacement et la possibilité de 
+sauter directement à une ligne et à une colonne précise.
 .PP
-Le fichier \fInanorc\fP contient les paramètres par défaut de 
-\fBnano\fP. Il ne doit pas être au format DOS ou Mac. Lors de son 
-démarrage, nano commencera par lire le fichier de configuration général 
+Le fichier \fInanorc\fP contient les paramètres par défaut de 
+\fBnano\fP. Il ne doit pas être au format DOS ou Mac. Lors de son 
+démarrage, nano commencera par lire le fichier de configuration général 
 \fISYSCONFDIR/nanorc\fP, puis lira le fichier de configuration personnel 
 de l'utilisateur \fI~/.nanorc\fP.
 
 .SH OPTIONS
-Le fichier de configuration accepte une série de commandes \fBset\fP 
-(activer) et \fBunset\fP (désactiver), qui permettent de définir le 
-paramétrage de nano au démarrage sans avoir à utiliser d'options de
+Le fichier de configuration accepte une série de commandes \fBset\fP 
+(activer) et \fBunset\fP (désactiver), qui permettent de définir le 
+paramétrage de nano au démarrage sans avoir à utiliser d'options de
 ligne de commande. De plus, les mots clefs \fBsyntax\fP (syntaxe),
-\fBcolor\fP (couleur) et \fBicolor\fP (couleur insensible à la casse) 
-sont utilisés pour définir les règles de colorisation pour différents 
+\fBcolor\fP (couleur) et \fBicolor\fP (couleur insensible à la casse) 
+sont utilisés pour définir les règles de colorisation pour différents 
 motifs de texte. \fBnano\fP lit une commande par ligne.
 
-Les options du fichier de configuration ont priorité sur les valeurs par 
-défaut utilisées par nano. Les options de la ligne de commande sont 
+Les options du fichier de configuration ont priorité sur les valeurs par 
+défaut utilisées par nano. Les options de la ligne de commande sont 
 prioritaires par rapport aux options du fichier de configuration. Les 
-options sont désactivées (unset) par défaut, sauf les options prenant un 
+options sont désactivées (unset) par défaut, sauf les options prenant un 
 argument.
 
-Les apostrophes («\ \fI'\fP\ ») et les guillemets droits («\ \fI"\fP\ »)
-présents dans des chaînes de caractères utilisées comme paramètres n'ont 
-pas besoin d'être précédées d'une barre oblique inversée
-(«\ \fI\\\fP\ »). La chaîne sera terminée par le dernier guillemet 
+Les apostrophes («\ \fI'\fP\ ») et les guillemets droits («\ \fI"\fP\ »)
+présents dans des chaînes de caractères utilisées comme paramètres n'ont 
+pas besoin d'être précédées d'une barre oblique inversée
+(«\ \fI\\\fP\ »). La chaîne sera terminée par le dernier guillemet 
 droit. Par exemple, pour l'option \fBbrackets\fP, "\fI"')>]}\fP" 
-correspondra à \fI"\fP, \fI'\fP, \fI)\fP, \fI>\fP, \fI]\fP et \fI}\fP.
+correspondra à \fI"\fP, \fI'\fP, \fI)\fP, \fI>\fP, \fI]\fP et \fI}\fP.
 
 Les commandes et arguments reconnus sont\ :
 
@@ -102,69 +102,69 @@ Les commandes et arguments reconnus sont\ :
 Active l'indentation automatique.
 .TP
 .B set/unset backup
-Crée des copies de sécurité nommées
+Crée des copies de sécurité nommées
 .IR nom_du_fichier~ .
 .TP
-.B set backupdir "\fIrépertoire\fP"
-Définit le répertoire utilisé par \fBnano\fP pour enregistrer les copies 
-de sécurité uniques, si l'enregistrement de copies de sécurité est 
-activé.
+.B set backupdir "\fIrépertoire\fP"
+Définit le répertoire utilisé par \fBnano\fP pour enregistrer les copies 
+de sécurité uniques, si l'enregistrement de copies de sécurité est 
+activé.
 .TP
 .B set/unset backwards
-Par défaut, les recherches se font vers l'arrière.
+Par défaut, les recherches se font vers l'arrière.
 .TP
 .B set/unset boldtext
-Utilise des caractères gras à la place de la vidéo inverse.
+Utilise des caractères gras à la place de la vidéo inverse.
 .TP
-.B set brackets "\fIchaîne\fP"
-Définit les caractères considérés comme des crochets fermants lors de la 
-justification des paragraphes. Ces caractères ne doivent pas contenir 
-d'espaces. Seules les ponctuations terminales, éventuellement suivies 
+.B set brackets "\fIchaîne\fP"
+Définit les caractères considérés comme des crochets fermants lors de la 
+justification des paragraphes. Ces caractères ne doivent pas contenir 
+d'espaces. Seules les ponctuations terminales, éventuellement suivies 
 de crochets fermants, peuvent terminer une phrase.
 
-La valeur par défaut de cette option est\ : "\fI"')>]}\fP".
+La valeur par défaut de cette option est\ : "\fI"')>]}\fP".
 
 N.D.T.\ : reportez-vous au paragraphe sur l'option \fBpunct\fR pour 
 plus d'informations.
 
 .TP
 .B set/unset casesensitive
-Par défaut, les recherches ne tiennent pas compte de la casse.
+Par défaut, les recherches ne tiennent pas compte de la casse.
 .TP
 .B set/unset const
-Affiche en permanence la position du curseur dans la ligne d'état.
+Affiche en permanence la position du curseur dans la ligne d'état.
 .TP
 .B set/unset cut
-Par défaut, coupe le texte du curseur à la fin de la ligne, au lieu de 
-couper la ligne entière.
+Par défaut, coupe le texte du curseur à la fin de la ligne, au lieu de 
+couper la ligne entière.
 .TP
 .B set fill \fIn\fP
-Passe automatiquement à la ligne une fois arrivé à la colonne 
-\fIn\fR. Si la valeur indiquée est de 0 ou moins, le point de passage à 
-la ligne aura lieu à la taille de l'écran moins \fIn\fR. Cela permet de 
-faire varier le point de passage à la ligne lorsque l'on change la 
-taille de l'écran. La valeur par défaut est de \-8.
+Passe automatiquement à la ligne une fois arrivé à la colonne 
+\fIn\fR. Si la valeur indiquée est de 0 ou moins, le point de passage à 
+la ligne aura lieu à la taille de l'écran moins \fIn\fR. Cela permet de 
+faire varier le point de passage à la ligne lorsque l'on change la 
+taille de l'écran. La valeur par défaut est de \-8.
 .TP
 .B set/unset historylog
 Active l'utilisation de
 .I ~/.nano_history
-pour enregistrer et relire les chaînes ayant fait l'objet d'une 
+pour enregistrer et relire les chaînes ayant fait l'objet d'une 
 recherche ou d'un remplacement.
 .TP
-.B set matchbrackets "\fIchaîne\fP"
-Définit les crochets ouvrants et fermant pour la recherche de crochets 
+.B set matchbrackets "\fIchaîne\fP"
+Définit les crochets ouvrants et fermant pour la recherche de crochets 
 correspondants. Cette liste ne doit pas contenir de blancs. L'ensemble 
-des crochets ouvrants doit être indiqué en premier, suivi de l'ensemble 
-des crochets fermant, qui doit être dans le même ordre. La valeur par 
-défaut de cette option est "\fI(<[{)>]}\fP".
+des crochets ouvrants doit être indiqué en premier, suivi de l'ensemble 
+des crochets fermant, qui doit être dans le même ordre. La valeur par 
+défaut de cette option est "\fI(<[{)>]}\fP".
 .TP
 .B set/unset morespace
-Utiliser la ligne blanche située sous la ligne de titre comme espace 
-supplémentaire d'édition.
+Utiliser la ligne blanche située sous la ligne de titre comme espace 
+supplémentaire d'édition.
 .TP
 .B set/unset mouse
 Active l'utilisation de la souris, si elle est disponible pour votre
-système. Lorsque celle-ci est activée, il est possible d'utiliser la
+système. Lorsque celle-ci est activée, il est possible d'utiliser la
 souris pour positionner le curseur, pour marquer le texte (avec un
 double-clic) et pour lancer les fonctions correspondant aux raccourcis.
 Il est possible d'utiliser la souris sous X\ Window ou en mode console
@@ -178,167 +178,167 @@ espace.
 Pas de conversion depuis les formats DOS et Mac.
 .TP
 .B set/unset nofollow
-Ne suit pas les liens symboliques lors de l'écriture des fichiers.
+Ne suit pas les liens symboliques lors de l'écriture des fichiers.
 .TP
 .B set/unset nohelp
-Désactive les lignes d'aide affichée en bas de l'écran.
+Désactive les lignes d'aide affichée en bas de l'écran.
 .TP
 .B set/unset nonewlines
-Ne pas ajouter de passage à la ligne à la fin des fichiers.
+Ne pas ajouter de passage à la ligne à la fin des fichiers.
 .TP
 .B set/unset nowrap
-Désactive le passage automatique à la ligne.
+Désactive le passage automatique à la ligne.
 .TP
-.B set operatingdir "\fIrépertoire\fP"
-\fBnano\fP ne lira et n'écrira des fichiers qu'à l'intérieur du 
-\fIrépertoire\fP et de ses sous-répertoires. De plus, celui-ci devient 
-le répertoire courant, afin que les fichiers soient lus depuis ce 
-répertoire. Par défaut, cette fonction est désactivée.
+.B set operatingdir "\fIrépertoire\fP"
+\fBnano\fP ne lira et n'écrira des fichiers qu'à l'intérieur du 
+\fIrépertoire\fP et de ses sous-répertoires. De plus, celui-ci devient 
+le répertoire courant, afin que les fichiers soient lus depuis ce 
+répertoire. Par défaut, cette fonction est désactivée.
 .TP
 .B set/unset preserve
-Préserve les séquences XON et XOFF (^Q et ^S).
+Préserve les séquences XON et XOFF (^Q et ^S).
 .TP
-.B set punct "\fIchaîne\fP"
-Définit les caractères interprétés comme des ponctuations terminales 
-lors de la justification des paragraphes. Ces caractères ne peuvent 
-inclure de blancs. Seules les ponctuations terminales, éventuellement 
+.B set punct "\fIchaîne\fP"
+Définit les caractères interprétés comme des ponctuations terminales 
+lors de la justification des paragraphes. Ces caractères ne peuvent 
+inclure de blancs. Seules les ponctuations terminales, éventuellement 
 suivies de crochets fermants, peuvent terminer une phrase. La valeur par 
-défaut de cette option est "\fI!.?\fP".
+défaut de cette option est "\fI!.?\fP".
 
-N.D.T.\ : ce réglage permet, lors de la justification, de conserver
-2\ espaces au lieu d'une derrière les ponctuations terminales, ce qui 
+N.D.T.\ : ce réglage permet, lors de la justification, de conserver
+2\ espaces au lieu d'une derrière les ponctuations terminales, ce qui 
 correspond aux normes typographiques anglo-saxonnes, mais n'a pas lieu 
-d'être en français. Pour le français, le plus simple est d'indiquer, 
-dans le fichier nanorc, une chaîne vide pour ce paramètre.
+d'être en français. Pour le français, le plus simple est d'indiquer, 
+dans le fichier nanorc, une chaîne vide pour ce paramètre.
 .TP
 .B set/unset quickblank
-Effacement rapide de la ligne d'état. Les messages affichés par la ligne
-d'état disparaîtront après une frappe clavier au lieu de 25.
-.TP
-.B set quotestr "\fIchaîne\fP"
-Définit le préfixe par défaut utilisé pour les citations dans les 
-courriers électroniques. Ce préfixe est utilisé pour réaliser une 
-justification correcte de ces citations. Il s'agira, si votre système le 
-permet, d'une expression rationnelle étendue. Dans le cas 
-contraire, il s'agira d'une chaîne de texte brut. Si vous disposez des 
-expressions rationnelles, la valeur par défaut de cette option sera 
+Effacement rapide de la ligne d'état. Les messages affichés par la ligne
+d'état disparaîtront après une frappe clavier au lieu de 25.
+.TP
+.B set quotestr "\fIchaîne\fP"
+Définit le préfixe par défaut utilisé pour les citations dans les 
+courriers électroniques. Ce préfixe est utilisé pour réaliser une 
+justification correcte de ces citations. Il s'agira, si votre système le 
+permet, d'une expression rationnelle étendue. Dans le cas 
+contraire, il s'agira d'une chaîne de texte brut. Si vous disposez des 
+expressions rationnelles, la valeur par défaut de cette option sera 
 "\fI^([\ \\t]*[#:>\\|}])+\fP", sinon, ce sera ">\ ". Notez que le
-«\ \\t\ » ci-dessus correspond à un caractère de tabulation.
+«\ \\t\ » ci-dessus correspond à un caractère de tabulation.
 .TP
 .B set/unset rebinddelete
-Interprète différemment la touche «\ Supprimer\ », afin que les touches 
-«\ Effacement arrière\ » et «\ Supprimer\ » fonctionnent correctement. 
-Vous ne devriez avoir besoin de cette option que si, sur votre système, 
-la touche «\ Effacement arrière\ » produit l'effet de la touche «\ 
-Supprimer\ ».
+Interprète différemment la touche «\ Supprimer\ », afin que les touches 
+«\ Effacement arrière\ » et «\ Supprimer\ » fonctionnent correctement. 
+Vous ne devriez avoir besoin de cette option que si, sur votre système, 
+la touche «\ Effacement arrière\ » produit l'effet de la touche «\ 
+Supprimer\ ».
 .TP
 .B set/unset rebindkeypad
-Interprète les touches du pavé numérique afin qu'elles fonctionnent 
+Interprète les touches du pavé numérique afin qu'elles fonctionnent 
 toutes correctement. Vous ne devriez utiliser cette option que si ce 
 n'est pas le cas, car nano ne sera plus capable d'utiliser la souris 
-correctement lorsque cette option sera activée.
+correctement lorsque cette option sera activée.
 .TP
 .B set/unset regexp
-Utilise par défaut des expressions rationnelles étendues pour les 
+Utilise par défaut des expressions rationnelles étendues pour les 
 recherches.
 .TP
 .B set/unset smarthome
-Rend plus malin le fonctionnement de la touche «\ Début\ ». Lorsque
-cette touche est pressée à n'importe quel endroit excepté au tout début
-du texte d'une ligne (i.\ e. au premier caractère non blanc), le curseur
-se positionnera au début du texte de la ligne (qu'il soit en avant ou en 
-arrière). Si le curseur est déjà là, il se placera au vrai début de la 
+Rend plus malin le fonctionnement de la touche «\ Début\ ». Lorsque
+cette touche est pressée à n'importe quel endroit excepté au tout début
+du texte d'une ligne (i.\ e. au premier caractère non blanc), le curseur
+se positionnera au début du texte de la ligne (qu'il soit en avant ou en 
+arrière). Si le curseur est déjà là, il se placera au vrai début de la 
 ligne.
 .TP
 .B set/unset smooth
-Active le défilement ligne-par-ligne du texte.
+Active le défilement ligne-par-ligne du texte.
 .TP
 .B set speller "\fIprogramme\fP"
 Utilise le correcteur orthographique \fIprogramme\fP au lieu du 
-correcteur intégré, qui s'appuie sur \fIspell\fP.
+correcteur intégré, qui s'appuie sur \fIspell\fP.
 .TP
 .B set/unset suspend
-Autorise à suspendre \fBnano\fP.
+Autorise à suspendre \fBnano\fP.
 .TP
 .B set tabsize \fIn\fP
 Utilise une taille de tabulation de \fIn\fP colonnes. Cette valeur doit 
-être strictement supérieure à 0. La valeur par défaut est de\ 8.
+être strictement supérieure à 0. La valeur par défaut est de\ 8.
 .TP
 .B set/unset tabstospaces
 Convertit les tabulations clavier en espaces.
 .TP
 .B set/unset tempfile
-S'il a été modifié, le fichier sera sauvegardé automatiquement en 
+S'il a été modifié, le fichier sera sauvegardé automatiquement en 
 quittant, sans demande de confirmation.
 .TP
 .B set/unset view
 Interdit de modifier les fichiers.
 .TP
-.B set whitespace "\fIchaîne\fP"
-Définit les deux caractères utilisés pour afficher les premiers 
-caractères des tabulations et des espaces. Ces deux caractères doivent 
-être mono-colonne.
+.B set whitespace "\fIchaîne\fP"
+Définit les deux caractères utilisés pour afficher les premiers 
+caractères des tabulations et des espaces. Ces deux caractères doivent 
+être mono-colonne.
 .TP
 .B set/unset wordbounds
-Détection plus précise des limites de mots, obtenue en considérant les
-caractères de ponctuation comme faisant partie des mots.
+Détection plus précise des limites de mots, obtenue en considérant les
+caractères de ponctuation comme faisant partie des mots.
 .TP
-.B syntax "\fIchaîne\fP" ["\fImotif_de_fichier\fP" ... ]
-Définit une syntaxe nommée \fIchaîne\fP qui pourra être activé via 
+.B syntax "\fIchaîne\fP" ["\fImotif_de_fichier\fP" ... ]
+Définit une syntaxe nommée \fIchaîne\fP qui pourra être activé via 
 l'option \fB-Y\fP (ou \fB--syntax\fP) ou qui sera automatiquement 
-activée si le nom du fichier en cours correspond à l'expression 
-rationnelle étendue \fImotif_de_fichier\fP. Toutes les instructions 
-suivantes de colorisation \fBcolor\fP ou \fBicolor\fP s'appliqueront à 
-cette syntaxe, jusqu'à la définition d'une nouvelle syntaxe.
+activée si le nom du fichier en cours correspond à l'expression 
+rationnelle étendue \fImotif_de_fichier\fP. Toutes les instructions 
+suivantes de colorisation \fBcolor\fP ou \fBicolor\fP s'appliqueront à 
+cette syntaxe, jusqu'à la définition d'une nouvelle syntaxe.
 
-La syntaxe nommée \fInone\fP (aucune) est réservée\ ; si elle est 
-indiquée dans la ligne de commande, cela revient à ne définir aucune 
-syntaxe. La syntaxe nommée \fIdefault\fP (par défaut) est spéciale, elle 
-ne nécessite aucun motif de \fImotif_de_fichier\fP, et s'applique aux 
-fichiers ne correspondant à aucun des \fImotif_de_fichier\fP des autres 
+La syntaxe nommée \fInone\fP (aucune) est réservée\ ; si elle est 
+indiquée dans la ligne de commande, cela revient à ne définir aucune 
+syntaxe. La syntaxe nommée \fIdefault\fP (par défaut) est spéciale, elle 
+ne nécessite aucun motif de \fImotif_de_fichier\fP, et s'applique aux 
+fichiers ne correspondant à aucun des \fImotif_de_fichier\fP des autres 
 syntaxes.
 .TP
 .B color \fIcouleur_texte\fP[,\fIcouleur_fond\fP] "\fImotif\fP" ...
-Pour la syntaxe en cours, affiche toutes les expressions correspondant à 
-l'expression rationnelle étendue \fImotif\fP en utilisant la couleur de 
+Pour la syntaxe en cours, affiche toutes les expressions correspondant à 
+l'expression rationnelle étendue \fImotif\fP en utilisant la couleur de 
 texte \fIcouleur_texte\fP et la couleur de fond \fIcouleur_fond\fP, 
-l'une de ces deux couleurs au moins devant être définie. Les couleurs 
-acceptées par \fBnano\fP pour le texte et le fond sont\ : \fIwhite\fP 
+l'une de ces deux couleurs au moins devant être définie. Les couleurs 
+acceptées par \fBnano\fP pour le texte et le fond sont\ : \fIwhite\fP 
 (blanc), \fIblack\fP (noir), \fIred\fP (rouge), \fIblue\fP (bleu), 
 \fIgreen\fP (vert), \fIyellow\fP (jaune), \fImagenta\fP, et \fIcyan\fP. 
-Pour la couleur du texte, vous pouvez ajouter à ces couleurs le préfixe 
+Pour la couleur du texte, vous pouvez ajouter à ces couleurs le préfixe 
 \fIbright\fP (lumineux) pour obtenir une couleur plus lumineuse. Si 
-votre terminal est capable de gérer la transparence, ne pas spécifier de 
-\fIcouleur_fond\fP indique à \fBnano\fP d'essayer d'utiliser un fond 
+votre terminal est capable de gérer la transparence, ne pas spécifier de 
+\fIcouleur_fond\fP indique à \fBnano\fP d'essayer d'utiliser un fond 
 transparent.
 .TP
 .B icolor \fIcouleur_texte\fP[,\fIcouleur_fond\fP] "\fImotif\fP" ...
-Comme ci-dessus, mais la recherche des motifs est effectuée sans tenir 
+Comme ci-dessus, mais la recherche des motifs est effectuée sans tenir 
 compte de la casse.
 .TP
-.B color \fIcouleur_texte\fP[,\fIcouleur_fond\fP] start="\fImotif_début\fP" end="\fImotif_fin\fP"
-Affiche les expressions commençant par l'expression rationnelle étendue 
-\fImotif_début\fP et se terminant par l'expression rationnelle étendue 
+.B color \fIcouleur_texte\fP[,\fIcouleur_fond\fP] start="\fImotif_début\fP" end="\fImotif_fin\fP"
+Affiche les expressions commençant par l'expression rationnelle étendue 
+\fImotif_début\fP et se terminant par l'expression rationnelle étendue 
 \fImotif_fin\fP en utilisant la couleur de texte \fIcouleur_texte\fP 
 et la couleur de fond \fIcouleur_fond\fP, l'une de ces deux couleurs au 
-moins devant être définie. Cela permet à la colorisation syntaxique de 
-s'étendre sur plusieurs lignes. Notez que toutes les occurrences 
-successives de \fImotif_début\fP après le \fImotif_début\fP initial 
-seront surlignées jusqu'à la prochaine instance de \fImotif_fin\fP.
+moins devant être définie. Cela permet à la colorisation syntaxique de 
+s'étendre sur plusieurs lignes. Notez que toutes les occurrences 
+successives de \fImotif_début\fP après le \fImotif_début\fP initial 
+seront surlignées jusqu'à la prochaine instance de \fImotif_fin\fP.
 .TP
-.B icolor \fIcouleur_texte\fP[,\fIcouleur_fond\fP] start="\fImotif_début\fP" end="\fImotif_fin\fP"
-Comme ci-dessus, mais la recherche des motifs est effectuée sans tenir 
+.B icolor \fIcouleur_texte\fP[,\fIcouleur_fond\fP] start="\fImotif_début\fP" end="\fImotif_fin\fP"
+Comme ci-dessus, mais la recherche des motifs est effectuée sans tenir 
 compte de la casse.
 .TP
 .B include "\fIfichier_de_syntaxes\fP"
 Lit le fichier \fIfichier_de_syntaxes\fP contenant une liste 
-autosuffisante de définitions de syntaxes. Ce fichier ne doit contenir 
+autosuffisante de définitions de syntaxes. Ce fichier ne doit contenir 
 que des commandes \fBsyntax\fP, \fBcolor\fP et \fBicolor\fP.
 
 .SH FICHIERS
 .TP
 .I $SYSCONFDIR/nanorc
-Fichier de configuration général
+Fichier de configuration général
 .TP
 .I ~/.nanorc
 Fichier de configuration personnel
@@ -348,29 +348,29 @@ Fichier de configuration personnel
 .TP
 \fBnano\fP(1)
 .PP
-\fI/usr/share/doc/nano/examples/nanorc.sample\fP (ou son équivalent sur 
-votre système)
+\fI/usr/share/doc/nano/examples/nanorc.sample\fP (ou son équivalent sur 
+votre système)
 
 .SH AUTEUR
 Chris Allegretta <chrisa@asty.org> et d'autres (voir les fichiers
 \fIAUTHORS\fP et \fITHANKS\fP pour plus d'information). Cette page de
-manuel a été initialement rédigée par Jordi Mallach <jordi@gnu.org> pour
-le système Debian (mais elle peut être utilisée par d'autres).
+manuel a été initialement rédigée par Jordi Mallach <jordi@gnu.org> pour
+le système Debian (mais elle peut être utilisée par d'autres).
 
 .SH TRADUCTION
-Cette adaptation française a été réalisée par Jean-Philippe\ Guérard
-<jean-philippe.guerard@tigreraye.org> le 29\ novembre\ 2007 à partir de
+Cette adaptation française a été réalisée par Jean-Philippe\ Guérard
+<jean-philippe.guerard@tigreraye.org> le 29\ novembre\ 2007 à partir de
 la version 1.56 du 11\ octobre\ 2007 de la page de manuel de nanorc 
-(pour la version 2.0.0 de nano). Cette page a été relue par Gérard 
+(pour la version 2.0.0 de nano). Cette page a été relue par Gérard 
 Delafond.
 
-Un maximum de soin a été apporté lors de l'élaboration de cette
-traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si
-vous en rencontrez, que ce soit dans la version française ou dans la
-version originale, n'hésitez pas à les signaler à l'auteur ou au
+Un maximum de soin a été apporté lors de l'élaboration de cette
+traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si
+vous en rencontrez, que ce soit dans la version française ou dans la
+version originale, n'hésitez pas à les signaler à l'auteur ou au
 traducteur.
 
-La version originale la plus à jour de ce document est toujours 
+La version originale la plus à jour de ce document est toujours 
 consultable via la commande\ :
 
 LANGUAGE=en man nano
diff --git a/doc/man/fr/nanorc.5.html b/doc/man/fr/nanorc.5.html
index e438be8..092aaef 100644
--- a/doc/man/fr/nanorc.5.html
+++ b/doc/man/fr/nanorc.5.html
@@ -1,5 +1,5 @@
-<!-- Creator     : groff version 1.20.1 -->
-<!-- CreationDate: Tue Aug 10 22:44:00 2010 -->
+<!-- Creator     : groff version 1.22.2 -->
+<!-- CreationDate: Thu Jul 17 11:02:17 2014 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -37,8 +37,8 @@
 
 
 <p style="margin-left:11%; margin-top: 1em">nanorc &minus;
-fichier de configuration de l&rsquo;&eacute;diteur nano du
-projet GNU</p>
+fichier de configuration de l&rsquo;&Atilde;&copy;diteur
+nano du projet GNU</p>
 
 <h2>DESCRIPTION
 <a name="DESCRIPTION"></a>
@@ -46,29 +46,34 @@ projet GNU</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Cette page de
-manuel d&eacute;crit bri&egrave;vement le fichier de
-configuration de l&rsquo;&eacute;diteur <b>nano</b> GNU.</p>
+manuel d&Atilde;&copy;crit bri&Atilde;&uml;vement le fichier
+de configuration de l&rsquo;&Atilde;&copy;diteur <b>nano</b>
+GNU.</p>
 
 <p style="margin-left:11%; margin-top: 1em"><b>nano</b> est
-un petit &eacute;diteur sympathique et libre, qui vise
-&agrave; remplacer Pico, l&rsquo;&eacute;diteur par
-d&eacute;faut du logiciel non libre Pine. <b>nano</b> ne se
-contentant pas de copier l&rsquo;interface et
-l&rsquo;ergonomie de Pico, il offre &eacute;galement
-certaines fonctionnalit&eacute;s manquantes (ou
-d&eacute;sactiv&eacute;es par d&eacute;faut) de Pico. Ces
-fonctionnalit&eacute;s sont, par exemple, les fonctions de
-recherche et de remplacement et la possibilit&eacute; de
-sauter directement &agrave; une ligne et &agrave; une
-colonne pr&eacute;cise.</p>
+un petit &Atilde;&copy;diteur sympathique et libre, qui vise
+&Atilde;&nbsp; remplacer Pico, l&rsquo;&Atilde;&copy;diteur
+par d&Atilde;&copy;faut du logiciel non libre Pine.
+<b>nano</b> ne se contentant pas de copier l&rsquo;interface
+et l&rsquo;ergonomie de Pico, il offre
+&Atilde;&copy;galement certaines
+fonctionnalit&Atilde;&copy;s manquantes (ou
+d&Atilde;&copy;sactiv&Atilde;&copy;es par
+d&Atilde;&copy;faut) de Pico. Ces
+fonctionnalit&Atilde;&copy;s sont, par exemple, les
+fonctions de recherche et de remplacement et la
+possibilit&Atilde;&copy; de sauter directement
+&Atilde;&nbsp; une ligne et &Atilde;&nbsp; une colonne
+pr&Atilde;&copy;cise.</p>
 
 <p style="margin-left:11%; margin-top: 1em">Le fichier
-<i>nanorc</i> contient les param&egrave;tres par
-d&eacute;faut de <b>nano</b>. Il ne doit pas &ecirc;tre au
-format DOS ou Mac. Lors de son d&eacute;marrage, nano
-commencera par lire le fichier de configuration
-g&eacute;n&eacute;ral <i>SYSCONFDIR/nanorc</i>, puis lira le
-fichier de configuration personnel de l&rsquo;utilisateur
+<i>nanorc</i> contient les param&Atilde;&uml;tres par
+d&Atilde;&copy;faut de <b>nano</b>. Il ne doit pas
+&Atilde;&ordf;tre au format DOS ou Mac. Lors de son
+d&Atilde;&copy;marrage, nano commencera par lire le fichier
+de configuration g&Atilde;&copy;n&Atilde;&copy;ral
+<i>SYSCONFDIR/nanorc</i>, puis lira le fichier de
+configuration personnel de l&rsquo;utilisateur
 <i>~/.nanorc</i>.</p>
 
 <h2>OPTIONS
@@ -77,38 +82,44 @@ fichier de configuration personnel de l&rsquo;utilisateur
 
 
 <p style="margin-left:11%; margin-top: 1em">Le fichier de
-configuration accepte une s&eacute;rie de commandes
-<b>set</b> (activer) et <b>unset</b> (d&eacute;sactiver),
-qui permettent de d&eacute;finir le param&eacute;trage de
-nano au d&eacute;marrage sans avoir &agrave; utiliser
+configuration accepte une s&Atilde;&copy;rie de commandes
+<b>set</b> (activer) et <b>unset</b>
+(d&Atilde;&copy;sactiver), qui permettent de
+d&Atilde;&copy;finir le param&Atilde;&copy;trage de nano au
+d&Atilde;&copy;marrage sans avoir &Atilde;&nbsp; utiliser
 d&rsquo;options de ligne de commande. De plus, les mots
 clefs <b>syntax</b> (syntaxe), <b>color</b> (couleur) et
-<b>icolor</b> (couleur insensible &agrave; la casse) sont
-utilis&eacute;s pour d&eacute;finir les r&egrave;gles de
-colorisation pour diff&eacute;rents motifs de texte.
-<b>nano</b> lit une commande par ligne.</p>
+<b>icolor</b> (couleur insensible &Atilde;&nbsp; la casse)
+sont utilis&Atilde;&copy;s pour d&Atilde;&copy;finir les
+r&Atilde;&uml;gles de colorisation pour
+diff&Atilde;&copy;rents motifs de texte. <b>nano</b> lit une
+commande par ligne.</p>
 
 <p style="margin-left:11%; margin-top: 1em">Les options du
-fichier de configuration ont priorit&eacute; sur les valeurs
-par d&eacute;faut utilis&eacute;es par nano. Les options de
-la ligne de commande sont prioritaires par rapport aux
-options du fichier de configuration. Les options sont
-d&eacute;sactiv&eacute;es (unset) par d&eacute;faut, sauf
-les options prenant un argument.</p>
+fichier de configuration ont priorit&Atilde;&copy; sur les
+valeurs par d&Atilde;&copy;faut utilis&Atilde;&copy;es par
+nano. Les options de la ligne de commande sont prioritaires
+par rapport aux options du fichier de configuration. Les
+options sont d&Atilde;&copy;sactiv&Atilde;&copy;es (unset)
+par d&Atilde;&copy;faut, sauf les options prenant un
+argument.</p>
 
 <p style="margin-left:11%; margin-top: 1em">Les apostrophes
-(&laquo;&nbsp;<i>&rsquo;&nbsp;</i>&raquo;) et les guillemets
-droits (&laquo;&nbsp;<i>&quot;&nbsp;</i>&raquo;)
-pr&eacute;sents dans des cha&icirc;nes de caract&egrave;res
-utilis&eacute;es comme param&egrave;tres n&rsquo;ont pas
-besoin d&rsquo;&ecirc;tre pr&eacute;c&eacute;d&eacute;es
-d&rsquo;une barre oblique invers&eacute;e
-(&laquo;&nbsp;<i>\&nbsp;</i>&raquo;). La cha&icirc;ne sera
-termin&eacute;e par le dernier guillemet droit. Par exemple,
-pour l&rsquo;option <b>brackets</b>,
-&quot;<i>&quot;&rsquo;)&gt;]}</i>&quot; correspondra
-&agrave; <i>&quot;</i>, <i>&rsquo;</i>, <i>)</i>,
-<i>&gt;</i>, <i>]</i> et <i>}</i>.</p>
+(&Acirc;&laquo;&nbsp;<i>&rsquo;&nbsp;</i>&Acirc;&raquo;) et
+les guillemets droits
+(&Acirc;&laquo;&nbsp;<i>&quot;&nbsp;</i>&Acirc;&raquo;)
+pr&Atilde;&copy;sents dans des cha&Atilde;&reg;nes de
+caract&Atilde;&uml;res utilis&Atilde;&copy;es comme
+param&Atilde;&uml;tres n&rsquo;ont pas besoin
+d&rsquo;&Atilde;&ordf;tre
+pr&Atilde;&copy;c&Atilde;&copy;d&Atilde;&copy;es d&rsquo;une
+barre oblique invers&Atilde;&copy;e
+(&Acirc;&laquo;&nbsp;<i>\&nbsp;</i>&Acirc;&raquo;). La
+cha&Atilde;&reg;ne sera termin&Atilde;&copy;e par le dernier
+guillemet droit. Par exemple, pour l&rsquo;option
+<b>brackets</b>, &quot;<i>&quot;&rsquo;)&gt;]}</i>&quot;
+correspondra &Atilde;&nbsp; <i>&quot;</i>, <i>&rsquo;</i>,
+<i>)</i>, <i>&gt;</i>, <i>]</i> et <i>}</i>.</p>
 
 <p style="margin-left:11%; margin-top: 1em">Les commandes
 et arguments reconnus sont&nbsp;: <b><br>
@@ -119,42 +130,45 @@ automatique.</p>
 
 <p style="margin-left:11%;"><b>set/unset backup</b></p>
 
-<p style="margin-left:15%;">Cr&eacute;e des copies de
-s&eacute;curit&eacute; nomm&eacute;es
+<p style="margin-left:15%;">Cr&Atilde;&copy;e des copies de
+s&Atilde;&copy;curit&Atilde;&copy; nomm&Atilde;&copy;es
 <i>nom_du_fichier~</i>.</p>
 
 <p style="margin-left:11%;"><b>set backupdir</b>
-<i>r&eacute;pertoire</i></p>
+<i>r&Atilde;&copy;pertoire</i></p>
 
-<p style="margin-left:15%;">D&eacute;finit le
-r&eacute;pertoire utilis&eacute; par <b>nano</b> pour
-enregistrer les copies de s&eacute;curit&eacute; uniques, si
-l&rsquo;enregistrement de copies de s&eacute;curit&eacute;
-est activ&eacute;.</p>
+<p style="margin-left:15%;">D&Atilde;&copy;finit le
+r&Atilde;&copy;pertoire utilis&Atilde;&copy; par <b>nano</b>
+pour enregistrer les copies de
+s&Atilde;&copy;curit&Atilde;&copy; uniques, si
+l&rsquo;enregistrement de copies de
+s&Atilde;&copy;curit&Atilde;&copy; est
+activ&Atilde;&copy;.</p>
 
 <p style="margin-left:11%;"><b>set/unset backwards</b></p>
 
-<p style="margin-left:15%;">Par d&eacute;faut, les
-recherches se font vers l&rsquo;arri&egrave;re.</p>
+<p style="margin-left:15%;">Par d&Atilde;&copy;faut, les
+recherches se font vers l&rsquo;arri&Atilde;&uml;re.</p>
 
 <p style="margin-left:11%;"><b>set/unset boldtext</b></p>
 
-<p style="margin-left:15%;">Utilise des caract&egrave;res
-gras &agrave; la place de la vid&eacute;o inverse.</p>
+<p style="margin-left:15%;">Utilise des
+caract&Atilde;&uml;res gras &Atilde;&nbsp; la place de la
+vid&Atilde;&copy;o inverse.</p>
 
 <p style="margin-left:11%;"><b>set brackets</b>
-<i>cha&icirc;ne</i></p>
+<i>cha&Atilde;&reg;ne</i></p>
 
-<p style="margin-left:15%;">D&eacute;finit les
-caract&egrave;res consid&eacute;r&eacute;s comme des
-crochets fermants lors de la justification des paragraphes.
-Ces caract&egrave;res ne doivent pas contenir
-d&rsquo;espaces. Seules les ponctuations terminales,
-&eacute;ventuellement suivies de crochets fermants, peuvent
-terminer une phrase.</p>
+<p style="margin-left:15%;">D&Atilde;&copy;finit les
+caract&Atilde;&uml;res consid&Atilde;&copy;r&Atilde;&copy;s
+comme des crochets fermants lors de la justification des
+paragraphes. Ces caract&Atilde;&uml;res ne doivent pas
+contenir d&rsquo;espaces. Seules les ponctuations
+terminales, &Atilde;&copy;ventuellement suivies de crochets
+fermants, peuvent terminer une phrase.</p>
 
 <p style="margin-left:15%; margin-top: 1em">La valeur par
-d&eacute;faut de cette option est&nbsp;:
+d&Atilde;&copy;faut de cette option est&nbsp;:
 &quot;<i>&quot;&rsquo;)&gt;]}</i>&quot;.</p>
 
 <p style="margin-left:15%; margin-top: 1em">N.D.T.&nbsp;:
@@ -164,64 +178,70 @@ pour plus d&rsquo;informations.</p>
 <p style="margin-left:11%;"><b>set/unset
 casesensitive</b></p>
 
-<p style="margin-left:15%;">Par d&eacute;faut, les
+<p style="margin-left:15%;">Par d&Atilde;&copy;faut, les
 recherches ne tiennent pas compte de la casse.</p>
 
 <p style="margin-left:11%;"><b>set/unset const</b></p>
 
 <p style="margin-left:15%;">Affiche en permanence la
-position du curseur dans la ligne d&rsquo;&eacute;tat.</p>
+position du curseur dans la ligne
+d&rsquo;&Atilde;&copy;tat.</p>
 
 <p style="margin-left:11%;"><b>set/unset cut</b></p>
 
-<p style="margin-left:15%;">Par d&eacute;faut, coupe le
-texte du curseur &agrave; la fin de la ligne, au lieu de
-couper la ligne enti&egrave;re.</p>
+<p style="margin-left:15%;">Par d&Atilde;&copy;faut, coupe
+le texte du curseur &Atilde;&nbsp; la fin de la ligne, au
+lieu de couper la ligne enti&Atilde;&uml;re.</p>
 
 <p style="margin-left:11%;"><b>set fill</b> <i>n</i></p>
 
-<p style="margin-left:15%;">Passe automatiquement &agrave;
-la ligne une fois arriv&eacute; &agrave; la colonne
-<i>n</i>. Si la valeur indiqu&eacute;e est de 0 ou moins, le
-point de passage &agrave; la ligne aura lieu &agrave; la
-taille de l&rsquo;&eacute;cran moins <i>n</i>. Cela permet
-de faire varier le point de passage &agrave; la ligne
-lorsque l&rsquo;on change la taille de l&rsquo;&eacute;cran.
-La valeur par d&eacute;faut est de &minus;8.</p>
+<p style="margin-left:15%;">Passe automatiquement
+&Atilde;&nbsp; la ligne une fois arriv&Atilde;&copy;
+&Atilde;&nbsp; la colonne <i>n</i>. Si la valeur
+indiqu&Atilde;&copy;e est de 0 ou moins, le point de passage
+&Atilde;&nbsp; la ligne aura lieu &Atilde;&nbsp; la taille
+de l&rsquo;&Atilde;&copy;cran moins <i>n</i>. Cela permet de
+faire varier le point de passage &Atilde;&nbsp; la ligne
+lorsque l&rsquo;on change la taille de
+l&rsquo;&Atilde;&copy;cran. La valeur par
+d&Atilde;&copy;faut est de &minus;8.</p>
 
 <p style="margin-left:11%;"><b>set/unset historylog</b></p>
 
 <p style="margin-left:15%;">Active l&rsquo;utilisation de
 <i>~/.nano_history</i> pour enregistrer et relire les
-cha&icirc;nes ayant fait l&rsquo;objet d&rsquo;une recherche
-ou d&rsquo;un remplacement.</p>
+cha&Atilde;&reg;nes ayant fait l&rsquo;objet d&rsquo;une
+recherche ou d&rsquo;un remplacement.</p>
 
 <p style="margin-left:11%;"><b>set matchbrackets</b>
-<i>cha&icirc;ne</i></p>
+<i>cha&Atilde;&reg;ne</i></p>
 
-<p style="margin-left:15%;">D&eacute;finit les crochets
-ouvrants et fermant pour la recherche de crochets
+<p style="margin-left:15%;">D&Atilde;&copy;finit les
+crochets ouvrants et fermant pour la recherche de crochets
 correspondants. Cette liste ne doit pas contenir de blancs.
-L&rsquo;ensemble des crochets ouvrants doit &ecirc;tre
-indiqu&eacute; en premier, suivi de l&rsquo;ensemble des
-crochets fermant, qui doit &ecirc;tre dans le m&ecirc;me
-ordre. La valeur par d&eacute;faut de cette option est
+L&rsquo;ensemble des crochets ouvrants doit
+&Atilde;&ordf;tre indiqu&Atilde;&copy; en premier, suivi de
+l&rsquo;ensemble des crochets fermant, qui doit
+&Atilde;&ordf;tre dans le m&Atilde;&ordf;me ordre. La valeur
+par d&Atilde;&copy;faut de cette option est
 &quot;<i>(&lt;[{)&gt;]}</i>&quot;.</p>
 
 <p style="margin-left:11%;"><b>set/unset morespace</b></p>
 
 <p style="margin-left:15%;">Utiliser la ligne blanche
-situ&eacute;e sous la ligne de titre comme espace
-suppl&eacute;mentaire d&rsquo;&eacute;dition.</p>
+situ&Atilde;&copy;e sous la ligne de titre comme espace
+suppl&Atilde;&copy;mentaire
+d&rsquo;&Atilde;&copy;dition.</p>
 
 <p style="margin-left:11%;"><b>set/unset mouse</b></p>
 
 <p style="margin-left:15%;">Active l&rsquo;utilisation de
-la souris, si elle est disponible pour votre syst&egrave;me.
-Lorsque celle-ci est activ&eacute;e, il est possible
-d&rsquo;utiliser la souris pour positionner le curseur, pour
-marquer le texte (avec un double-clic) et pour lancer les
-fonctions correspondant aux raccourcis. Il est possible
+la souris, si elle est disponible pour votre
+syst&Atilde;&uml;me. Lorsque celle-ci est
+activ&Atilde;&copy;e, il est possible d&rsquo;utiliser la
+souris pour positionner le curseur, pour marquer le texte
+(avec un double-clic) et pour lancer les fonctions
+correspondant aux raccourcis. Il est possible
 d&rsquo;utiliser la souris sous X&nbsp;Window ou en mode
 console avec gpm.</p>
 
@@ -239,155 +259,168 @@ formats DOS et Mac.</p>
 <p style="margin-left:11%;"><b>set/unset nofollow</b></p>
 
 <p style="margin-left:15%;">Ne suit pas les liens
-symboliques lors de l&rsquo;&eacute;criture des
+symboliques lors de l&rsquo;&Atilde;&copy;criture des
 fichiers.</p>
 
 <p style="margin-left:11%;"><b>set/unset nohelp</b></p>
 
-<p style="margin-left:15%;">D&eacute;sactive les lignes
-d&rsquo;aide affich&eacute;e en bas de
-l&rsquo;&eacute;cran.</p>
+<p style="margin-left:15%;">D&Atilde;&copy;sactive les
+lignes d&rsquo;aide affich&Atilde;&copy;e en bas de
+l&rsquo;&Atilde;&copy;cran.</p>
 
 <p style="margin-left:11%;"><b>set/unset nonewlines</b></p>
 
 <p style="margin-left:15%;">Ne pas ajouter de passage
-&agrave; la ligne &agrave; la fin des fichiers.</p>
+&Atilde;&nbsp; la ligne &Atilde;&nbsp; la fin des
+fichiers.</p>
 
 <p style="margin-left:11%;"><b>set/unset nowrap</b></p>
 
-<p style="margin-left:15%;">D&eacute;sactive le passage
-automatique &agrave; la ligne.</p>
+<p style="margin-left:15%;">D&Atilde;&copy;sactive le
+passage automatique &Atilde;&nbsp; la ligne.</p>
 
 <p style="margin-left:11%;"><b>set operatingdir</b>
-<i>r&eacute;pertoire</i></p>
+<i>r&Atilde;&copy;pertoire</i></p>
 
 <p style="margin-left:15%;"><b>nano</b> ne lira et
-n&rsquo;&eacute;crira des fichiers qu&rsquo;&agrave;
-l&rsquo;int&eacute;rieur du <i>r&eacute;pertoire</i> et de
-ses sous-r&eacute;pertoires. De plus, celui-ci devient le
-r&eacute;pertoire courant, afin que les fichiers soient lus
-depuis ce r&eacute;pertoire. Par d&eacute;faut, cette
-fonction est d&eacute;sactiv&eacute;e.</p>
+n&rsquo;&Atilde;&copy;crira des fichiers
+qu&rsquo;&Atilde;&nbsp; l&rsquo;int&Atilde;&copy;rieur du
+<i>r&Atilde;&copy;pertoire</i> et de ses
+sous-r&Atilde;&copy;pertoires. De plus, celui-ci devient le
+r&Atilde;&copy;pertoire courant, afin que les fichiers
+soient lus depuis ce r&Atilde;&copy;pertoire. Par
+d&Atilde;&copy;faut, cette fonction est
+d&Atilde;&copy;sactiv&Atilde;&copy;e.</p>
 
 <p style="margin-left:11%;"><b>set/unset preserve</b></p>
 
-<p style="margin-left:15%;">Pr&eacute;serve les
-s&eacute;quences XON et XOFF (^Q et ^S).</p>
+<p style="margin-left:15%;">Pr&Atilde;&copy;serve les
+s&Atilde;&copy;quences XON et XOFF (^Q et ^S).</p>
 
 <p style="margin-left:11%;"><b>set punct</b>
-<i>cha&icirc;ne</i></p>
-
-<p style="margin-left:15%;">D&eacute;finit les
-caract&egrave;res interpr&eacute;t&eacute;s comme des
-ponctuations terminales lors de la justification des
-paragraphes. Ces caract&egrave;res ne peuvent inclure de
-blancs. Seules les ponctuations terminales,
-&eacute;ventuellement suivies de crochets fermants, peuvent
-terminer une phrase. La valeur par d&eacute;faut de cette
-option est &quot;<i>!.?</i>&quot;.</p>
+<i>cha&Atilde;&reg;ne</i></p>
+
+<p style="margin-left:15%;">D&Atilde;&copy;finit les
+caract&Atilde;&uml;res interpr&Atilde;&copy;t&Atilde;&copy;s
+comme des ponctuations terminales lors de la justification
+des paragraphes. Ces caract&Atilde;&uml;res ne peuvent
+inclure de blancs. Seules les ponctuations terminales,
+&Atilde;&copy;ventuellement suivies de crochets fermants,
+peuvent terminer une phrase. La valeur par
+d&Atilde;&copy;faut de cette option est
+&quot;<i>!.?</i>&quot;.</p>
 
 <p style="margin-left:15%; margin-top: 1em">N.D.T.&nbsp;:
-ce r&eacute;glage permet, lors de la justification, de
-conserver 2&nbsp;espaces au lieu d&rsquo;une derri&egrave;re
-les ponctuations terminales, ce qui correspond aux normes
-typographiques anglo-saxonnes, mais n&rsquo;a pas lieu
-d&rsquo;&ecirc;tre en fran&ccedil;ais. Pour le
-fran&ccedil;ais, le plus simple est d&rsquo;indiquer, dans
-le fichier nanorc, une cha&icirc;ne vide pour ce
-param&egrave;tre.</p>
+ce r&Atilde;&copy;glage permet, lors de la justification, de
+conserver 2&nbsp;espaces au lieu d&rsquo;une
+derri&Atilde;&uml;re les ponctuations terminales, ce qui
+correspond aux normes typographiques anglo-saxonnes, mais
+n&rsquo;a pas lieu d&rsquo;&Atilde;&ordf;tre en
+fran&Atilde;&sect;ais. Pour le fran&Atilde;&sect;ais, le
+plus simple est d&rsquo;indiquer, dans le fichier nanorc,
+une cha&Atilde;&reg;ne vide pour ce
+param&Atilde;&uml;tre.</p>
 
 <p style="margin-left:11%;"><b>set/unset quickblank</b></p>
 
 <p style="margin-left:15%;">Effacement rapide de la ligne
-d&rsquo;&eacute;tat. Les messages affich&eacute;s par la
-ligne d&rsquo;&eacute;tat dispara&icirc;tront apr&egrave;s
-une frappe clavier au lieu de 25.</p>
+d&rsquo;&Atilde;&copy;tat. Les messages
+affich&Atilde;&copy;s par la ligne d&rsquo;&Atilde;&copy;tat
+dispara&Atilde;&reg;tront apr&Atilde;&uml;s une frappe
+clavier au lieu de 25.</p>
 
 <p style="margin-left:11%;"><b>set quotestr</b>
-<i>cha&icirc;ne</i></p>
+<i>cha&Atilde;&reg;ne</i></p>
 
-<p style="margin-left:15%;">D&eacute;finit le
-pr&eacute;fixe par d&eacute;faut utilis&eacute; pour les
-citations dans les courriers &eacute;lectroniques. Ce
-pr&eacute;fixe est utilis&eacute; pour r&eacute;aliser une
+<p style="margin-left:15%;">D&Atilde;&copy;finit le
+pr&Atilde;&copy;fixe par d&Atilde;&copy;faut
+utilis&Atilde;&copy; pour les citations dans les courriers
+&Atilde;&copy;lectroniques. Ce pr&Atilde;&copy;fixe est
+utilis&Atilde;&copy; pour r&Atilde;&copy;aliser une
 justification correcte de ces citations. Il s&rsquo;agira,
-si votre syst&egrave;me le permet, d&rsquo;une expression
-rationnelle &eacute;tendue. Dans le cas contraire, il
-s&rsquo;agira d&rsquo;une cha&icirc;ne de texte brut. Si
-vous disposez des expressions rationnelles, la valeur par
-d&eacute;faut de cette option sera
-&quot;<i>^([&nbsp;\t]*[#:&gt;\|}])+</i>&quot;, sinon, ce
-sera &quot;&gt;&nbsp;&quot;. Notez que le
-&laquo;&nbsp;\t&nbsp;&raquo; ci-dessus correspond &agrave;
-un caract&egrave;re de tabulation.</p>
+si votre syst&Atilde;&uml;me le permet, d&rsquo;une
+expression rationnelle &Atilde;&copy;tendue. Dans le cas
+contraire, il s&rsquo;agira d&rsquo;une cha&Atilde;&reg;ne
+de texte brut. Si vous disposez des expressions
+rationnelles, la valeur par d&Atilde;&copy;faut de cette
+option sera &quot;<i>^([&nbsp;\t]*[#:&gt;\|}])+</i>&quot;,
+sinon, ce sera &quot;&gt;&nbsp;&quot;. Notez que le
+&Acirc;&laquo;&nbsp;\t&nbsp;&Acirc;&raquo; ci-dessus
+correspond &Atilde;&nbsp; un caract&Atilde;&uml;re de
+tabulation.</p>
 
 <p style="margin-left:11%;"><b>set/unset
 rebinddelete</b></p>
 
-<p style="margin-left:15%;">Interpr&egrave;te
-diff&eacute;remment la touche
-&laquo;&nbsp;Supprimer&nbsp;&raquo;, afin que les touches
-&laquo;&nbsp;Effacement arri&egrave;re&nbsp;&raquo; et
-&laquo;&nbsp;Supprimer&nbsp;&raquo; fonctionnent
-correctement. Vous ne devriez avoir besoin de cette option
-que si, sur votre syst&egrave;me, la touche
-&laquo;&nbsp;Effacement arri&egrave;re&nbsp;&raquo; produit
-l&rsquo;effet de la touche &laquo;&nbsp;
-Supprimer&nbsp;&raquo;.</p>
+<p style="margin-left:15%;">Interpr&Atilde;&uml;te
+diff&Atilde;&copy;remment la touche
+&Acirc;&laquo;&nbsp;Supprimer&nbsp;&Acirc;&raquo;, afin que
+les touches &Acirc;&laquo;&nbsp;Effacement
+arri&Atilde;&uml;re&nbsp;&Acirc;&raquo; et
+&Acirc;&laquo;&nbsp;Supprimer&nbsp;&Acirc;&raquo;
+fonctionnent correctement. Vous ne devriez avoir besoin de
+cette option que si, sur votre syst&Atilde;&uml;me, la
+touche &Acirc;&laquo;&nbsp;Effacement
+arri&Atilde;&uml;re&nbsp;&Acirc;&raquo; produit
+l&rsquo;effet de la touche &Acirc;&laquo;&nbsp;
+Supprimer&nbsp;&Acirc;&raquo;.</p>
 
 <p style="margin-left:11%;"><b>set/unset
 rebindkeypad</b></p>
 
-<p style="margin-left:15%;">Interpr&egrave;te les touches
-du pav&eacute; num&eacute;rique afin qu&rsquo;elles
-fonctionnent toutes correctement. Vous ne devriez utiliser
-cette option que si ce n&rsquo;est pas le cas, car nano ne
-sera plus capable d&rsquo;utiliser la souris correctement
-lorsque cette option sera activ&eacute;e.</p>
+<p style="margin-left:15%;">Interpr&Atilde;&uml;te les
+touches du pav&Atilde;&copy; num&Atilde;&copy;rique afin
+qu&rsquo;elles fonctionnent toutes correctement. Vous ne
+devriez utiliser cette option que si ce n&rsquo;est pas le
+cas, car nano ne sera plus capable d&rsquo;utiliser la
+souris correctement lorsque cette option sera
+activ&Atilde;&copy;e.</p>
 
 <p style="margin-left:11%;"><b>set/unset regexp</b></p>
 
-<p style="margin-left:15%;">Utilise par d&eacute;faut des
-expressions rationnelles &eacute;tendues pour les
+<p style="margin-left:15%;">Utilise par d&Atilde;&copy;faut
+des expressions rationnelles &Atilde;&copy;tendues pour les
 recherches.</p>
 
 <p style="margin-left:11%;"><b>set/unset smarthome</b></p>
 
 <p style="margin-left:15%;">Rend plus malin le
 fonctionnement de la touche
-&laquo;&nbsp;D&eacute;but&nbsp;&raquo;. Lorsque cette touche
-est press&eacute;e &agrave; n&rsquo;importe quel endroit
-except&eacute; au tout d&eacute;but du texte d&rsquo;une
-ligne (i.&nbsp;e. au premier caract&egrave;re non blanc), le
-curseur se positionnera au d&eacute;but du texte de la ligne
-(qu&rsquo;il soit en avant ou en arri&egrave;re). Si le
-curseur est d&eacute;j&agrave; l&agrave;, il se placera au
-vrai d&eacute;but de la ligne.</p>
+&Acirc;&laquo;&nbsp;D&Atilde;&copy;but&nbsp;&Acirc;&raquo;.
+Lorsque cette touche est press&Atilde;&copy;e &Atilde;&nbsp;
+n&rsquo;importe quel endroit except&Atilde;&copy; au tout
+d&Atilde;&copy;but du texte d&rsquo;une ligne (i.&nbsp;e. au
+premier caract&Atilde;&uml;re non blanc), le curseur se
+positionnera au d&Atilde;&copy;but du texte de la ligne
+(qu&rsquo;il soit en avant ou en arri&Atilde;&uml;re). Si le
+curseur est d&Atilde;&copy;j&Atilde;&nbsp; l&Atilde;&nbsp;,
+il se placera au vrai d&Atilde;&copy;but de la ligne.</p>
 
 <p style="margin-left:11%;"><b>set/unset smooth</b></p>
 
-<p style="margin-left:15%;">Active le d&eacute;filement
-ligne-par-ligne du texte.</p>
+<p style="margin-left:15%;">Active le
+d&Atilde;&copy;filement ligne-par-ligne du texte.</p>
 
 <p style="margin-left:11%;"><b>set speller</b>
 <i>programme</i></p>
 
 <p style="margin-left:15%;">Utilise le correcteur
 orthographique <i>programme</i> au lieu du correcteur
-int&eacute;gr&eacute;, qui s&rsquo;appuie sur
+int&Atilde;&copy;gr&Atilde;&copy;, qui s&rsquo;appuie sur
 <i>spell</i>.</p>
 
 <p style="margin-left:11%;"><b>set/unset suspend</b></p>
 
-<p style="margin-left:15%;">Autorise &agrave; suspendre
-<b>nano</b>.</p>
+<p style="margin-left:15%;">Autorise &Atilde;&nbsp;
+suspendre <b>nano</b>.</p>
 
 <p style="margin-left:11%;"><b>set tabsize</b> <i>n</i></p>
 
 <p style="margin-left:15%;">Utilise une taille de
 tabulation de <i>n</i> colonnes. Cette valeur doit
-&ecirc;tre strictement sup&eacute;rieure &agrave; 0. La
-valeur par d&eacute;faut est de&nbsp;8.</p>
+&Atilde;&ordf;tre strictement sup&Atilde;&copy;rieure
+&Atilde;&nbsp; 0. La valeur par d&Atilde;&copy;faut est
+de&nbsp;8.</p>
 
 <p style="margin-left:11%;"><b>set/unset
 tabstospaces</b></p>
@@ -397,10 +430,10 @@ clavier en espaces.</p>
 
 <p style="margin-left:11%;"><b>set/unset tempfile</b></p>
 
-<p style="margin-left:15%;">S&rsquo;il a &eacute;t&eacute;
-modifi&eacute;, le fichier sera sauvegard&eacute;
-automatiquement en quittant, sans demande de
-confirmation.</p>
+<p style="margin-left:15%;">S&rsquo;il a
+&Atilde;&copy;t&Atilde;&copy; modifi&Atilde;&copy;, le
+fichier sera sauvegard&Atilde;&copy; automatiquement en
+quittant, sans demande de confirmation.</p>
 
 <p style="margin-left:11%;"><b>set/unset view</b></p>
 
@@ -408,112 +441,119 @@ confirmation.</p>
 fichiers.</p>
 
 <p style="margin-left:11%;"><b>set whitespace</b>
-<i>cha&icirc;ne</i></p>
+<i>cha&Atilde;&reg;ne</i></p>
 
-<p style="margin-left:15%;">D&eacute;finit les deux
-caract&egrave;res utilis&eacute;s pour afficher les premiers
-caract&egrave;res des tabulations et des espaces. Ces deux
-caract&egrave;res doivent &ecirc;tre mono-colonne.</p>
+<p style="margin-left:15%;">D&Atilde;&copy;finit les deux
+caract&Atilde;&uml;res utilis&Atilde;&copy;s pour afficher
+les premiers caract&Atilde;&uml;res des tabulations et des
+espaces. Ces deux caract&Atilde;&uml;res doivent
+&Atilde;&ordf;tre mono-colonne.</p>
 
 <p style="margin-left:11%;"><b>set/unset wordbounds</b></p>
 
-<p style="margin-left:15%;">D&eacute;tection plus
-pr&eacute;cise des limites de mots, obtenue en
-consid&eacute;rant les caract&egrave;res de ponctuation
-comme faisant partie des mots.</p>
+<p style="margin-left:15%;">D&Atilde;&copy;tection plus
+pr&Atilde;&copy;cise des limites de mots, obtenue en
+consid&Atilde;&copy;rant les caract&Atilde;&uml;res de
+ponctuation comme faisant partie des mots.</p>
 
 <p style="margin-left:11%;"><b>syntax</b>
-<i>cha&icirc;ne</i>
+<i>cha&Atilde;&reg;ne</i>
 <b>[&quot;</b><i>motif_de_fichier</i><b>&quot; ... ]</b></p>
 
-<p style="margin-left:15%;">D&eacute;finit une syntaxe
-nomm&eacute;e <i>cha&icirc;ne</i> qui pourra &ecirc;tre
-activ&eacute; via l&rsquo;option <b>-Y</b> (ou
-<b>--syntax</b>) ou qui sera automatiquement activ&eacute;e
-si le nom du fichier en cours correspond &agrave;
-l&rsquo;expression rationnelle &eacute;tendue
-<i>motif_de_fichier</i>. Toutes les instructions suivantes
-de colorisation <b>color</b> ou <b>icolor</b>
-s&rsquo;appliqueront &agrave; cette syntaxe,
-jusqu&rsquo;&agrave; la d&eacute;finition d&rsquo;une
-nouvelle syntaxe.</p>
+<p style="margin-left:15%;">D&Atilde;&copy;finit une
+syntaxe nomm&Atilde;&copy;e <i>cha&Atilde;&reg;ne</i> qui
+pourra &Atilde;&ordf;tre activ&Atilde;&copy; via
+l&rsquo;option <b>-Y</b> (ou <b>--syntax</b>) ou qui sera
+automatiquement activ&Atilde;&copy;e si le nom du fichier en
+cours correspond &Atilde;&nbsp; l&rsquo;expression
+rationnelle &Atilde;&copy;tendue <i>motif_de_fichier</i>.
+Toutes les instructions suivantes de colorisation
+<b>color</b> ou <b>icolor</b> s&rsquo;appliqueront
+&Atilde;&nbsp; cette syntaxe, jusqu&rsquo;&Atilde;&nbsp; la
+d&Atilde;&copy;finition d&rsquo;une nouvelle syntaxe.</p>
 
 <p style="margin-left:15%; margin-top: 1em">La syntaxe
-nomm&eacute;e <i>none</i> (aucune) est
-r&eacute;serv&eacute;e&nbsp;; si elle est indiqu&eacute;e
-dans la ligne de commande, cela revient &agrave; ne
-d&eacute;finir aucune syntaxe. La syntaxe nomm&eacute;e
-<i>default</i> (par d&eacute;faut) est sp&eacute;ciale, elle
-ne n&eacute;cessite aucun motif de <i>motif_de_fichier</i>,
-et s&rsquo;applique aux fichiers ne correspondant &agrave;
-aucun des <i>motif_de_fichier</i> des autres syntaxes.</p>
+nomm&Atilde;&copy;e <i>none</i> (aucune) est
+r&Atilde;&copy;serv&Atilde;&copy;e&nbsp;; si elle est
+indiqu&Atilde;&copy;e dans la ligne de commande, cela
+revient &Atilde;&nbsp; ne d&Atilde;&copy;finir aucune
+syntaxe. La syntaxe nomm&Atilde;&copy;e <i>default</i> (par
+d&Atilde;&copy;faut) est sp&Atilde;&copy;ciale, elle ne
+n&Atilde;&copy;cessite aucun motif de
+<i>motif_de_fichier</i>, et s&rsquo;applique aux fichiers ne
+correspondant &Atilde;&nbsp; aucun des
+<i>motif_de_fichier</i> des autres syntaxes.</p>
 
 <p style="margin-left:11%;"><b>color</b>
 <i>couleur_texte</i><b>[,</b><i>couleur_fond</i><b>]</b>
 <i>motif</i> <b>...</b></p>
 
 <p style="margin-left:15%;">Pour la syntaxe en cours,
-affiche toutes les expressions correspondant &agrave;
-l&rsquo;expression rationnelle &eacute;tendue <i>motif</i>
-en utilisant la couleur de texte <i>couleur_texte</i> et la
-couleur de fond <i>couleur_fond</i>, l&rsquo;une de ces deux
-couleurs au moins devant &ecirc;tre d&eacute;finie. Les
-couleurs accept&eacute;es par <b>nano</b> pour le texte et
-le fond sont&nbsp;: <i>white</i> (blanc), <i>black</i>
-(noir), <i>red</i> (rouge), <i>blue</i> (bleu), <i>green</i>
-(vert), <i>yellow</i> (jaune), <i>magenta</i>, et
-<i>cyan</i>. Pour la couleur du texte, vous pouvez ajouter
-&agrave; ces couleurs le pr&eacute;fixe <i>bright</i>
-(lumineux) pour obtenir une couleur plus lumineuse. Si votre
-terminal est capable de g&eacute;rer la transparence, ne pas
-sp&eacute;cifier de <i>couleur_fond</i> indique &agrave;
-<b>nano</b> d&rsquo;essayer d&rsquo;utiliser un fond
-transparent.</p>
+affiche toutes les expressions correspondant &Atilde;&nbsp;
+l&rsquo;expression rationnelle &Atilde;&copy;tendue
+<i>motif</i> en utilisant la couleur de texte
+<i>couleur_texte</i> et la couleur de fond
+<i>couleur_fond</i>, l&rsquo;une de ces deux couleurs au
+moins devant &Atilde;&ordf;tre d&Atilde;&copy;finie. Les
+couleurs accept&Atilde;&copy;es par <b>nano</b> pour le
+texte et le fond sont&nbsp;: <i>white</i> (blanc),
+<i>black</i> (noir), <i>red</i> (rouge), <i>blue</i> (bleu),
+<i>green</i> (vert), <i>yellow</i> (jaune), <i>magenta</i>,
+et <i>cyan</i>. Pour la couleur du texte, vous pouvez
+ajouter &Atilde;&nbsp; ces couleurs le pr&Atilde;&copy;fixe
+<i>bright</i> (lumineux) pour obtenir une couleur plus
+lumineuse. Si votre terminal est capable de
+g&Atilde;&copy;rer la transparence, ne pas
+sp&Atilde;&copy;cifier de <i>couleur_fond</i> indique
+&Atilde;&nbsp; <b>nano</b> d&rsquo;essayer d&rsquo;utiliser
+un fond transparent.</p>
 
 <p style="margin-left:11%;"><b>icolor</b>
 <i>couleur_texte</i><b>[,</b><i>couleur_fond</i><b>]</b>
 <i>motif</i> <b>...</b></p>
 
 <p style="margin-left:15%;">Comme ci-dessus, mais la
-recherche des motifs est effectu&eacute;e sans tenir compte
-de la casse.</p>
+recherche des motifs est effectu&Atilde;&copy;e sans tenir
+compte de la casse.</p>
 
 <p style="margin-left:11%;"><b>color</b>
 <i>couleur_texte</i><b>[,</b><i>couleur_fond</i><b>]
-start=&quot;</b><i>motif_d&eacute;but</i><b>&quot;
+start=&quot;</b><i>motif_d&Atilde;&copy;but</i><b>&quot;
 end=&quot;</b><i>motif_fin</i><b>&quot;</b></p>
 
 <p style="margin-left:15%;">Affiche les expressions
-commen&ccedil;ant par l&rsquo;expression rationnelle
-&eacute;tendue <i>motif_d&eacute;but</i> et se terminant par
-l&rsquo;expression rationnelle &eacute;tendue
-<i>motif_fin</i> en utilisant la couleur de texte
-<i>couleur_texte</i> et la couleur de fond
+commen&Atilde;&sect;ant par l&rsquo;expression rationnelle
+&Atilde;&copy;tendue <i>motif_d&Atilde;&copy;but</i> et se
+terminant par l&rsquo;expression rationnelle
+&Atilde;&copy;tendue <i>motif_fin</i> en utilisant la
+couleur de texte <i>couleur_texte</i> et la couleur de fond
 <i>couleur_fond</i>, l&rsquo;une de ces deux couleurs au
-moins devant &ecirc;tre d&eacute;finie. Cela permet &agrave;
-la colorisation syntaxique de s&rsquo;&eacute;tendre sur
-plusieurs lignes. Notez que toutes les occurrences
-successives de <i>motif_d&eacute;but</i> apr&egrave;s le
-<i>motif_d&eacute;but</i> initial seront surlign&eacute;es
-jusqu&rsquo;&agrave; la prochaine instance de
-<i>motif_fin</i>.</p>
+moins devant &Atilde;&ordf;tre d&Atilde;&copy;finie. Cela
+permet &Atilde;&nbsp; la colorisation syntaxique de
+s&rsquo;&Atilde;&copy;tendre sur plusieurs lignes. Notez que
+toutes les occurrences successives de
+<i>motif_d&Atilde;&copy;but</i> apr&Atilde;&uml;s le
+<i>motif_d&Atilde;&copy;but</i> initial seront
+surlign&Atilde;&copy;es jusqu&rsquo;&Atilde;&nbsp; la
+prochaine instance de <i>motif_fin</i>.</p>
 
 <p style="margin-left:11%;"><b>icolor</b>
 <i>couleur_texte</i><b>[,</b><i>couleur_fond</i><b>]
-start=&quot;</b><i>motif_d&eacute;but</i><b>&quot;
+start=&quot;</b><i>motif_d&Atilde;&copy;but</i><b>&quot;
+<br>
 end=&quot;</b><i>motif_fin</i><b>&quot;</b></p>
 
 <p style="margin-left:15%;">Comme ci-dessus, mais la
-recherche des motifs est effectu&eacute;e sans tenir compte
-de la casse.</p>
+recherche des motifs est effectu&Atilde;&copy;e sans tenir
+compte de la casse.</p>
 
 <p style="margin-left:11%;"><b>include</b>
 <i>fichier_de_syntaxes</i></p>
 
 <p style="margin-left:15%;">Lit le fichier
 <i>fichier_de_syntaxes</i> contenant une liste
-autosuffisante de d&eacute;finitions de syntaxes. Ce fichier
-ne doit contenir que des commandes <b>syntax</b>,
+autosuffisante de d&Atilde;&copy;finitions de syntaxes. Ce
+fichier ne doit contenir que des commandes <b>syntax</b>,
 <b>color</b> et <b>icolor</b>.</p>
 
 <h2>FICHIERS
@@ -525,7 +565,7 @@ ne doit contenir que des commandes <b>syntax</b>,
 <p style="margin-left:11%; margin-top: 1em"><i>$SYSCONFDIR/nanorc</i></p>
 
 <p style="margin-left:22%;">Fichier de configuration
-g&eacute;n&eacute;ral</p>
+g&Atilde;&copy;n&Atilde;&copy;ral</p>
 
 <p style="margin-left:11%;"><i>~/.nanorc</i></p>
 
@@ -540,7 +580,7 @@ personnel</p>
 <p style="margin-left:11%; margin-top: 1em"><b>nano</b>(1)
 <i><br>
 /usr/share/doc/nano/examples/nanorc.sample</i> (ou son
-&eacute;quivalent sur votre syst&egrave;me)</p>
+&Atilde;&copy;quivalent sur votre syst&Atilde;&uml;me)</p>
 
 <h2>AUTEUR
 <a name="AUTEUR"></a>
@@ -551,9 +591,10 @@ personnel</p>
 Allegretta &lt;chrisa@asty.org&gt; et d&rsquo;autres (voir
 les fichiers <i>AUTHORS</i> et <i>THANKS</i> pour plus
 d&rsquo;information). Cette page de manuel a
-&eacute;t&eacute; initialement r&eacute;dig&eacute;e par
-Jordi Mallach &lt;jordi@gnu.org&gt; pour le syst&egrave;me
-Debian (mais elle peut &ecirc;tre utilis&eacute;e par
+&Atilde;&copy;t&Atilde;&copy; initialement
+r&Atilde;&copy;dig&Atilde;&copy;e par Jordi Mallach
+&lt;jordi@gnu.org&gt; pour le syst&Atilde;&uml;me Debian
+(mais elle peut &Atilde;&ordf;tre utilis&Atilde;&copy;e par
 d&rsquo;autres).</p>
 
 <h2>TRADUCTION
@@ -562,26 +603,30 @@ d&rsquo;autres).</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Cette
-adaptation fran&ccedil;aise a &eacute;t&eacute;
-r&eacute;alis&eacute;e par Jean-Philippe&nbsp;Gu&eacute;rard
+adaptation fran&Atilde;&sect;aise a
+&Atilde;&copy;t&Atilde;&copy;
+r&Atilde;&copy;alis&Atilde;&copy;e par
+Jean-Philippe&nbsp;Gu&Atilde;&copy;rard
 &lt;jean-philippe.guerard@tigreraye.org&gt; le
-29&nbsp;novembre&nbsp;2007 &agrave; partir de la version
-1.56 du 11&nbsp;octobre&nbsp;2007 de la page de manuel de
-nanorc (pour la version 2.0.0 de nano). Cette page a
-&eacute;t&eacute; relue par G&eacute;rard Delafond.</p>
+29&nbsp;novembre&nbsp;2007 &Atilde;&nbsp; partir de la
+version 1.56 du 11&nbsp;octobre&nbsp;2007 de la page de
+manuel de nanorc (pour la version 2.0.0 de nano). Cette page
+a &Atilde;&copy;t&Atilde;&copy; relue par
+G&Atilde;&copy;rard Delafond.</p>
 
 <p style="margin-left:11%; margin-top: 1em">Un maximum de
-soin a &eacute;t&eacute; apport&eacute; lors de
-l&rsquo;&eacute;laboration de cette traduction&nbsp;;
-n&eacute;anmoins, quelques imperfections peuvent subsister.
-Si vous en rencontrez, que ce soit dans la version
-fran&ccedil;aise ou dans la version originale,
-n&rsquo;h&eacute;sitez pas &agrave; les signaler &agrave;
-l&rsquo;auteur ou au traducteur.</p>
+soin a &Atilde;&copy;t&Atilde;&copy; apport&Atilde;&copy;
+lors de l&rsquo;&Atilde;&copy;laboration de cette
+traduction&nbsp;; n&Atilde;&copy;anmoins, quelques
+imperfections peuvent subsister. Si vous en rencontrez, que
+ce soit dans la version fran&Atilde;&sect;aise ou dans la
+version originale, n&rsquo;h&Atilde;&copy;sitez pas
+&Atilde;&nbsp; les signaler &Atilde;&nbsp; l&rsquo;auteur ou
+au traducteur.</p>
 
 <p style="margin-left:11%; margin-top: 1em">La version
-originale la plus &agrave; jour de ce document est toujours
-consultable via la commande&nbsp;:</p>
+originale la plus &Atilde;&nbsp; jour de ce document est
+toujours consultable via la commande&nbsp;:</p>
 
 <p style="margin-left:11%; margin-top: 1em">LANGUAGE=en man
 nano</p>
diff --git a/doc/man/fr/rnano.1 b/doc/man/fr/rnano.1
index 2f64367..70c06f8 100644
--- a/doc/man/fr/rnano.1
+++ b/doc/man/fr/rnano.1
@@ -3,13 +3,13 @@
 .\" Skeleton based on nano-tiny.1:
 .\" Copyright (C) 2002 Free Software Foundation, Inc.
 .\"
-.\" Le travail d'adaptation française de cette page de manuel a été
-.\" réalisé par Jean-Philippe Guérard, en 2006 et 2007. Ce travail
+.\" Le travail d'adaptation française de cette page de manuel a été
+.\" réalisé par Jean-Philippe Guérard, en 2006 et 2007. Ce travail
 .\" d'adaptation est dans le domaine public. Attention, la page traduite
 .\" reste soumise au droit d'auteur de ses auteurs originaux.
 .\"
 .\" The French translation of this document is a public domain work of
-.\" Jean-Philippe Guérard. This translation work was made in 2006 and
+.\" Jean-Philippe Guérard. This translation work was made in 2006 and
 .\" 2007. The translated man page in itself is still subject to the
 .\" copyright of its original authors.
 .\"
@@ -29,126 +29,126 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.\" Ce document est publié sous une double licence. Vous pouvez
+.\" Ce document est publié sous une double licence. Vous pouvez
 .\" le distribuer et le modifier selon les termes de l'une des deux
-.\" licences ci-dessous :
+.\" licences ci-dessous :
 .\"
-.\" * La Licence publique générale GNU (GNU GPL) version 3 ou, à
-.\"   votre choix, supérieure, telle que publiée par la Free
-.\"   Software Foundation. Vous devriez avoir reçu une copie de la
-.\"   Licence publique générale GNU avec ce programme. Si ce n'est pas
+.\" * La Licence publique générale GNU (GNU GPL) version 3 ou, à
+.\"   votre choix, supérieure, telle que publiée par la Free
+.\"   Software Foundation. Vous devriez avoir reçu une copie de la
+.\"   Licence publique générale GNU avec ce programme. Si ce n'est pas
 .\"   le cas, consultez <http://www.gnu.org/licenses/>.
 .\"
 .\" * La Licence de documentation libre GNU (GNU FDL), version 1.2 ou,
-.\"   à votre choix, supérieure, telle que publiée par la Free
+.\"   à votre choix, supérieure, telle que publiée par la Free
 .\"   Software Foundation, sans section invariante, ni texte de
-.\"   première ou de quatrième de couverture. Vous devriez avoir reçu
+.\"   première ou de quatrième de couverture. Vous devriez avoir reçu
 .\"   une copie de la Licence de documentation libre GNU avec ce
 .\"   programme. Si ce n'est pas le cas, consultez
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.\" $Id: rnano.1 4188 2007-12-08 04:27:44Z dolorous $
+.\" $Id: rnano.1 5071 2014-07-16 17:25:55Z jordi $
 .TH RNANO 1 "version 2.0.0" "29\ novembre\ 20O7"
 .\" Please adjust this date whenever revising the manpage.
-.\" Merci de modifier ces dates à chaque mise à jour de cette page.
+.\" Merci de modifier ces dates à chaque mise à jour de cette page.
 .\"
 .SH NOM
-rnano \- Le mode restreint de NAno un NOuvel éditeur, un clone libre et 
-amélioré de Pico
+rnano \- Le mode restreint de NAno un NOuvel éditeur, un clone libre et 
+amélioré de Pico
 
 .SH SYNOPSIS
 .B rnano
-.I [OPTIONS]\ [[\+LIGNE,COLONNE]\ FICHIER]...
+.I [OPTIONS]\ [[+LIGNE,COLONNE]\ FICHIER]...
 .br
 
 .SH DESCRIPTION
-Cette page de manuel décrit brièvement la commande \fBrnano\fR.
+Cette page de manuel décrit brièvement la commande \fBrnano\fR.
 .PP
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invoke bold face and italics, 
 .\" respectively.
-\fBnano\fR est un éditeur petit, sympathique et libre, qui vise à 
-remplacer Pico, l'éditeur par défaut du logiciel non libre Pine. 
+\fBnano\fR est un éditeur petit, sympathique et libre, qui vise à 
+remplacer Pico, l'éditeur par défaut du logiciel non libre Pine. 
 \fBnano\fR ne se contentant pas de copier l'interface et l'ergonomie de 
-Pico, il offre également certaines fonctions manquantes (ou désactivées 
-par défaut) dans Pico. Ces fonctionnalités sont, par exemple, les 
-fonctions de recherche et de remplacement, et la possibilité de sauter 
-directement à une ligne et à une colonne précise..
+Pico, il offre également certaines fonctions manquantes (ou désactivées 
+par défaut) dans Pico. Ces fonctionnalités sont, par exemple, les 
+fonctions de recherche et de remplacement, et la possibilité de sauter 
+directement à une ligne et à une colonne précise..
 .PP
 \fBrnano\fP est une version de \fBnano\fP fonctionnant en mode 
-restreint, qui ne permet d'éditer que les fichiers indiqués et qui 
-n'autorise pas l'utilisateur à accéder au système de fichier ou à un 
-interpréteur de commandes.
+restreint, qui ne permet d'éditer que les fichiers indiqués et qui 
+n'autorise pas l'utilisateur à accéder au système de fichier ou à un 
+interpréteur de commandes.
 .PP
 En mode restreint, \fBnano\fP refusera\ :
 .IP \[bu] 2
-de lire ou d'écrire dans un fichier n'ayant pas été indiqué dans la 
+de lire ou d'écrire dans un fichier n'ayant pas été indiqué dans la 
 ligne de commande\ ;
 .IP \[bu]
 de lire un fichier nanorc\ ;
 .IP \[bu]
-de permettre de suspendre l'édition\ ;
+de permettre de suspendre l'édition\ ;
 .IP \[bu]
-de permettre d'ajouter en début ou en fin d'un fichier, ou de 
-l'enregistrer sous un nom différent\ ;
+de permettre d'ajouter en début ou en fin d'un fichier, ou de 
+l'enregistrer sous un nom différent\ ;
 .IP \[bu]
-l'utilisation de copies de sécurité ou de la correction orthographique.
+l'utilisation de copies de sécurité ou de la correction orthographique.
 
 .SH OPTIONS
 .TP
-.B \+\fILIGNE\fP,\fICOLONNE\fP
-Démarre avec le curseur positionné à la colonne \fICOLONNE\fP de
-la ligne \fILIGNE\fR (l'un des deux, au moins, devant être spécifié) au
-lieu de démarrer à la colonne\ 1, ligne\ 1.
+.B +\fILIGNE\fP,\fICOLONNE\fP
+Démarre avec le curseur positionné à la colonne \fICOLONNE\fP de
+la ligne \fILIGNE\fR (l'un des deux, au moins, devant être spécifié) au
+lieu de démarrer à la colonne\ 1, ligne\ 1.
 .TP
 .B \-?
-Identique à \fB-h (\-\-help)\fP.
+Identique à \fB\-h (\-\-help)\fP.
 .TP
 .B \-h (\-\-help)
-Affiche un résumé des options de lancement de nano, puis s'arrête.
+Affiche un résumé des options de lancement de nano, puis s'arrête.
 .TP
 .B \-V (\-\-version)
-Affiche la version, puis s'arrête.
+Affiche la version, puis s'arrête.
 .PP
-Reportez-vous à la page de manuel \fBnano\fP(1) si vous souhaitez 
-consulter la documentation complète de \fBnano\fP.
+Reportez-vous à la page de manuel \fBnano\fP(1) si vous souhaitez 
+consulter la documentation complète de \fBnano\fP.
 
 .SH BOGUES
 Merci de nous faire parvenir vos commentaires et de nous signaler les
-bogues, en écrivant, en anglais, à \fBnano@nano-editor.org\fR.
+bogues, en écrivant, en anglais, à \fBnano@nano-editor.org\fR.
 
-La liste de discussion anglophone \fBnano\fR est disponible à l'adresse
+La liste de discussion anglophone \fBnano\fR est disponible à l'adresse
 \fBnano-devel@gnu.org\fR.
 
-Pour vous abonner, envoyez un courrier électronique à
-\fBnano-devel-request@gnu.org\fR, ayant pour objet «\ subscribe\ ».
+Pour vous abonner, envoyez un courrier électronique à
+\fBnano-devel-request@gnu.org\fR, ayant pour objet «\ subscribe\ ».
 
-N'hésitez pas également à envoyez vos commentaires, suggestions et
-corrections relatives à l'adaptation française de cette page de manuel
-ou du logiciel à \fBjean-philippe.guerard@tigreraye.org\fR.
+N'hésitez pas également à envoyez vos commentaires, suggestions et
+corrections relatives à l'adaptation française de cette page de manuel
+ou du logiciel à \fBjean-philippe.guerard@tigreraye.org\fR.
 
 .SH "SITE INTERNET"
 http://www.nano-editor.org/
 
 .SH AUTEUR
 Chris Allegretta <chrisa@asty.org> et d'autres (voir le fichier
-\fIAUTHORS\fR). Cette page de manuel a été initialement rédigée par 
-Thijs Kinkhorst <thijs@kinkhorst.com>, pour le système GNU Debian (mais 
-elle peut être utilisée par d'autres).
+\fIAUTHORS\fR). Cette page de manuel a été initialement rédigée par 
+Thijs Kinkhorst <thijs@kinkhorst.com>, pour le système GNU Debian (mais 
+elle peut être utilisée par d'autres).
 
 .SH TRADUCTION
-Cette adaptation française a été réalisée par Jean-Philippe\ Guérard
-<jean-philippe.guerard@tigreraye.org> le 29\ novembre\ 2007 à partir
+Cette adaptation française a été réalisée par Jean-Philippe\ Guérard
+<jean-philippe.guerard@tigreraye.org> le 29\ novembre\ 2007 à partir
 de la version 1.19 du 6\ novembre\ 2007 de la page de manuel de rnano 
 (pour la version 2.0.0 de nano).
 
-Un maximum de soin a été apporté lors de l'élaboration de cette
-traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si
-vous en rencontrez, que ce soit dans la version française ou dans la
-version originale, n'hésitez pas à les signaler à l'auteur ou au
+Un maximum de soin a été apporté lors de l'élaboration de cette
+traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si
+vous en rencontrez, que ce soit dans la version française ou dans la
+version originale, n'hésitez pas à les signaler à l'auteur ou au
 traducteur.
 
-La version originale la plus à jour de ce document est toujours
+La version originale la plus à jour de ce document est toujours
 consultable via la commande\ :
 
 LANGUAGE=en man nano
diff --git a/doc/man/fr/rnano.1.html b/doc/man/fr/rnano.1.html
index 26c2d1b..58d34fb 100644
--- a/doc/man/fr/rnano.1.html
+++ b/doc/man/fr/rnano.1.html
@@ -1,5 +1,5 @@
-<!-- Creator     : groff version 1.20.1 -->
-<!-- CreationDate: Tue Aug 10 22:44:00 2010 -->
+<!-- Creator     : groff version 1.22.2 -->
+<!-- CreationDate: Thu Jul 17 11:02:17 2014 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -38,8 +38,9 @@
 
 
 <p style="margin-left:11%; margin-top: 1em">rnano &minus;
-Le mode restreint de NAno un NOuvel &eacute;diteur, un clone
-libre et am&eacute;lior&eacute; de Pico</p>
+Le mode restreint de NAno un NOuvel &Atilde;&copy;diteur, un
+clone libre et am&Atilde;&copy;lior&Atilde;&copy; de
+Pico</p>
 
 <h2>SYNOPSIS
 <a name="SYNOPSIS"></a>
@@ -55,29 +56,31 @@ libre et am&eacute;lior&eacute; de Pico</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Cette page de
-manuel d&eacute;crit bri&egrave;vement la commande
-<b>rnano</b>.</p>
+manuel d&Atilde;&copy;crit bri&Atilde;&uml;vement la
+commande <b>rnano</b>.</p>
 
 <p style="margin-left:11%; margin-top: 1em"><b>nano</b> est
-un &eacute;diteur petit, sympathique et libre, qui vise
-&agrave; remplacer Pico, l&rsquo;&eacute;diteur par
-d&eacute;faut du logiciel non libre Pine. <b>nano</b> ne se
-contentant pas de copier l&rsquo;interface et
-l&rsquo;ergonomie de Pico, il offre &eacute;galement
-certaines fonctions manquantes (ou d&eacute;sactiv&eacute;es
-par d&eacute;faut) dans Pico. Ces fonctionnalit&eacute;s
-sont, par exemple, les fonctions de recherche et de
-remplacement, et la possibilit&eacute; de sauter directement
-&agrave; une ligne et &agrave; une colonne
-pr&eacute;cise..</p>
+un &Atilde;&copy;diteur petit, sympathique et libre, qui
+vise &Atilde;&nbsp; remplacer Pico,
+l&rsquo;&Atilde;&copy;diteur par d&Atilde;&copy;faut du
+logiciel non libre Pine. <b>nano</b> ne se contentant pas de
+copier l&rsquo;interface et l&rsquo;ergonomie de Pico, il
+offre &Atilde;&copy;galement certaines fonctions manquantes
+(ou d&Atilde;&copy;sactiv&Atilde;&copy;es par
+d&Atilde;&copy;faut) dans Pico. Ces
+fonctionnalit&Atilde;&copy;s sont, par exemple, les
+fonctions de recherche et de remplacement, et la
+possibilit&Atilde;&copy; de sauter directement
+&Atilde;&nbsp; une ligne et &Atilde;&nbsp; une colonne
+pr&Atilde;&copy;cise..</p>
 
 <p style="margin-left:11%; margin-top: 1em"><b>rnano</b>
 est une version de <b>nano</b> fonctionnant en mode
-restreint, qui ne permet d&rsquo;&eacute;diter que les
-fichiers indiqu&eacute;s et qui n&rsquo;autorise pas
-l&rsquo;utilisateur &agrave; acc&eacute;der au
-syst&egrave;me de fichier ou &agrave; un interpr&eacute;teur
-de commandes.</p>
+restreint, qui ne permet d&rsquo;&Atilde;&copy;diter que les
+fichiers indiqu&Atilde;&copy;s et qui n&rsquo;autorise pas
+l&rsquo;utilisateur &Atilde;&nbsp; acc&Atilde;&copy;der au
+syst&Atilde;&uml;me de fichier ou &Atilde;&nbsp; un
+interpr&Atilde;&copy;teur de commandes.</p>
 
 <p style="margin-left:11%; margin-top: 1em">En mode
 restreint, <b>nano</b> refusera&nbsp;:</p>
@@ -94,9 +97,9 @@ restreint, <b>nano</b> refusera&nbsp;:</p>
 <td width="86%">
 
 
-<p>de lire ou d&rsquo;&eacute;crire dans un fichier
-n&rsquo;ayant pas &eacute;t&eacute; indiqu&eacute; dans la
-ligne de commande&nbsp;;</p></td></tr>
+<p>de lire ou d&rsquo;&Atilde;&copy;crire dans un fichier
+n&rsquo;ayant pas &Atilde;&copy;t&Atilde;&copy;
+indiqu&Atilde;&copy; dans la ligne de commande&nbsp;;</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="1%">
@@ -119,7 +122,7 @@ ligne de commande&nbsp;;</p></td></tr>
 
 
 <p>de permettre de suspendre
-l&rsquo;&eacute;dition&nbsp;;</p> </td></tr>
+l&rsquo;&Atilde;&copy;dition&nbsp;;</p> </td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="1%">
@@ -130,9 +133,9 @@ l&rsquo;&eacute;dition&nbsp;;</p> </td></tr>
 <td width="86%">
 
 
-<p>de permettre d&rsquo;ajouter en d&eacute;but ou en fin
-d&rsquo;un fichier, ou de l&rsquo;enregistrer sous un nom
-diff&eacute;rent&nbsp;;</p> </td></tr>
+<p>de permettre d&rsquo;ajouter en d&Atilde;&copy;but ou en
+fin d&rsquo;un fichier, ou de l&rsquo;enregistrer sous un
+nom diff&Atilde;&copy;rent&nbsp;;</p></td></tr>
 <tr valign="top" align="left">
 <td width="11%"></td>
 <td width="1%">
@@ -143,8 +146,9 @@ diff&eacute;rent&nbsp;;</p> </td></tr>
 <td width="86%">
 
 
-<p>l&rsquo;utilisation de copies de s&eacute;curit&eacute;
-ou de la correction orthographique.</p></td></tr>
+<p>l&rsquo;utilisation de copies de
+s&Atilde;&copy;curit&Atilde;&copy; ou de la correction
+orthographique.</p> </td></tr>
 </table>
 
 <h2>OPTIONS
@@ -155,11 +159,12 @@ ou de la correction orthographique.</p></td></tr>
 
 <p style="margin-left:11%; margin-top: 1em"><b>+</b><i>LIGNE</i><b>,</b><i>COLONNE</i></p>
 
-<p style="margin-left:22%;">D&eacute;marre avec le curseur
-positionn&eacute; &agrave; la colonne <i>COLONNE</i> de la
-ligne <i>LIGNE</i> (l&rsquo;un des deux, au moins, devant
-&ecirc;tre sp&eacute;cifi&eacute;) au lieu de
-d&eacute;marrer &agrave; la colonne&nbsp;1,
+<p style="margin-left:22%;">D&Atilde;&copy;marre avec le
+curseur positionn&Atilde;&copy; &Atilde;&nbsp; la colonne
+<i>COLONNE</i> de la ligne <i>LIGNE</i> (l&rsquo;un des
+deux, au moins, devant &Atilde;&ordf;tre
+sp&Atilde;&copy;cifi&Atilde;&copy;) au lieu de
+d&Atilde;&copy;marrer &Atilde;&nbsp; la colonne&nbsp;1,
 ligne&nbsp;1.</p>
 
 <table width="100%" border="0" rules="none" frame="void"
@@ -171,30 +176,31 @@ ligne&nbsp;1.</p>
 
 <p><b>&minus;?</b></p></td>
 <td width="8%"></td>
-<td width="36%">
+<td width="38%">
 
 
-<p>Identique &agrave; <b>-h (&minus;&minus;help)</b>.</p></td>
-<td width="42%">
+<p>Identique &Atilde;&nbsp; <b>&minus;h
+(&minus;&minus;help)</b>.</p> </td>
+<td width="40%">
 </td></tr>
 </table>
 
 <p style="margin-left:11%;"><b>&minus;h
 (&minus;&minus;help)</b></p>
 
-<p style="margin-left:22%;">Affiche un r&eacute;sum&eacute;
-des options de lancement de nano, puis
-s&rsquo;arr&ecirc;te.</p>
+<p style="margin-left:22%;">Affiche un
+r&Atilde;&copy;sum&Atilde;&copy; des options de lancement de
+nano, puis s&rsquo;arr&Atilde;&ordf;te.</p>
 
 <p style="margin-left:11%;"><b>&minus;V
 (&minus;&minus;version)</b></p>
 
 <p style="margin-left:22%;">Affiche la version, puis
-s&rsquo;arr&ecirc;te.</p>
+s&rsquo;arr&Atilde;&ordf;te.</p>
 
 <p style="margin-left:11%; margin-top: 1em">Reportez-vous
-&agrave; la page de manuel <b>nano</b>(1) si vous souhaitez
-consulter la documentation compl&egrave;te de
+&Atilde;&nbsp; la page de manuel <b>nano</b>(1) si vous
+souhaitez consulter la documentation compl&Atilde;&uml;te de
 <b>nano</b>.</p>
 
 <h2>BOGUES
@@ -204,24 +210,25 @@ consulter la documentation compl&egrave;te de
 
 <p style="margin-left:11%; margin-top: 1em">Merci de nous
 faire parvenir vos commentaires et de nous signaler les
-bogues, en &eacute;crivant, en anglais, &agrave;
+bogues, en &Atilde;&copy;crivant, en anglais, &Atilde;&nbsp;
 <b>nano@nano-editor.org</b>.</p>
 
 <p style="margin-left:11%; margin-top: 1em">La liste de
-discussion anglophone <b>nano</b> est disponible &agrave;
-l&rsquo;adresse <b>nano-devel@gnu.org</b>.</p>
+discussion anglophone <b>nano</b> est disponible
+&Atilde;&nbsp; l&rsquo;adresse
+<b>nano-devel@gnu.org</b>.</p>
 
 <p style="margin-left:11%; margin-top: 1em">Pour vous
-abonner, envoyez un courrier &eacute;lectronique &agrave;
-<b>nano-devel-request@gnu.org</b>, ayant pour objet
-&laquo;&nbsp;subscribe&nbsp;&raquo;.</p>
+abonner, envoyez un courrier &Atilde;&copy;lectronique
+&Atilde;&nbsp; <b>nano-devel-request@gnu.org</b>, ayant pour
+objet &Acirc;&laquo;&nbsp;subscribe&nbsp;&Acirc;&raquo;.</p>
 
 
-<p style="margin-left:11%; margin-top: 1em">N&rsquo;h&eacute;sitez
-pas &eacute;galement &agrave; envoyez vos commentaires,
-suggestions et corrections relatives &agrave;
-l&rsquo;adaptation fran&ccedil;aise de cette page de manuel
-ou du logiciel &agrave;
+<p style="margin-left:11%; margin-top: 1em">N&rsquo;h&Atilde;&copy;sitez
+pas &Atilde;&copy;galement &Atilde;&nbsp; envoyez vos
+commentaires, suggestions et corrections relatives
+&Atilde;&nbsp; l&rsquo;adaptation fran&Atilde;&sect;aise de
+cette page de manuel ou du logiciel &Atilde;&nbsp;
 <b>jean-philippe.guerard@tigreraye.org</b>.</p>
 
 <h2>SITE INTERNET
@@ -240,10 +247,11 @@ ou du logiciel &agrave;
 <p style="margin-left:11%; margin-top: 1em">Chris
 Allegretta &lt;chrisa@asty.org&gt; et d&rsquo;autres (voir
 le fichier <i>AUTHORS</i>). Cette page de manuel a
-&eacute;t&eacute; initialement r&eacute;dig&eacute;e par
-Thijs Kinkhorst &lt;thijs@kinkhorst.com&gt;, pour le
-syst&egrave;me GNU Debian (mais elle peut &ecirc;tre
-utilis&eacute;e par d&rsquo;autres).</p>
+&Atilde;&copy;t&Atilde;&copy; initialement
+r&Atilde;&copy;dig&Atilde;&copy;e par Thijs Kinkhorst
+&lt;thijs@kinkhorst.com&gt;, pour le syst&Atilde;&uml;me GNU
+Debian (mais elle peut &Atilde;&ordf;tre
+utilis&Atilde;&copy;e par d&rsquo;autres).</p>
 
 <h2>TRADUCTION
 <a name="TRADUCTION"></a>
@@ -251,25 +259,28 @@ utilis&eacute;e par d&rsquo;autres).</p>
 
 
 <p style="margin-left:11%; margin-top: 1em">Cette
-adaptation fran&ccedil;aise a &eacute;t&eacute;
-r&eacute;alis&eacute;e par Jean-Philippe&nbsp;Gu&eacute;rard
+adaptation fran&Atilde;&sect;aise a
+&Atilde;&copy;t&Atilde;&copy;
+r&Atilde;&copy;alis&Atilde;&copy;e par
+Jean-Philippe&nbsp;Gu&Atilde;&copy;rard
 &lt;jean-philippe.guerard@tigreraye.org&gt; le
-29&nbsp;novembre&nbsp;2007 &agrave; partir de la version
-1.19 du 6&nbsp;novembre&nbsp;2007 de la page de manuel de
-rnano (pour la version 2.0.0 de nano).</p>
+29&nbsp;novembre&nbsp;2007 &Atilde;&nbsp; partir de la
+version 1.19 du 6&nbsp;novembre&nbsp;2007 de la page de
+manuel de rnano (pour la version 2.0.0 de nano).</p>
 
 <p style="margin-left:11%; margin-top: 1em">Un maximum de
-soin a &eacute;t&eacute; apport&eacute; lors de
-l&rsquo;&eacute;laboration de cette traduction&nbsp;;
-n&eacute;anmoins, quelques imperfections peuvent subsister.
-Si vous en rencontrez, que ce soit dans la version
-fran&ccedil;aise ou dans la version originale,
-n&rsquo;h&eacute;sitez pas &agrave; les signaler &agrave;
-l&rsquo;auteur ou au traducteur.</p>
+soin a &Atilde;&copy;t&Atilde;&copy; apport&Atilde;&copy;
+lors de l&rsquo;&Atilde;&copy;laboration de cette
+traduction&nbsp;; n&Atilde;&copy;anmoins, quelques
+imperfections peuvent subsister. Si vous en rencontrez, que
+ce soit dans la version fran&Atilde;&sect;aise ou dans la
+version originale, n&rsquo;h&Atilde;&copy;sitez pas
+&Atilde;&nbsp; les signaler &Atilde;&nbsp; l&rsquo;auteur ou
+au traducteur.</p>
 
 <p style="margin-left:11%; margin-top: 1em">La version
-originale la plus &agrave; jour de ce document est toujours
-consultable via la commande&nbsp;:</p>
+originale la plus &Atilde;&nbsp; jour de ce document est
+toujours consultable via la commande&nbsp;:</p>
 
 <p style="margin-left:11%; margin-top: 1em">LANGUAGE=en man
 nano</p>
diff --git a/doc/man/nano.1 b/doc/man/nano.1
index 6921431..63ec8ec 100644
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -1,6 +1,8 @@
 .\" Hey, EMACS: -*- nroff -*-
+.\" $Id: nano.1 5135 2015-03-08 15:59:15Z bens $
+.\"
 .\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-.\" 2008, 2009 Free Software Foundation, Inc.
+.\" 2009, 2010, 2013, 2014 Free Software Foundation, Inc.
 .\"
 .\" This document is dual-licensed.  You may distribute and/or modify it
 .\" under the terms of either of the following licenses:
@@ -18,8 +20,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.\" $Id: nano.1 4502 2010-04-14 21:55:39Z astyanax $
-.TH NANO 1 "version 2.2.0" "November 30, 2009"
+.TH NANO 1 "version 2.4.0" "March 2015"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
@@ -28,203 +29,212 @@ nano \- Nano's ANOther editor, an enhanced free Pico clone
 
 .SH SYNOPSIS
 .B nano
-.I [OPTIONS]\ [[\+LINE,COLUMN]\ FILE]...
-.br
+.RI [ options "] [[+" line , column "]\ " file "]..."
 
 .SH DESCRIPTION
-This manual page briefly documents the \fBnano\fP command.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invoke bold face and italics,
-.\" respectively.
 \fBnano\fP is a small, free and friendly editor which aims to replace
-Pico, the default editor included in the non-free Pine package.  Rather
-than just copying Pico's look and feel, \fBnano\fP also implements some
+Pico, the default editor included in the non-free Pine package.  On
+top of copying Pico's look and feel, \fBnano\fP also implements some
 missing (or disabled by default) features in Pico, such as "search and
 replace" and "go to line and column number".
 
 .SH OPTIONS
 .TP
-.B \+\fILINE\fP,\fICOLUMN\fP
-Places cursor at line number \fILINE\fP and column number \fICOLUMN\fP
+.B +\fIline\fP,\fIcolumn\fP
+Places the cursor on line number \fIline\fP and at column number \fIcolumn\fP
 (at least one of which must be specified) on startup, instead of the
-default of line 1, column 1.
+default line 1, column 1.
 .TP
-.B \-?
-Same as \fB-h (\-\-help)\fP.
-.TP
-.B \-A (\-\-smarthome)
+.BR \-A ", " \-\-smarthome
 Make the Home key smarter.  When Home is pressed anywhere but at the
 very beginning of non-whitespace characters on a line, the cursor will
 jump to that beginning (either forwards or backwards).  If the cursor is
 already at that position, it will jump to the true beginning of the
 line.
 .TP
-.B \-B (\-\-backup)
+.BR \-B ", " \-\-backup
 When saving a file, back up the previous version of it to the current
-filename suffixed with a ~.  
+filename suffixed with a tilde (\fB~\fP).
 .TP
-.B \-C \fIdir\fP (\-\-backupdir=\fIdir\fP)
-Set the directory where \fBnano\fP puts unique backup files if file
+.BR \-C\ \fIdirectory\fR ", " \-\-backupdir= \fIdirectory
+Set the directory where \fBnano\fP puts unique backup files, if file
 backups are enabled.
 .TP
-.B \-D (\-\-boldtext)
+.BR \-D ", " \-\-boldtext
 Use bold text instead of reverse video text.
 .TP
-.B \-E (\-\-tabstospaces)
+.BR \-E ", " \-\-tabstospaces
 Convert typed tabs to spaces.
 .TP
-.B \-F (\-\-multibuffer)
-Enable multiple file buffers, if available.
+.BR \-F ", " \-\-multibuffer
+Enable multiple file buffers (if support for them has been compiled in).
+.TP
+.BR \-G ", " \-\-locking
+Enable vim-style file locking when editing files.
 .TP
-.B \-H (\-\-historylog)
-Log search and replace strings to \fI~/.nano_history\fP, so they can be
-retrieved in later sessions, if \fInanorc\fP support is available.
+.BR \-H ", " \-\-historylog
+Log search and replace strings to \fI~/.nano/search_history\fP, so they can be
+retrieved in later sessions.
 .TP
-.B \-I (\-\-ignorercfiles)
-Don't look at \fISYSCONFDIR/nanorc\fP or \fI~/.nanorc\fP, if
-\fInanorc\fP support is available.
+.BR \-I ", " \-\-ignorercfiles
+Don't look at the system's \fBnanorc\fP nor at \fB~/.nanorc\fP.
 .TP
-.B \-K (\-\-rebindkeypad)
+.BR \-K ", " \-\-rebindkeypad
 Interpret the numeric keypad keys so that they all work properly.  You
 should only need to use this option if they don't, as mouse support
 won't work properly with this option enabled.
 .TP
-.B \-L (\-\-nonewlines)
+.BR \-L ", " \-\-nonewlines
 Don't add newlines to the ends of files.
 .TP
-.B \-N (\-\-noconvert)
+.BR \-N ", " \-\-noconvert
 Disable automatic conversion of files from DOS/Mac format.
 .TP
-.B \-O (\-\-morespace)
+.BR \-O ", " \-\-morespace
 Use the blank line below the titlebar as extra editing space.
 .TP
-.B \-Q \fIstr\fP (\-\-quotestr=\fIstr\fP)
+.BR \-P ", " \-\-poslog
+Log and later read back the location of the cursor and place it there
+again.
+.TP
+.BR "\-Q ""\fIcharacters\fB""" ", " "\-\-quotestr=""" \fIcharacters\fR """
 Set the quoting string for justifying.  The default is
-"\fI^([\ \\t]*[#:>\\|}])+\fP" if extended regular expression support is
-available, or "\fI>\ \fP" otherwise.  Note that \fI\\t\fP stands for a
+\fB"^([\ \\t]*[#:>\\|}])+"\fP if extended regular expression support is
+available, or \fB">\ "\fP otherwise.  Note that \fB\\t\fP stands for a
 Tab.
 .TP
-.B \-R (\-\-restricted)
+.BR \-R ", " \-\-restricted
 Restricted mode: don't read or write to any file not specified on the
-command line; read any \fInanorc\fP files; allow suspending; allow a
-file to be appended to, prepended to, or saved under a different name if
-it already has one; or use backup files or spell checking.  Also
-accessible by invoking \fBnano\fP with any name beginning with 'r' (e.g.
-"rnano").
-.TP
-.B \-S (\-\-smooth)
+command line; don't read any \fInanorc\fP files nor history files;
+don't allow suspending nor spell checking;
+don't allow a file to be appended to, prepended to, or saved under a
+different name if it already has one; and don't use backup files.
+This restricted mode is also accessible by invoking \fBnano\fP
+with any name beginning with 'r' (e.g. "rnano").
+.TP
+.BR \-S ", " \-\-smooth
 Enable smooth scrolling.  Text will scroll line-by-line, instead of the
 usual chunk-by-chunk behavior.
 .TP
-.B \-T \fIcols\fP (\-\-tabsize=\fIcols\fP)
-Set the size (width) of a tab to \fIcols\fP columns.  The value of
-\fIcols\fP must be greater than 0.  The default value is 8.
+.BR \-T\ \fInumber\fR ", " \-\-tabsize= \fInumber
+Set the size (width) of a tab to \fInumber\fP columns.  The value of
+\fInumber\fP must be greater than 0.  The default value is 8.
 .TP
-.B \-U (\-\-quickblank)
+.BR \-U ", " \-\-quickblank
 Do quick statusbar blanking.  Statusbar messages will disappear after 1
-keystroke instead of 25.  Note that \fB-c\fP overrides this.
+keystroke instead of 25.  Note that \fB\-c\fP overrides this.
 .TP
-.B \-V (\-\-version)
+.BR \-V ", " \-\-version
 Show the current version number and exit.
 .TP
-.B \-W (\-\-wordbounds)
+.BR \-W ", " \-\-wordbounds
 Detect word boundaries more accurately by treating punctuation
 characters as part of a word.
 .TP
-.B \-Y \fIstr\fP (\-\-syntax=\fIstr\fP)
-Specify a specific syntax highlighting from the \fInanorc\fP to use, if
-available.
+.BR \-Y\ \fIname\fR ", " \-\-syntax= \fIname
+Specify the name of the syntax highlighting to use from among the ones
+defined in the \fInanorc\fP files.
 .TP
-.B \-c (\-\-const)
-Constantly show the cursor position.  Note that this overrides \fB-U\fP.
+.BR \-c ", " \-\-const
+Constantly show the cursor position.  Note that this overrides \fB\-U\fP.
 .TP
-.B \-d (\-\-rebinddelete)
+.BR \-d ", " \-\-rebinddelete
 Interpret the Delete key differently so that both Backspace and Delete
 work properly.  You should only need to use this option if Backspace
 acts like Delete on your system.
 .TP
-.B \-h (\-\-help)
-Show a summary of command line options and exit.
+.BR \-h ", " \-\-help
+Show a summary of the available command-line options and exit.
 .TP
-.B \-i (\-\-autoindent)
+.BR \-i ", " \-\-autoindent
 Indent new lines to the previous line's indentation.  Useful when
 editing source code.
 .TP
-.B \-k (\-\-cut)
-Enable cut from cursor to end of line.
+.BR \-k ", " \-\-cut
+Make the 'Cut Text' command (normally ^K) cut from the current cursor
+position to the end of the line, instead of cutting the entire line.
 .TP
-.B \-l (\-\-nofollow)
+.BR \-l ", " \-\-nofollow
 If the file being edited is a symbolic link, replace the link with
 a new file instead of following it.  Good for editing files in
 \fI/tmp\fP, perhaps?
 .TP
-.B \-m (\-\-mouse)
+.BR \-m ", " \-\-mouse
 Enable mouse support, if available for your system.  When enabled, mouse
 clicks can be used to place the cursor, set the mark (with a double
 click), and execute shortcuts.  The mouse will work in the X Window
-System, and on the console when gpm is running.
+System, and on the console when gpm is running.  Text can still be
+selected through dragging by holding down the Shift key.
 .TP
-.B \-o \fIdir\fP (\-\-operatingdir=\fIdir\fP)
-Set operating directory.  Makes \fBnano\fP set up something similar to a
-chroot.
+.BR \-n ", " \-\-noread
+Treat any name given on the command line as a new file.  This allows
+\fBnano\fR to write to named pipes: it will start with a blank buffer,
+and will write to the pipe when the user saves the "file".  This way
+\fBnano\fR can be used as an editor in combination with for instance
+\fBgpg\fR without having to write sensitive data to disk first.
 .TP
-.B \-p (\-\-preserve)
+.BR \-o\ \fIdirectory\fR ", " \-\-operatingdir= \fIdirectory
+Set the operating directory.  This makes \fBnano\fP set up something
+similar to a chroot.
+.TP
+.BR \-p ", " \-\-preserve
 Preserve the XON and XOFF sequences (^Q and ^S) so they will be caught
 by the terminal.
 .TP
-.B \-q (\-\-quiet)
-Do not report errors in the \fInanorc\fP file and ask them to be
+.BR \-q ", " \-\-quiet
+Do not report errors in the \fInanorc\fP files nor ask them to be
 acknowledged by pressing Enter at startup.
 .TP
-.B \-r \fIcols\fP (\-\-fill=\fIcols\fP)
-Wrap lines at column \fIcols\fP.  If this value is 0 or less, wrapping
-will occur at the width of the screen less \fIcols\fP columns, allowing
+.BR \-r\ \fInumber\fR ", " \-\-fill= \fInumber
+Hard-wrap lines at column \fInumber\fP.  If this value is 0 or less, wrapping
+will occur at the width of the screen less \fInumber\fP columns, allowing
 the wrap point to vary along with the width of the screen if the screen
-is resized.  The default value is \-8.
+is resized.  The default value is \-8.  This option conflicts with
+.B \-w
+-- the last one given takes effect.
 .TP
-.B \-s \fIprog\fP (\-\-speller=\fIprog\fP)
-Enable alternative spell checker command.
+.BR \-s\ \fIprogram\fR ", " \-\-speller= \fIprogram
+Use this alternative spell checker command.
 .TP
-.B \-t (\-\-tempfile)
-Always save changed buffer without prompting.  Same as Pico's \fB-t\fP
+.BR \-t ", " \-\-tempfile
+Always save a changed buffer without prompting.  Same as Pico's \fB\-t\fP
 option.
 .TP
-.B \-u (\-\-undo)
-Enable experimental generic-purpose undo code.  By default, the undo and redo
-shortcuts are Meta-U and Meta-E, respectively.
-.TP
-.B \-v (\-\-view)
-View file (read only) mode.
+.BR \-v ", " \-\-view
+View-file (read-only) mode.
 .TP
-.B \-w (\-\-nowrap)
-Disable wrapping of long lines.
+.BR \-w ", " \-\-nowrap
+Disable the hard-wrapping of long lines.  This option conflicts with
+.B \-r
+-- the last one given takes effect.
 .TP
-.B \-x (\-\-nohelp)
-Disable help screen at bottom of editor.
+.BR \-x ", " \-\-nohelp
+Don't show the two help lines at the bottom of the screen.
 .TP
-.B \-z (\-\-suspend)
-Enable suspend ability.
+.BR \-z ", " \-\-suspend
+Enable the suspend ability.
 .TP
-.B \-$ (\-\-softwrap)
-Enable 'soft wrapping'.  \fBnano\fP will attempt to display the entire
-contents of a line, even if it is longer than the screen width.  Since
+.BR \-$ ", " \-\-softwrap
+Enable 'soft wrapping'.  This will make \fBnano\fP attempt to display the
+entire contents of any line, even if it is longer than the screen width, by
+continuing it over multiple screen lines.  Since
 \&'$' normally refers to a variable in the Unix shell, you should specify
-this option last when using other options (e.g. 'nano \-wS$') or pass it
-separately (e.g. 'nano \-wS \-$').
+this option last when using other options (e.g.\& 'nano \-wS$') or pass it
+separately (e.g.\& 'nano \-wS \-$').
 .TP
-.B \-a, \-b, \-e, \-f, \-g, \-j
+.BR \-a ", " \-b ", " \-e ", " \-f ", " \-g ", " \-j
 Ignored, for compatibility with Pico.
 
 .SH INITIALIZATION FILE
 \fBnano\fP will read initialization files in the following order:
-\fISYSCONFDIR/nanorc\fP, then \fI~/.nanorc\fP.  Please see
-\fBnanorc(5)\fP and the example file \fBnanorc.sample\fP, both of which
-should be provided with \fBnano\fP.
+the system's \fBnanorc\fP (if it exists), and then the user's
+\fB~/.nanorc\fP (if it exists).  Please see
+.BR nanorc (5)
+for more information on the possible contents of those files.
 
 .SH NOTES
 If no alternative spell checker command is specified on the command
-line or in one of the \fInanorc\fP files, \fBnano\fP will check the
+line nor in one of the \fInanorc\fP files, \fBnano\fP will check the
 \fBSPELL\fP environment variable for one.
 
 In some cases \fBnano\fP will try to dump the buffer into an emergency
@@ -233,7 +243,7 @@ SIGTERM or runs out of memory.  It will write the buffer into a file
 named \fInano.save\fP if the buffer didn't have a name already, or will
 add a ".save" suffix to the current filename.  If an emergency file with
 that name already exists in the current directory, it will add ".save"
-plus a number (e.g. ".save.1") to the current filename in order to make
+plus a number (e.g.\& ".save.1") to the current filename in order to make
 it unique.  In multibuffer mode, \fBnano\fP will write all the open
 buffers to their respective emergency files.
 
@@ -256,7 +266,7 @@ http://www.nano-editor.org/
 \fI/usr/share/doc/nano/\fP (or equivalent on your system)
 
 .SH AUTHOR
-Chris Allegretta <chrisa@asty.org>, et al (see \fIAUTHORS\fP and
+Chris Allegretta <chrisa@asty.org>, et al (see the files \fIAUTHORS\fP and
 \fITHANKS\fP for details).  This manual page was originally written by
 Jordi Mallach <jordi@gnu.org>, for the Debian system (but may be used by
 others).
diff --git a/doc/man/nano.1.html b/doc/man/nano.1.html
index cb1101e..bd7b43f 100644
--- a/doc/man/nano.1.html
+++ b/doc/man/nano.1.html
@@ -1,5 +1,5 @@
-<!-- Creator     : groff version 1.20.1 -->
-<!-- CreationDate: Tue Aug 10 22:44:00 2010 -->
+<!-- Creator     : groff version 1.22.2 -->
+<!-- CreationDate: Sun Mar 22 23:46:10 2015 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -48,22 +48,20 @@ Nano&rsquo;s ANOther editor, an enhanced free Pico clone</p>
 
 
 <p style="margin-left:11%; margin-top: 1em"><b>nano</b>
-<i>[OPTIONS]&nbsp;[[+LINE,COLUMN]&nbsp;FILE]...</i></p>
+[<i>options</i>]
+[[+<i>line</i>,<i>column</i>]&nbsp;<i>file</i>]...</p>
 
 <h2>DESCRIPTION
 <a name="DESCRIPTION"></a>
 </h2>
 
 
-<p style="margin-left:11%; margin-top: 1em">This manual
-page briefly documents the <b>nano</b> command.</p>
-
 <p style="margin-left:11%; margin-top: 1em"><b>nano</b> is
 a small, free and friendly editor which aims to replace
 Pico, the default editor included in the non-free Pine
-package. Rather than just copying Pico&rsquo;s look and
-feel, <b>nano</b> also implements some missing (or disabled
-by default) features in Pico, such as &quot;search and
+package. On top of copying Pico&rsquo;s look and feel,
+<b>nano</b> also implements some missing (or disabled by
+default) features in Pico, such as &quot;search and
 replace&quot; and &quot;go to line and column
 number&quot;.</p>
 
@@ -73,32 +71,15 @@ number&quot;.</p>
 
 
 
-<p style="margin-left:11%; margin-top: 1em"><b>+</b><i>LINE</i><b>,</b><i>COLUMN</i></p>
-
-<p style="margin-left:22%;">Places cursor at line number
-<i>LINE</i> and column number <i>COLUMN</i> (at least one of
-which must be specified) on startup, instead of the default
-of line 1, column 1.</p>
-
-<table width="100%" border="0" rules="none" frame="void"
-       cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-<p><b>&minus;?</b></p></td>
-<td width="8%"></td>
-<td width="30%">
+<p style="margin-left:11%; margin-top: 1em"><b>+</b><i>line</i><b>,</b><i>column</i></p>
 
+<p style="margin-left:22%;">Places the cursor on line
+number <i>line</i> and at column number <i>column</i> (at
+least one of which must be specified) on startup, instead of
+the default line 1, column 1.</p>
 
-<p>Same as <b>-h (&minus;&minus;help)</b>.</p></td>
-<td width="48%">
-</td></tr>
-</table>
-
-<p style="margin-left:11%;"><b>&minus;A
-(&minus;&minus;smarthome)</b></p>
+<p style="margin-left:11%;"><b>&minus;A</b>,
+<b>&minus;&minus;smarthome</b></p>
 
 <p style="margin-left:22%;">Make the Home key smarter. When
 Home is pressed anywhere but at the very beginning of
@@ -107,277 +88,309 @@ that beginning (either forwards or backwards). If the cursor
 is already at that position, it will jump to the true
 beginning of the line.</p>
 
-<p style="margin-left:11%;"><b>&minus;B
-(&minus;&minus;backup)</b></p>
+<p style="margin-left:11%;"><b>&minus;B</b>,
+<b>&minus;&minus;backup</b></p>
 
 <p style="margin-left:22%;">When saving a file, back up the
 previous version of it to the current filename suffixed with
-a ~.</p>
+a tilde (<b>~</b>).</p>
+
 
-<p style="margin-left:11%;"><b>&minus;C</b> <i>dir</i>
-<b>(&minus;&minus;backupdir=</b><i>dir</i><b>)</b></p>
+<p style="margin-left:11%;"><b>&minus;C&nbsp;</b><i>directory</i>,
+<b>&minus;&minus;backupdir=</b><i>directory</i></p>
 
 <p style="margin-left:22%;">Set the directory where
-<b>nano</b> puts unique backup files if file backups are
+<b>nano</b> puts unique backup files, if file backups are
 enabled.</p>
 
-<p style="margin-left:11%;"><b>&minus;D
-(&minus;&minus;boldtext)</b></p>
+<p style="margin-left:11%;"><b>&minus;D</b>,
+<b>&minus;&minus;boldtext</b></p>
 
 <p style="margin-left:22%;">Use bold text instead of
 reverse video text.</p>
 
-<p style="margin-left:11%;"><b>&minus;E
-(&minus;&minus;tabstospaces)</b></p>
+<p style="margin-left:11%;"><b>&minus;E</b>,
+<b>&minus;&minus;tabstospaces</b></p>
 
 <p style="margin-left:22%;">Convert typed tabs to
 spaces.</p>
 
-<p style="margin-left:11%;"><b>&minus;F
-(&minus;&minus;multibuffer)</b></p>
+<p style="margin-left:11%;"><b>&minus;F</b>,
+<b>&minus;&minus;multibuffer</b></p>
+
+<p style="margin-left:22%;">Enable multiple file buffers
+(if support for them has been compiled in).</p>
 
-<p style="margin-left:22%;">Enable multiple file buffers,
-if available.</p>
+<p style="margin-left:11%;"><b>&minus;G</b>,
+<b>&minus;&minus;locking</b></p>
 
-<p style="margin-left:11%;"><b>&minus;H
-(&minus;&minus;historylog)</b></p>
+<p style="margin-left:22%;">Enable vim-style file locking
+when editing files.</p>
+
+<p style="margin-left:11%;"><b>&minus;H</b>,
+<b>&minus;&minus;historylog</b></p>
 
 <p style="margin-left:22%;">Log search and replace strings
-to <i>~/.nano_history</i>, so they can be retrieved in later
-sessions, if <i>nanorc</i> support is available.</p>
+to <i>~/.nano/search_history</i>, so they can be retrieved
+in later sessions.</p>
 
-<p style="margin-left:11%;"><b>&minus;I
-(&minus;&minus;ignorercfiles)</b></p>
+<p style="margin-left:11%;"><b>&minus;I</b>,
+<b>&minus;&minus;ignorercfiles</b></p>
 
-<p style="margin-left:22%;">Don&rsquo;t look at
-<i>SYSCONFDIR/nanorc</i> or <i>~/.nanorc</i>, if
-<i>nanorc</i> support is available.</p>
+<p style="margin-left:22%;">Don&rsquo;t look at the
+system&rsquo;s <b>nanorc</b> nor at <b>~/.nanorc</b>.</p>
 
-<p style="margin-left:11%;"><b>&minus;K
-(&minus;&minus;rebindkeypad)</b></p>
+<p style="margin-left:11%;"><b>&minus;K</b>,
+<b>&minus;&minus;rebindkeypad</b></p>
 
 <p style="margin-left:22%;">Interpret the numeric keypad
 keys so that they all work properly. You should only need to
 use this option if they don&rsquo;t, as mouse support
 won&rsquo;t work properly with this option enabled.</p>
 
-<p style="margin-left:11%;"><b>&minus;L
-(&minus;&minus;nonewlines)</b></p>
+<p style="margin-left:11%;"><b>&minus;L</b>,
+<b>&minus;&minus;nonewlines</b></p>
 
 <p style="margin-left:22%;">Don&rsquo;t add newlines to the
 ends of files.</p>
 
-<p style="margin-left:11%;"><b>&minus;N
-(&minus;&minus;noconvert)</b></p>
+<p style="margin-left:11%;"><b>&minus;N</b>,
+<b>&minus;&minus;noconvert</b></p>
 
 <p style="margin-left:22%;">Disable automatic conversion of
 files from DOS/Mac format.</p>
 
-<p style="margin-left:11%;"><b>&minus;O
-(&minus;&minus;morespace)</b></p>
+<p style="margin-left:11%;"><b>&minus;O</b>,
+<b>&minus;&minus;morespace</b></p>
 
 <p style="margin-left:22%;">Use the blank line below the
 titlebar as extra editing space.</p>
 
-<p style="margin-left:11%;"><b>&minus;Q</b> <i>str</i>
-<b>(&minus;&minus;quotestr=</b><i>str</i><b>)</b></p>
+<p style="margin-left:11%;"><b>&minus;P</b>,
+<b>&minus;&minus;poslog</b></p>
+
+<p style="margin-left:22%;">Log and later read back the
+location of the cursor and place it there again.</p>
+
+<p style="margin-left:11%;"><b>&minus;Q
+&quot;</b><i>characters</i><b>&quot;</b>,
+<b>&minus;&minus;quotestr=&quot;</b><i>characters</i><b>&quot;</b></p>
 
 <p style="margin-left:22%;">Set the quoting string for
 justifying. The default is
-&quot;<i>^([&nbsp;\t]*[#:&gt;\|}])+</i>&quot; if extended
+<b>&quot;^([&nbsp;\t]*[#:&gt;\|}])+&quot;</b> if extended
 regular expression support is available, or
-&quot;<i>&gt;&nbsp;</i>&quot; otherwise. Note that <i>\t</i>
+<b>&quot;&gt;&nbsp;&quot;</b> otherwise. Note that <b>\t</b>
 stands for a Tab.</p>
 
-<p style="margin-left:11%;"><b>&minus;R
-(&minus;&minus;restricted)</b></p>
+<p style="margin-left:11%;"><b>&minus;R</b>,
+<b>&minus;&minus;restricted</b></p>
 
 <p style="margin-left:22%;">Restricted mode: don&rsquo;t
 read or write to any file not specified on the command line;
-read any <i>nanorc</i> files; allow suspending; allow a file
-to be appended to, prepended to, or saved under a different
-name if it already has one; or use backup files or spell
-checking. Also accessible by invoking <b>nano</b> with any
-name beginning with &rsquo;r&rsquo; (e.g.
-&quot;rnano&quot;).</p>
+don&rsquo;t read any <i>nanorc</i> files nor history files;
+don&rsquo;t allow suspending nor spell checking; don&rsquo;t
+allow a file to be appended to, prepended to, or saved under
+a different name if it already has one; and don&rsquo;t use
+backup files. This restricted mode is also accessible by
+invoking <b>nano</b> with any name beginning with
+&rsquo;r&rsquo; (e.g. &quot;rnano&quot;).</p>
 
-<p style="margin-left:11%;"><b>&minus;S
-(&minus;&minus;smooth)</b></p>
+<p style="margin-left:11%;"><b>&minus;S</b>,
+<b>&minus;&minus;smooth</b></p>
 
 <p style="margin-left:22%;">Enable smooth scrolling. Text
 will scroll line-by-line, instead of the usual
 chunk-by-chunk behavior.</p>
 
-<p style="margin-left:11%;"><b>&minus;T</b> <i>cols</i>
-<b>(&minus;&minus;tabsize=</b><i>cols</i><b>)</b></p>
+
+<p style="margin-left:11%;"><b>&minus;T&nbsp;</b><i>number</i>,
+<b>&minus;&minus;tabsize=</b><i>number</i></p>
 
 <p style="margin-left:22%;">Set the size (width) of a tab
-to <i>cols</i> columns. The value of <i>cols</i> must be
+to <i>number</i> columns. The value of <i>number</i> must be
 greater than 0. The default value is 8.</p>
 
-<p style="margin-left:11%;"><b>&minus;U
-(&minus;&minus;quickblank)</b></p>
+<p style="margin-left:11%;"><b>&minus;U</b>,
+<b>&minus;&minus;quickblank</b></p>
 
 <p style="margin-left:22%;">Do quick statusbar blanking.
 Statusbar messages will disappear after 1 keystroke instead
-of 25. Note that <b>-c</b> overrides this.</p>
+of 25. Note that <b>&minus;c</b> overrides this.</p>
 
-<p style="margin-left:11%;"><b>&minus;V
-(&minus;&minus;version)</b></p>
+<p style="margin-left:11%;"><b>&minus;V</b>,
+<b>&minus;&minus;version</b></p>
 
 <p style="margin-left:22%;">Show the current version number
 and exit.</p>
 
-<p style="margin-left:11%;"><b>&minus;W
-(&minus;&minus;wordbounds)</b></p>
+<p style="margin-left:11%;"><b>&minus;W</b>,
+<b>&minus;&minus;wordbounds</b></p>
 
 <p style="margin-left:22%;">Detect word boundaries more
 accurately by treating punctuation characters as part of a
 word.</p>
 
-<p style="margin-left:11%;"><b>&minus;Y</b> <i>str</i>
-<b>(&minus;&minus;syntax=</b><i>str</i><b>)</b></p>
 
-<p style="margin-left:22%;">Specify a specific syntax
-highlighting from the <i>nanorc</i> to use, if
-available.</p>
+<p style="margin-left:11%;"><b>&minus;Y&nbsp;</b><i>name</i>,
+<b>&minus;&minus;syntax=</b><i>name</i></p>
+
+<p style="margin-left:22%;">Specify the name of the syntax
+highlighting to use from among the ones defined in the
+<i>nanorc</i> files.</p>
 
-<p style="margin-left:11%;"><b>&minus;c
-(&minus;&minus;const)</b></p>
+<p style="margin-left:11%;"><b>&minus;c</b>,
+<b>&minus;&minus;const</b></p>
 
 <p style="margin-left:22%;">Constantly show the cursor
-position. Note that this overrides <b>-U</b>.</p>
+position. Note that this overrides <b>&minus;U</b>.</p>
 
-<p style="margin-left:11%;"><b>&minus;d
-(&minus;&minus;rebinddelete)</b></p>
+<p style="margin-left:11%;"><b>&minus;d</b>,
+<b>&minus;&minus;rebinddelete</b></p>
 
 <p style="margin-left:22%;">Interpret the Delete key
 differently so that both Backspace and Delete work properly.
 You should only need to use this option if Backspace acts
 like Delete on your system.</p>
 
-<p style="margin-left:11%;"><b>&minus;h
-(&minus;&minus;help)</b></p>
+<p style="margin-left:11%;"><b>&minus;h</b>,
+<b>&minus;&minus;help</b></p>
 
-<p style="margin-left:22%;">Show a summary of command line
-options and exit.</p>
+<p style="margin-left:22%;">Show a summary of the available
+command-line options and exit.</p>
 
-<p style="margin-left:11%;"><b>&minus;i
-(&minus;&minus;autoindent)</b></p>
+<p style="margin-left:11%;"><b>&minus;i</b>,
+<b>&minus;&minus;autoindent</b></p>
 
 <p style="margin-left:22%;">Indent new lines to the
 previous line&rsquo;s indentation. Useful when editing
 source code.</p>
 
-<p style="margin-left:11%;"><b>&minus;k
-(&minus;&minus;cut)</b></p>
+<p style="margin-left:11%;"><b>&minus;k</b>,
+<b>&minus;&minus;cut</b></p>
 
-<p style="margin-left:22%;">Enable cut from cursor to end
-of line.</p>
+<p style="margin-left:22%;">Make the &rsquo;Cut Text&rsquo;
+command (normally ^K) cut from the current cursor position
+to the end of the line, instead of cutting the entire
+line.</p>
 
-<p style="margin-left:11%;"><b>&minus;l
-(&minus;&minus;nofollow)</b></p>
+<p style="margin-left:11%;"><b>&minus;l</b>,
+<b>&minus;&minus;nofollow</b></p>
 
 <p style="margin-left:22%;">If the file being edited is a
 symbolic link, replace the link with a new file instead of
 following it. Good for editing files in <i>/tmp</i>,
 perhaps?</p>
 
-<p style="margin-left:11%;"><b>&minus;m
-(&minus;&minus;mouse)</b></p>
+<p style="margin-left:11%;"><b>&minus;m</b>,
+<b>&minus;&minus;mouse</b></p>
 
 <p style="margin-left:22%;">Enable mouse support, if
 available for your system. When enabled, mouse clicks can be
 used to place the cursor, set the mark (with a double
 click), and execute shortcuts. The mouse will work in the X
-Window System, and on the console when gpm is running.</p>
+Window System, and on the console when gpm is running. Text
+can still be selected through dragging by holding down the
+Shift key.</p>
+
+<p style="margin-left:11%;"><b>&minus;n</b>,
+<b>&minus;&minus;noread</b></p>
+
+<p style="margin-left:22%;">Treat any name given on the
+command line as a new file. This allows <b>nano</b> to write
+to named pipes: it will start with a blank buffer, and will
+write to the pipe when the user saves the &quot;file&quot;.
+This way <b>nano</b> can be used as an editor in combination
+with for instance <b>gpg</b> without having to write
+sensitive data to disk first.</p>
 
-<p style="margin-left:11%;"><b>&minus;o</b> <i>dir</i>
-<b>(&minus;&minus;operatingdir=</b><i>dir</i><b>)</b></p>
 
-<p style="margin-left:22%;">Set operating directory. Makes
-<b>nano</b> set up something similar to a chroot.</p>
+<p style="margin-left:11%;"><b>&minus;o&nbsp;</b><i>directory</i>,
+<b>&minus;&minus;operatingdir=</b><i>directory</i></p>
 
-<p style="margin-left:11%;"><b>&minus;p
-(&minus;&minus;preserve)</b></p>
+<p style="margin-left:22%;">Set the operating directory.
+This makes <b>nano</b> set up something similar to a
+chroot.</p>
+
+<p style="margin-left:11%;"><b>&minus;p</b>,
+<b>&minus;&minus;preserve</b></p>
 
 <p style="margin-left:22%;">Preserve the XON and XOFF
 sequences (^Q and ^S) so they will be caught by the
 terminal.</p>
 
-<p style="margin-left:11%;"><b>&minus;q
-(&minus;&minus;quiet)</b></p>
+<p style="margin-left:11%;"><b>&minus;q</b>,
+<b>&minus;&minus;quiet</b></p>
 
 <p style="margin-left:22%;">Do not report errors in the
-<i>nanorc</i> file and ask them to be acknowledged by
+<i>nanorc</i> files nor ask them to be acknowledged by
 pressing Enter at startup.</p>
 
-<p style="margin-left:11%;"><b>&minus;r</b> <i>cols</i>
-<b>(&minus;&minus;fill=</b><i>cols</i><b>)</b></p>
 
-<p style="margin-left:22%;">Wrap lines at column
-<i>cols</i>. If this value is 0 or less, wrapping will occur
-at the width of the screen less <i>cols</i> columns,
+<p style="margin-left:11%;"><b>&minus;r&nbsp;</b><i>number</i>,
+<b>&minus;&minus;fill=</b><i>number</i></p>
+
+<p style="margin-left:22%;">Hard-wrap lines at column
+<i>number</i>. If this value is 0 or less, wrapping will
+occur at the width of the screen less <i>number</i> columns,
 allowing the wrap point to vary along with the width of the
 screen if the screen is resized. The default value is
-&minus;8.</p>
+&minus;8. This option conflicts with <b>&minus;w</b> -- the
+last one given takes effect.</p>
+
 
-<p style="margin-left:11%;"><b>&minus;s</b> <i>prog</i>
-<b>(&minus;&minus;speller=</b><i>prog</i><b>)</b></p>
+<p style="margin-left:11%;"><b>&minus;s&nbsp;</b><i>program</i>,
+<b>&minus;&minus;speller=</b><i>program</i></p>
 
-<p style="margin-left:22%;">Enable alternative spell
+<p style="margin-left:22%;">Use this alternative spell
 checker command.</p>
 
-<p style="margin-left:11%;"><b>&minus;t
-(&minus;&minus;tempfile)</b></p>
+<p style="margin-left:11%;"><b>&minus;t</b>,
+<b>&minus;&minus;tempfile</b></p>
 
-<p style="margin-left:22%;">Always save changed buffer
-without prompting. Same as Pico&rsquo;s <b>-t</b>
+<p style="margin-left:22%;">Always save a changed buffer
+without prompting. Same as Pico&rsquo;s <b>&minus;t</b>
 option.</p>
 
-<p style="margin-left:11%;"><b>&minus;u
-(&minus;&minus;undo)</b></p>
-
-<p style="margin-left:22%;">Enable experimental
-generic-purpose undo code. By default, the undo and redo
-shortcuts are Meta-U and Meta-E, respectively.</p>
-
-<p style="margin-left:11%;"><b>&minus;v
-(&minus;&minus;view)</b></p>
+<p style="margin-left:11%;"><b>&minus;v</b>,
+<b>&minus;&minus;view</b></p>
 
-<p style="margin-left:22%;">View file (read only) mode.</p>
+<p style="margin-left:22%;">View-file (read-only) mode.</p>
 
-<p style="margin-left:11%;"><b>&minus;w
-(&minus;&minus;nowrap)</b></p>
+<p style="margin-left:11%;"><b>&minus;w</b>,
+<b>&minus;&minus;nowrap</b></p>
 
-<p style="margin-left:22%;">Disable wrapping of long
-lines.</p>
+<p style="margin-left:22%;">Disable the hard-wrapping of
+long lines. This option conflicts with <b>&minus;r</b> --
+the last one given takes effect.</p>
 
-<p style="margin-left:11%;"><b>&minus;x
-(&minus;&minus;nohelp)</b></p>
+<p style="margin-left:11%;"><b>&minus;x</b>,
+<b>&minus;&minus;nohelp</b></p>
 
-<p style="margin-left:22%;">Disable help screen at bottom
-of editor.</p>
+<p style="margin-left:22%;">Don&rsquo;t show the two help
+lines at the bottom of the screen.</p>
 
-<p style="margin-left:11%;"><b>&minus;z
-(&minus;&minus;suspend)</b></p>
+<p style="margin-left:11%;"><b>&minus;z</b>,
+<b>&minus;&minus;suspend</b></p>
 
-<p style="margin-left:22%;">Enable suspend ability.</p>
+<p style="margin-left:22%;">Enable the suspend ability.</p>
 
-<p style="margin-left:11%;"><b>&minus;$
-(&minus;&minus;softwrap)</b></p>
+<p style="margin-left:11%;"><b>&minus;$</b>,
+<b>&minus;&minus;softwrap</b></p>
 
 <p style="margin-left:22%;">Enable &rsquo;soft
-wrapping&rsquo;. <b>nano</b> will attempt to display the
-entire contents of a line, even if it is longer than the
-screen width. Since &rsquo;$&rsquo; normally refers to a
+wrapping&rsquo;. This will make <b>nano</b> attempt to
+display the entire contents of any line, even if it is
+longer than the screen width, by continuing it over multiple
+screen lines. Since &rsquo;$&rsquo; normally refers to a
 variable in the Unix shell, you should specify this option
 last when using other options (e.g. &rsquo;nano
 &minus;wS$&rsquo;) or pass it separately (e.g. &rsquo;nano
 &minus;wS &minus;$&rsquo;).</p>
 
-<p style="margin-left:11%;"><b>&minus;a, &minus;b,
-&minus;e, &minus;f, &minus;g, &minus;j</b></p>
+<p style="margin-left:11%;"><b>&minus;a</b>,
+<b>&minus;b</b>, <b>&minus;e</b>, <b>&minus;f</b>,
+<b>&minus;g</b>, <b>&minus;j</b></p>
 
 <p style="margin-left:22%;">Ignored, for compatibility with
 Pico.</p>
@@ -388,10 +401,11 @@ Pico.</p>
 
 
 <p style="margin-left:11%; margin-top: 1em"><b>nano</b>
-will read initialization files in the following order:
-<i>SYSCONFDIR/nanorc</i>, then <i>~/.nanorc</i>. Please see
-<b>nanorc(5)</b> and the example file <b>nanorc.sample</b>,
-both of which should be provided with <b>nano</b>.</p>
+will read initialization files in the following order: the
+system&rsquo;s <b>nanorc</b> (if it exists), and then the
+user&rsquo;s <b>~/.nanorc</b> (if it exists). Please see
+<b>nanorc</b>(5) for more information on the possible
+contents of those files.</p>
 
 <h2>NOTES
 <a name="NOTES"></a>
@@ -400,7 +414,7 @@ both of which should be provided with <b>nano</b>.</p>
 
 <p style="margin-left:11%; margin-top: 1em">If no
 alternative spell checker command is specified on the
-command line or in one of the <i>nanorc</i> files,
+command line nor in one of the <i>nanorc</i> files,
 <b>nano</b> will check the <b>SPELL</b> environment variable
 for one.</p>
 
@@ -458,7 +472,7 @@ email to <b>nano-devel-request@gnu.org</b> with a subject of
 
 
 <p style="margin-left:11%; margin-top: 1em">Chris
-Allegretta &lt;chrisa@asty.org&gt;, et al (see
+Allegretta &lt;chrisa@asty.org&gt;, et al (see the files
 <i>AUTHORS</i> and <i>THANKS</i> for details). This manual
 page was originally written by Jordi Mallach
 &lt;jordi@gnu.org&gt;, for the Debian system (but may be
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index 3c69209..c2c802d 100644
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -1,6 +1,8 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
-.\" Free Software Foundation, Inc.
+.\" $Id: nanorc.5 5135 2015-03-08 15:59:15Z bens $
+.\"
+.\" Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+.\" 2013, 2014, 2015 Free Software Foundation, Inc.
 .\"
 .\" This document is dual-licensed.  You may distribute and/or modify it
 .\" under the terms of either of the following licenses:
@@ -18,242 +20,296 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.\" $Id: nanorc.5 4508 2010-06-21 03:10:10Z astyanax $
-.TH NANORC 5 "version 2.0.0" "August 23, 2007"
+.TH NANORC 5 "version 2.4.0" "March 2015"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
 nanorc \- GNU nano's rcfile
 .SH DESCRIPTION
-This manual page briefly documents GNU \fBnano\fP's rcfile.
-.PP
-\fBnano\fP is a small, free and friendly editor which aims to replace
-Pico, the default editor included in the non-free Pine package.  Rather
-than just copying Pico's look and feel, \fBnano\fP also implements some
-missing (or disabled by default) features in Pico, such as "search and
-replace" and "go to line and column number".
-.PP
-The \fInanorc\fP file contains the default settings for \fBnano\fP.  It
-should not be in DOS or Mac format.  During startup, \fBnano\fP will
-first read its system-wide settings from \fISYSCONFDIR/nanorc\fP, and
-then user-specific settings from \fI~/.nanorc\fP.
+The \fInanorc\fP file contains the default settings for \fBnano\fP, a
+small and friendly editor.  The file should be in Unix format, not in
+DOS or Mac format.  During startup, \fBnano\fP will first read the
+system-wide settings, from \fB/etc/nanorc\fP (the exact path might be
+different), and then the user-specific settings, from \fB~/.nanorc\fP.
 
 .SH OPTIONS
 The configuration file accepts a series of \fBset\fP and \fBunset\fP
 commands, which can be used to configure nano on startup without using
-the command line options.  Additionally, the \fBsyntax\fP, \fBcolor\fP,
-and \fBicolor\fP keywords are used to define syntax highlighting rules
-for different text patterns.  \fBnano\fP will read one command per line.
-
+command-line options.  Additionally, there are some commands to define
+syntax highlighting and to rebind keys -- see the two separate sections
+on those.  \fBnano\fP reads one command per line.
+.PP
 Options in \fInanorc\fP files take precedence over nano's defaults, and
-command line options override \fInanorc\fP settings.  Also, options are
-unset by default, except for those that take arguments.
-
-Quotes inside string parameters don't have to be escaped with
+command-line options override \fInanorc\fP settings.  Also, options that
+do not take an argument are unset by default.  So using the \fBunset\fR
+command is only needed when wanting to override a setting of the system's
+\fInanorc\fR file in your own \fB~/.nanorc\fR.  Options that take an
+argument cannot be unset.
+.PP
+Below, the \fIstring\fR parameters need to be enclosed in double quotes.
+Quotes inside these string parameters don't have to be escaped with
 backslashes.  The last double quote in the string will be treated as its
-end.  For example, for the \fBbrackets\fP option, "\fI"')>]}\fP" will
-match \fI"\fP, \fI'\fP, \fI)\fP, \fI>\fP, \fI]\fP, and \fI}\fP.
-
+end.  For example, for the \fBbrackets\fP option, "\fB"')>]}\fP" will
+match \fB"\fP, \fB'\fP, \fB)\fP, \fB>\fP, \fB]\fP, and \fB}\fP.
+.PP
 The supported commands and arguments are:
 
 .TP 3
-.B set/unset allow_insecure_backup
+.B set allow_insecure_backup
 When backing up files, allow the backup to succeed even if its permissions
-can't be (re)set due to special OS considerations.  You should 
+can't be (re)set due to special OS considerations.  You should
 NOT enable this option unless you are sure you need it.
 .TP
-.B set/unset autoindent
+.B set autoindent
 Use auto-indentation.
 .TP
-.B set/unset backup
-Create backup files in \fIfilename~\fP.
+.B set backup
+Create backup files by adding a tilde (\fB~\fP) to each file's name.
 .TP
 .B set backupdir "\fIdirectory\fP"
-Set the directory where \fBnano\fP puts unique backup files if file
+Set the directory where \fBnano\fP puts unique backup files, if file
 backups are enabled.
 .TP
-.B set/unset backwards
+.B set backwards
 Do backwards searches by default.
 .TP
-.B set/unset boldtext
-Use bold text instead of reverse video text.
+.B set boldtext
+Use bold instead of reverse video for the titlebar, statusbar, key combos,
+and selected text.  This can be overridden for the first three by setting
+the options \fBtitlecolor\fP, \fBstatuscolor\fP, and \fBkeycolor\fP.
 .TP
 .B set brackets "\fIstring\fP"
 Set the characters treated as closing brackets when justifying
-paragraphs.  They cannot contain blank characters.  Only closing
-punctuation, optionally followed by closing brackets, can end sentences.
-The default value is "\fI"')>]}\fP".
+paragraphs.  This may not include blank characters.  Only closing
+punctuation (see \fBpunct\fP), optionally followed by the specified
+closing brackets, can end sentences.  The default value is "\fB"')>]}\fP".
 .TP
-.B set/unset casesensitive
-Do case sensitive searches by default.
+.B set casesensitive
+Do case-sensitive searches by default.
 .TP
-.B set/unset const
+.B set const
 Constantly display the cursor position in the status bar.
 .TP
-.B set/unset cut
-Use cut to end of line by default.
+.B set cut
+Use cut-to-end-of-line by default, instead of cutting the whole line.
+.TP
+.B set fill \fInumber\fR
+Hard-wrap lines at column number \fInumber\fR.  If \fInumber\fR is 0 or less,
+the maximum line length will be the screen width less \fInumber\fP columns.
+The default value is \fB\-8\fR.
 .TP
-.B set fill \fIn\fP
-Wrap lines at column number \fIn\fP.  If \fIn\fP is 0 or less, the
-maximum line length will be the screen width less \fIn\fP columns.  The
-default value is \-8.
+.B set functioncolor \fIfgcolor\fR,\fIbgcolor\fR
+Specify the color combination to use for the function descriptions
+in the two help lines at the bottom of the screen.
+See \fBset titlecolor\fR for more details.
 .TP
-.B set/unset historylog
-Enable \fI~/.nano_history\fP for saving and reading search/replace
-strings.
+.B set historylog
+Enable the use of \fB~/.nano/search_history\fP for saving and reading
+search/replace strings.
+.TP
+.B set keycolor \fIfgcolor\fR,\fIbgcolor\fR
+Specify the color combination to use for the shortcut key combos
+in the two help lines at the bottom of the screen.
+See \fBset titlecolor\fR for more details.
+.TP
+.B set locking
+Enable vim-style lock-files for when editing files.
 .TP
 .B set matchbrackets "\fIstring\fP"
 Set the opening and closing brackets that can be found by bracket
-searches.  They cannot contain blank characters.  The former set must
-come before the latter set, and both must be in the same order.  The
-default value is "\fI(<[{)>]}\fP".
+searches.  This may not include blank characters.  The opening set must
+come before the closing set, and the two sets must be in the same order.
+The default value is "\fB(<[{)>]}\fP".
 .TP
-.B set/unset morespace
+.B set morespace
 Use the blank line below the titlebar as extra editing space.
 .TP
-.B set/unset mouse
+.B set mouse
 Enable mouse support, if available for your system.  When enabled, mouse
 clicks can be used to place the cursor, set the mark (with a double
 click), and execute shortcuts.  The mouse will work in the X Window
-System, and on the console when gpm is running.
+System, and on the console when gpm is running.  Text can still be
+selected through dragging by holding down the Shift key.
 .TP
-.B set/unset multibuffer
+.B set multibuffer
 Allow inserting files into their own buffers.
 .TP
-.B set/unset noconvert
+.B set noconvert
 Don't convert files from DOS/Mac format.
 .TP
-.B set/unset nofollow
+.B set nofollow
 Don't follow symlinks when writing files.
 .TP
-.B set/unset nohelp
-Don't display the help lists at the bottom of the screen.
+.B set nohelp
+Don't display the two help lines at the bottom of the screen.
 .TP
-.B set/unset nonewlines
-Don't add newlines to the ends of files.
+.B set nonewlines
+Don't automatically add a newline to the ends of files.
 .TP
-.B set/unset nowrap
-Don't wrap text at all.
+.B set nowrap
+Don't hard-wrap text at all.
 .TP
 .B set operatingdir "\fIdirectory\fP"
 \fBnano\fP will only read and write files inside \fIdirectory\fP and its
 subdirectories.  Also, the current directory is changed to here, so
-files are inserted from this diractory.  By default, the operating
+files are inserted from this directory.  By default, the operating
 directory feature is turned off.
 .TP
-.B set/unset preserve
+.B set poslog
+Save the cursor position of files between editing sessions.
+.TP
+.B set preserve
 Preserve the XON and XOFF keys (^Q and ^S).
 .TP
 .B set punct "\fIstring\fP"
 Set the characters treated as closing punctuation when justifying
-paragraphs.  They cannot contain blank characters.  Only closing
-punctuation, optionally followed by closing brackets, can end sentences.
-The default value is "\fI!.?\fP".
+paragraphs.  This may not include blank characters.  Only the
+specfified closing punctuation, optionally followed by closing brackets
+(see \fBbrackets\fP), can end sentences.  The default value is "\fB!.?\fP".
 .TP
-.B set/unset quiet
-\fBnano\fP will not report errors in the \fInanorc\fP file and ask them
-to be acknowledged by pressing enter at startup.  If this is used it
-should be placed at the top of the file to be fully effective.
-.TP
-.B set/unset quickblank
+.B set quickblank
 Do quick statusbar blanking.  Statusbar messages will disappear after 1
 keystroke instead of 25.
 .TP
+.B set quiet
+\fBnano\fP will not report errors in the \fInanorc\fP file nor ask them
+to be acknowledged by pressing Enter at startup.  If this is used, it
+should be placed at the top of the file to be fully effective.
+.TP
 .B set quotestr "\fIstring\fP"
 The email-quote string, used to justify email-quoted paragraphs.  This
 is an extended regular expression if your system supports them,
 otherwise a literal string.  The default value is
-"\fI^([\ \\t]*[#:>\\|}])+\fP" if you have extended regular expression
-support, or "\fI>\ \fP" otherwise.  Note that '\\t' stands for a literal
+"\fB^([\ \\t]*[#:>\\|}])+\fP" if you have extended regular expression
+support, and "\fB>\ \fP" otherwise.  Note that '\\t' stands for a literal
 Tab character.
 .TP
-.B set/unset rebinddelete
+.B set rebinddelete
 Interpret the Delete key differently so that both Backspace and Delete
 work properly.  You should only need to use this option if Backspace
 acts like Delete on your system.
 .TP
-.B set/unset rebindkeypad
+.B set rebindkeypad
 Interpret the numeric keypad keys so that they all work properly.  You
 should only need to use this option if they don't, as mouse support
 won't work properly with this option enabled.
 .TP
-.B set/unset regexp
+.B set regexp
 Do extended regular expression searches by default.
 .TP
-.B set/unset smarthome
+.B set smarthome
 Make the Home key smarter.  When Home is pressed anywhere but at the
 very beginning of non-whitespace characters on a line, the cursor will
 jump to that beginning (either forwards or backwards).  If the cursor is
 already at that position, it will jump to the true beginning of the
 line.
 .TP
-.B set/unset smooth
+.B set smooth
 Use smooth scrolling by default.
 .TP
-.B set/unset softwrap
-Enable soft line wrapping for easier viewing of very long lones.
+.B set softwrap
+Enable soft line wrapping for easier viewing of very long lines.
 .TP
 .B set speller "\fIspellprog\fP"
 Use spelling checker \fIspellprog\fP instead of the built-in one, which
 calls \fIspell\fP.
 .TP
-.B set/unset suspend
+.B set statuscolor \fIfgcolor\fR,\fIbgcolor\fR
+Specify the color combination to use for the statusbar.
+See \fBset titlecolor\fR for more details.
+.TP
+.B set suspend
 Allow \fBnano\fP to be suspended.
 .TP
-.B set tabsize \fIn\fP
-Use a tab size of \fIn\fP columns.  The value of \fIn\fP must be greater
-than 0.  The default value is 8.  
+.B set tabsize \fInumber\fR
+Use a tab size of \fInumber\fR columns.  The value of \fInumber\fP must be
+greater than 0.  The default value is \fB8\fR.
 .TP
-.B set/unset tabstospaces
+.B set tabstospaces
 Convert typed tabs to spaces.
 .TP
-.B set/unset tempfile
+.B set tempfile
 Save automatically on exit, don't prompt.
 .TP
-.B set/unset undo
-Enable experimental generic-purpose undo code.
+.B set titlecolor \fIfgcolor\fR,\fIbgcolor\fR
+Specify the color combination to use for the titlebar.
+Valid color names for foreground and background are:
+.BR white , \ black , \ red , \ blue , \ green , \ yellow , \ magenta ", and " cyan .
+And either "\fIfgcolor\fR" or ",\fIbgcolor\fR" may be left out.
 .TP
-.B set/unset view
+.B set view
 Disallow file modification.
 .TP
-.B set/unset softwrap
-Enable soft line wrapping for easier viewing of very long lones.
-.TP
 .B set whitespace "\fIstring\fP"
-Set the two characters used to display the first characters of tabs and
+Set the two characters used to indicate the presence of tabs and
 spaces.  They must be single-column characters.
 .TP
-.B set/unset wordbounds
+.B set wordbounds
 Detect word boundaries more accurately by treating punctuation
 characters as parts of words.
-.TP
-.B syntax "\fIstr\fP" ["\fIfileregex\fP" ... ]
+
+.SH SYNTAX HIGHLIGHTING
+Coloring the different syntactic elements of a file
+is done via regular expressions (see the \fBcolor\fR command below).
+This is inherently imperfect, because regular expressions are not
+powerful enough to fully parse a file.  Nevertheless, regular
+expressions can do a lot and are easy to make, so they are a
+good fit for a small editor like \fBnano\fR.
+.sp
+A separate syntax can be defined for each kind of file
+via the following commands:
+.TP
+.BR syntax " ""\fIstr\fR"" [""\fIfileregex\fR"" ...]"
 Defines a syntax named \fIstr\fP which can be activated via the
-\-Y/\-\-syntax command line option, or will be automatically activated if
+.BR \-Y / \-\-syntax
+command-line option, or will be automatically activated if
 the current filename matches the extended regular expression
 \fIfileregex\fP.  All following \fBcolor\fP and \fBicolor\fP statements
-will apply to \fIsyntax\fP until a new syntax is defined.
+will apply to this \fIstr\fP syntax until a new syntax is defined.
 
-The \fInone\fP syntax is reserved; specifying it on the command line is
-the same as not having a syntax at all.  The \fIdefault\fP syntax is
+The \fBnone\fP syntax is reserved; specifying it on the command line is
+the same as not having a syntax at all.  The \fBdefault\fP syntax is
 special: it takes no \fIfileregex\fP, and applies to files that don't
 match any other syntax's \fIfileregex\fP.
 .TP
-.B color \fIfgcolor\fP,\fIbgcolor\fP "\fIregex\fP" ...
+.BI linter " program " \fR[ "arg " \fR...]
+For the currently defined syntax, use the given \fIprogram\fR
+to invoke the linter (this overrides the speller function when
+defined).
+.TP
+.BI formatter " program " \fR[ "arg " \fR...]
+For the currently defined syntax, use the given \fIprogram\fR
+to automatically reformat text.  Useful in certain programming
+languages (e.g. go).
+.TP
+.BR header " \fIregex\fR " ...
+For the currently defined syntax, add one or more regexes which will
+be compared against the very first line of the file to be edited,
+to determine whether this syntax should be used for that file.
+.TP
+.BR magic " \fIregex\fR " ...
+For the currently defined syntax, add one or more regexes which
+will be compared against the result of querying the \fBmagic\fP
+database about the file to be edited, to determine whether this
+syntax should be used for that file.  This
+functionality only works when \fBlibmagic\fP is installed on the
+system and will be silently ignored otherwise.
+.TP
+.B color \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ...
 For the currently defined syntax, display all expressions matching
 the extended regular expression \fIregex\fP with foreground color
 \fIfgcolor\fP and background color \fIbgcolor\fP, at least one of which
-must be specified.  Legal colors for foreground and background color
+must be specified.  Valid colors for foreground and background
 are: white, black, red, blue, green, yellow, magenta, and cyan.  You may
-use the prefix "bright" to force a stronger color highlight for the
+use the prefix "bright" to get a stronger color highlight for the
 foreground.  If your terminal supports transparency, not specifying a
 \fIbgcolor\fP tells \fBnano\fP to attempt to use a transparent
 background.
 .TP
-.B icolor \fIfgcolor\fP,\fIbgcolor\fP "\fIregex\fP" ...
+.B icolor \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ...
 Same as above, except that the expression matching is case insensitive.
 .TP
-.B color \fIfgcolor\fP,\fIbgcolor\fP start="\fIsr\fP" end="\fIer\fP"
+.BR color " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIsr\fR"" " end= """\fIer\fR""
 Display expressions which start with the extended regular expression
 \fIsr\fP and end with the extended regular expression \fIer\fP with
 foreground color \fIfgcolor\fP and background color \fIbgcolor\fP,
@@ -262,244 +318,322 @@ highlighting to span multiple lines.  Note that all subsequent instances
 of \fIsr\fP after an initial \fIsr\fP is found will be highlighted until
 the first instance of \fIer\fP.
 .TP
-.B icolor \fIfgcolor\fP,\fIbgcolor\fP start="\fIsr\fP" end="\fIer\fP"
+.BR icolor " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIsr\fR"" " end= """\fIer\fR""
 Same as above, except that the expression matching is case insensitive.
 .TP
-.B include "\fIsyntaxfile\fP"
+.BR include " ""\fIsyntaxfile\fR"""
 Read in self-contained color syntaxes from \fIsyntaxfile\fP.  Note that
-\fIsyntaxfile\fP can only contain \fBsyntax\fP, \fBcolor\fP, and
-\fBicolor\fP commands.
-.SH KEY BINDINGS
+\fIsyntaxfile\fP can only contain the above commands, from \fBsyntax\fP
+to \fBicolor\fP.
+.TP
+.BI extendsyntax " str directive " \fR[ "arg " \fR...]
+Extend the syntax previously defined as \fIstr\fP to include
+new information.  This allows you to add a new \fIcolor\fP, \fIicolor\fP,
+\fImagic\fP, \fIheader\fP, or \fIlinter\fP directive to an already
+defined syntax -- useful when you want to add to definitions from the
+system-installed syntax definitions (which are normally not writable).
+
+.SH REBINDING KEYS
 Key bindings may be reassigned via the following commands:
 .TP
-.B bind \fIkey\fP \fIfunction\fP  \fImenu\fP
+.BI bind " key function menu"
 Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the
-context of menu \fImenu\fP.  The format of  \fIkey\fP should be one of:
+context of menu \fImenu\fP (or in all menus where the function exists
+by using \fBall\fP).
 .TP
-.B ^ 
+.BI unbind " key menu"
+Unbinds the key \fIkey\fP from the menu named \fImenu\fP (or from all
+menus where it exists by using \fBall\fP).
+
+.TP
+The format of \fIkey\fP should be one of:
+.RS 3
+.TP 3
+.B ^
 followed by an alpha character or the word "Space".
 Example: ^C
 .TP
-.B M- 
+.B M-
 followed by a printable character or the word "Space".
 Example: M-C
 .TP
-.B F 
+.B F
 followed by a numeric value from 1 to 16.
 Example: F10
+.RE
+
 .TP
-Valid function names to be bound include:
-.TP 3
+Valid \fIfunction\fP names to be bound include:
+.RS 3
+.TP 2
 .B help
-Invoke the help menu.
+Invokes the help viewer.
 .TP
 .B cancel
-Cancel the current command.
+Cancels the current command.
 .TP
 .B exit
-Exit from the program.
+Exits from the program (or from the help viewer or the file browser).
 .TP
 .B writeout
-Write the current buffer to disk.
-.TP
-.B justify
-Justify the current text.
+Writes the current buffer to disk.
 .TP
 .B insert
-Insert a file into the current buffer (or into a new buffer when multibuffer
+Inserts a file into the current buffer (or into a new buffer when multibuffer
 is enabled).
 .TP
 .B whereis
-Search for text in the current buffer.
+Searches for text in the current buffer -- or for filenames matching
+a string in the current list in the file browser.
 .TP
 .B searchagain
-Repeat the last search command.
+Repeats the last search command.
 .TP
-.B up
-Move up in the editor or browser.
-.TP
-.B down
-Move down in the editor or browser.
-.TP
-.B left
-Move left in the editor or browser.
-.TP
-.B right
-Move right in the editor or browser.
+.B replace
+Interactively replaces text within the current buffer.
 .TP
 .B cut
-Cut the current line of text and store it.
+Cuts and stores the current line (or the marked region).
+.TP
+.B copytext
+Copies the current line (or the marked region) without deleting it.
 .TP
 .B uncut
-Copy the currently stored text into the current buffer position.
+Copies the currently stored text into the current buffer at the
+current cursor position.
 .TP
-.B curpos
-Show the current line, column, word positions in the file.
+.B mark
+Sets the mark at the current position, to start selecting text.
 .TP
-.B firstline
-Move to the first line of the file.
+.B cutrestoffile
+Cuts all text from the cursor position till the end of the buffer.
 .TP
-.B lastline
-Move to the last line of the file.
+.B curpos
+Shows the current cursor position: the line, column, and character positions.
 .TP
-.B gotoline
-Move to a specific line (and column if specified).
+.B wordcount
+Counts the number of words, lines and characters in the current buffer.
 .TP
-.B replace
-Interactively replace text within the current buffer.
+.B speller
+Invokes a spell-checking program (or a linting program, if the current
+syntax highlighting defines one).
 .TP
-.B mark
-Begin selecting text for cutting or pasting at the current position.
+.B justify
+Justifies the current paragraph.
 .TP
-.B copytext
-Copy the currently marked text without deleting it.
+.B fulljustify
+Justifies the entire current buffer.
 .TP
 .B indent
-Indent the currently marked text (shift to the right).
+Indents (shifts to the right) the currently marked text.
 .TP
 .B unindent
-Un-indent the currently marked text (shift to the left).
+Unindents (shifts to the left) the currently marked text.
+.TP
+.B left
+Goes left one position (in the editor or browser).
+.TP
+.B right
+Goes right one position (in the editor or browser).
+.TP
+.B up
+Goes one line up (in the editor or browser).
+.TP
+.B down
+Goes one line down (in the editor or browser).
+.TP
+.B scrollup
+Scrolls up one line of text from the current position.
+.TP
+.B scrolldown
+Scrolls down one line of text from the current position.
 .TP
 .B nextword
-Move the cursor to the beginning of the next word.
+Moves the cursor to the beginning of the next word.
 .TP
 .B prevword
-Move the cursor to the beginning of the previous word.
+Moves the cursor to the beginning of the previous word.
 .TP
 .B home
-Move the cursor to the beginning of the current line.
+Moves the cursor to the beginning of the current line.
 .TP
 .B end
-Move the cursor to the end of the current line.
+Moves the cursor to the end of the current line.
 .TP
 .B beginpara
-Move the cursor to the beginning of the current paragraph.
+Moves the cursor to the beginning of the current paragraph.
 .TP
 .B endpara
-Move the cursor to the end of the current paragraph.
+Moves the cursor to the end of the current paragraph.
 .TP
-.B findbracket
-Move the cursor to the matching bracket (brace, parenthesis, etc.) of the one
-under the cursor.
+.B prevpage
+Goes up one screenful.
 .TP
-.B scrollup
-Scroll up one line of text from the current position.
+.B nextpage
+Goes down one screenful.
 .TP
-.B scrolldown
-Scroll down one line of text from the current position.
+.B firstline
+Goes to the first line of the file.
+.TP
+.B lastline
+Goes to the last line of the file.
+.TP
+.B gotoline
+Goes to a specific line (and column if specified).
+.TP
+.B gototext
+Switches from targeting a line number to searching for text.
+.TP
+.B findbracket
+Moves the cursor to the bracket (brace, parenthesis, etc.) that matches
+(pairs) with the one under the cursor.
 .TP
 .B prevbuf
-Switch to editing/viewing the previous buffer when using multibuffer mode.
+Switches to editing/viewing the previous buffer when using multibuffer mode.
 .TP
 .B nextbuf
-Switch to editing/viewing the next buffer when using multibuffer mode.
+Switches to editing/viewing the next buffer when using multibuffer mode.
 .TP
 .B verbatim
-Insert the next character verbatim into the file.
+Inserts the next character verbatim into the file.
 .TP
 .B tab
-Insert a tab at the current cursor location.
+Inserts a tab at the current cursor location.
 .TP
 .B enter
-Insert a new line below the current one.
+Inserts a new line below the current one.
 .TP
 .B delete
-Delete the character under the cursor.
+Deletes the character under the cursor.
 .TP
-.B fulljustify
-Justify the entire current file.
-.TP
-.B wordcount
-Count the number of words in the current buffer.
-.TP
-.B refresh
-Refresh the screen.
+.B backspace
+Deletes the character before the cursor.
 .TP
 .B undo
-Undo the text action peformed (add text, delete text, etc).
+Undoes the last performed text action (add text, delete text, etc).
 .TP
 .B redo
-Redo the last undone action (i.e., undo an undo).
+Redoes the last undone action (i.e., it undoes an undo).
+.TP
+.B refresh
+Refreshes the screen.
 .TP
 .B suspend
-Suspend the editor (if the suspend function is enabled, see the 
+Suspends the editor (if the suspending function is enabled, see the
 "suspendenable" entry below).
 .TP
 .B casesens
-Toggle case sensitivity in searching (search/replace menus only).
+Toggles case sensitivity in searching (search/replace menus only).
 .TP
 .B regexp
-Toggle whether searching/replacing is based on literal strings or regular expressions.
+Toggles whether searching/replacing is based on literal strings or regular expressions.
+.TP
+.B backwards
+Toggles whether searching/replacing goes forward or backward.
 .TP
 .B prevhistory
-Show the previous history entry in the prompt menus (e.g. search).
+Shows the previous history entry in the prompt menus (e.g. search).
 .TP
 .B nexthistory
-Show the next history entry in the prompt menus (e.g. search).
+Shows the next history entry in the prompt menus (e.g. search).
 .TP
-.B dontreplace
-Switch back to searching instead of replacing.
+.B flipreplace
+Toggles between searching for something and replacing something.
 .TP
-.B gototext
-Search for files matching a string in the file browser (reading or writing files).
+.B flipexecute
+Toggles between inserting a file and executing a command.
+.TP
+.B flipnewbuffer
+Toggles between inserting into the current buffer and into a new
+empty buffer.
+.TP
+.B tofiles
+Starts the file browser, allowing to select a file from a list.
+.TP
+.B gotodir
+Goes to a directory to be specified, allowing to browse anywhere
+in the filesystem.
 .TP
 .B dosformat
-When writing a file, switch to writing a DOS format (CR/LF).
+When writing a file, switches to writing a DOS format (CR/LF).
 .TP
 .B macformat
-When writing a file, switch to writing a Mac format.
+When writing a file, switches to writing a Mac format.
 .TP
 .B append
-When writing a file, append to the end instead of overwriting.
+When writing a file, appends to the end instead of overwriting.
 .TP
 .B prepend
-When writing a file, 'prepend' (write at the beginning) instead of overwriting.
+When writing a file, 'prepends' (writes at the beginning) instead of overwriting.
 .TP
 .B backup
-When writing a file, create a backup of the current file. 
+When writing a file, creates a backup of the current file.
 .TP
 .B firstfile
-Move to the first file when using the file browser (reading or writing files).
+Goes to the first file when using the file browser (reading or writing files).
 .TP
 .B lastfile
-Move to the last file when using the file browser (reading or writing files).
+Goes to the last file when using the file browser (reading or writing files).
 .TP
 .B nohelp
-Toggle showing/hiding the two-line list of key bindings at the bottom of the screen.
+Toggles the presence of the two-line list of key bindings at the bottom of the screen.
 .TP
 .B constupdate
-Constantly display the current line, column, word positions.
+Toggles the constant display of the current line, column, and character positions.
 .TP
 .B morespace
-Toggle showing/hiding the blank line which 'separates' the 'title' from the file text.
+Toggles the presence of the blank line which 'separates' the titlebar from the file text.
 .TP
 .B smoothscroll
-Toggle smooth scrolling when moving via the arrow keys.
+Toggles smooth scrolling (when moving around with the arrow keys).
+.TP
+.B softwrap
+Toggles the displaying of overlong lines on multiple screen lines.
 .TP
 .B whitespacedisplay
-Toggle whether whitespace is shown.
+Toggles the showing of whitespace.
+.TP
+.B nosyntax
+Toggles syntax highlighting.
 .TP
 .B smarthome
-Toggle whether the smart home key function is enabled.
+Toggles the smartness of the Home key.
 .TP
 .B autoindent
-Toggle whether new lines will contain the same amount of whitespace as the line above.
+Toggles whether new lines will contain the same amount of whitespace as the preceding line.
 .TP
 .B cuttoend
-Toggle whether cutting text will cut the whole line or just from the current cursor
+Toggles whether cutting text will cut the whole line or just from the current cursor
 position to the end of the line.
 .TP
 .B nowrap
-Toggle whether long lines will be wrapped to the next line.
+Toggles whether long lines will be hard-wrapped to the next line.
 .TP
-.B suspendenable
-Toggle whether the suspend sequence (normally ^Z) will suspend the editor window.
+.B tabstospaces
+Toggles whether typed tabs will be converted to spaces.
+.TP
+.B backupfile
+Toggles whether a backup will be made of the file to be edited.
+.TP
+.B multibuffer
+Toggles the use of multiple file buffers (if support for them has been compiled in).
 .TP
+.B mouse
+Toggles mouse support.
+.TP
+.B noconvert
+Toggles automatic conversion of files from DOS/Mac format.
+.TP
+.B suspendenable
+Toggles whether the suspend sequence (normally ^Z) will suspend the editor window.
+.RE
 
-Valid menu sections are:
 .TP
+Valid \fImenu\fP sections are:
+.RS 3
+.TP 2
 .B main
-The main editor window where text is entered.
+The main editor window where text is entered and edited.
 .TP
 .B search
 The search menu (AKA whereis).
@@ -520,14 +654,17 @@ The 'write file' menu.
 The 'insert file' menu.
 .TP
 .B extcmd
-The menu for inserting output from an external comman, reached from the insert menu.
+The menu for inserting output from an external command, reached from the insert menu.
 .TP
 .B help
-The help menu.
+The help-viewer menu.
 .TP
 .B spell
 The interactive spell checker Yes/no menu.
 .TP
+.B linter
+The linter menu.
+.TP
 .B browser
 The file browser for inserting or writing a file.
 .TP
@@ -535,26 +672,22 @@ The file browser for inserting or writing a file.
 The 'search for a file' menu in the file browser.
 .TP
 .B gotodir
-The 'go to directory' menu.
+The 'go to directory' menu in the file browser.
 .TP
 .B all
-A special name meaning: apply to all menus where this function exists.
+A special name that encompasses all menus.
+For \fBbind\fR it means all menus where the specified \fIfunction\fR exists;
+for \fBunbind\fR it means all menus where the specified \fIkey\fR exists.
+.RE
 
-.TP
-.B unbind \fIkey\fP \fImenu\fP
-Unbind the key \fIkey\fP from the menu named \fImenu\fP or from all 
-menus by using \fIall\fP.  Same key syntax as for binding.
-Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the
-context of menu \fImenu\fP.  The format of  \fIkey\fP should be one of:
 .SH FILES
 .TP
-.I SYSCONFDIR/nanorc
-System-wide configuration file
+.B /etc/nanorc
+System-wide configuration file.
 .TP
-.I ~/.nanorc
-Per-user configuration file
+.B ~/.nanorc
+Per-user configuration file.
 .SH SEE ALSO
-.PD 0
 .TP
 \fBnano\fP(1)
 .PP
diff --git a/doc/man/nanorc.5.html b/doc/man/nanorc.5.html
index 94e2b6d..9f1ea5d 100644
--- a/doc/man/nanorc.5.html
+++ b/doc/man/nanorc.5.html
@@ -1,5 +1,5 @@
-<!-- Creator     : groff version 1.20.1 -->
-<!-- CreationDate: Tue Aug 10 22:44:00 2010 -->
+<!-- Creator     : groff version 1.22.2 -->
+<!-- CreationDate: Sun Mar 22 23:46:10 2015 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -23,7 +23,8 @@
 <a href="#NAME">NAME</a><br>
 <a href="#DESCRIPTION">DESCRIPTION</a><br>
 <a href="#OPTIONS">OPTIONS</a><br>
-<a href="#KEY BINDINGS">KEY BINDINGS</a><br>
+<a href="#SYNTAX HIGHLIGHTING">SYNTAX HIGHLIGHTING</a><br>
+<a href="#REBINDING KEYS">REBINDING KEYS</a><br>
 <a href="#FILES">FILES</a><br>
 <a href="#SEE ALSO">SEE ALSO</a><br>
 <a href="#AUTHOR">AUTHOR</a><br>
@@ -44,24 +45,13 @@ GNU nano&rsquo;s rcfile</p>
 </h2>
 
 
-<p style="margin-left:11%; margin-top: 1em">This manual
-page briefly documents GNU <b>nano</b>&rsquo;s rcfile.</p>
-
-<p style="margin-left:11%; margin-top: 1em"><b>nano</b> is
-a small, free and friendly editor which aims to replace
-Pico, the default editor included in the non-free Pine
-package. Rather than just copying Pico&rsquo;s look and
-feel, <b>nano</b> also implements some missing (or disabled
-by default) features in Pico, such as &quot;search and
-replace&quot; and &quot;go to line and column
-number&quot;.</p>
-
 <p style="margin-left:11%; margin-top: 1em">The
 <i>nanorc</i> file contains the default settings for
-<b>nano</b>. It should not be in DOS or Mac format. During
-startup, <b>nano</b> will first read its system-wide
-settings from <i>SYSCONFDIR/nanorc</i>, and then
-user-specific settings from <i>~/.nanorc</i>.</p>
+<b>nano</b>, a small and friendly editor. The file should be
+in Unix format, not in DOS or Mac format. During startup,
+<b>nano</b> will first read the system-wide settings, from
+<b>/etc/nanorc</b> (the exact path might be different), and
+then the user-specific settings, from <b>~/.nanorc</b>.</p>
 
 <h2>OPTIONS
 <a name="OPTIONS"></a>
@@ -71,150 +61,182 @@ user-specific settings from <i>~/.nanorc</i>.</p>
 <p style="margin-left:11%; margin-top: 1em">The
 configuration file accepts a series of <b>set</b> and
 <b>unset</b> commands, which can be used to configure nano
-on startup without using the command line options.
-Additionally, the <b>syntax</b>, <b>color</b>, and
-<b>icolor</b> keywords are used to define syntax
-highlighting rules for different text patterns. <b>nano</b>
-will read one command per line.</p>
+on startup without using command-line options. Additionally,
+there are some commands to define syntax highlighting and to
+rebind keys -- see the two separate sections on those.
+<b>nano</b> reads one command per line.</p>
 
 <p style="margin-left:11%; margin-top: 1em">Options in
 <i>nanorc</i> files take precedence over nano&rsquo;s
-defaults, and command line options override <i>nanorc</i>
-settings. Also, options are unset by default, except for
-those that take arguments.</p>
-
-<p style="margin-left:11%; margin-top: 1em">Quotes inside
-string parameters don&rsquo;t have to be escaped with
-backslashes. The last double quote in the string will be
-treated as its end. For example, for the <b>brackets</b>
-option, &quot;<i>&quot;&rsquo;)&gt;]}</i>&quot; will match
-<i>&quot;</i>, <i>&rsquo;</i>, <i>)</i>, <i>&gt;</i>,
-<i>]</i>, and <i>}</i>.</p>
+defaults, and command-line options override <i>nanorc</i>
+settings. Also, options that do not take an argument are
+unset by default. So using the <b>unset</b> command is only
+needed when wanting to override a setting of the
+system&rsquo;s <i>nanorc</i> file in your own
+<b>~/.nanorc</b>. Options that take an argument cannot be
+unset.</p>
+
+<p style="margin-left:11%; margin-top: 1em">Below, the
+<i>string</i> parameters need to be enclosed in double
+quotes. Quotes inside these string parameters don&rsquo;t
+have to be escaped with backslashes. The last double quote
+in the string will be treated as its end. For example, for
+the <b>brackets</b> option,
+&quot;<b>&quot;&rsquo;)&gt;]}</b>&quot; will match
+<b>&quot;</b>, <b>&rsquo;</b>, <b>)</b>, <b>&gt;</b>,
+<b>]</b>, and <b>}</b>.</p>
 
 <p style="margin-left:11%; margin-top: 1em">The supported
 commands and arguments are: <b><br>
-set/unset allow_insecure_backup</b></p>
+set allow_insecure_backup</b></p>
 
 <p style="margin-left:15%;">When backing up files, allow
 the backup to succeed even if its permissions can&rsquo;t be
 (re)set due to special OS considerations. You should NOT
 enable this option unless you are sure you need it.</p>
 
-<p style="margin-left:11%;"><b>set/unset autoindent</b></p>
+<p style="margin-left:11%;"><b>set autoindent</b></p>
 
 <p style="margin-left:15%;">Use auto-indentation.</p>
 
-<p style="margin-left:11%;"><b>set/unset backup</b></p>
+<p style="margin-left:11%;"><b>set backup</b></p>
 
-<p style="margin-left:15%;">Create backup files in
-<i>filename~</i>.</p>
+<p style="margin-left:15%;">Create backup files by adding a
+tilde (<b>~</b>) to each file&rsquo;s name.</p>
 
 <p style="margin-left:11%;"><b>set backupdir</b>
 <i>directory</i></p>
 
 <p style="margin-left:15%;">Set the directory where
-<b>nano</b> puts unique backup files if file backups are
+<b>nano</b> puts unique backup files, if file backups are
 enabled.</p>
 
-<p style="margin-left:11%;"><b>set/unset backwards</b></p>
+<p style="margin-left:11%;"><b>set backwards</b></p>
 
 <p style="margin-left:15%;">Do backwards searches by
 default.</p>
 
-<p style="margin-left:11%;"><b>set/unset boldtext</b></p>
+<p style="margin-left:11%;"><b>set boldtext</b></p>
 
-<p style="margin-left:15%;">Use bold text instead of
-reverse video text.</p>
+<p style="margin-left:15%;">Use bold instead of reverse
+video for the titlebar, statusbar, key combos, and selected
+text. This can be overridden for the first three by setting
+the options <b>titlecolor</b>, <b>statuscolor</b>, and
+<b>keycolor</b>.</p>
 
 <p style="margin-left:11%;"><b>set brackets</b>
 <i>string</i></p>
 
 <p style="margin-left:15%;">Set the characters treated as
-closing brackets when justifying paragraphs. They cannot
-contain blank characters. Only closing punctuation,
-optionally followed by closing brackets, can end sentences.
-The default value is
-&quot;<i>&quot;&rsquo;)&gt;]}</i>&quot;.</p>
+closing brackets when justifying paragraphs. This may not
+include blank characters. Only closing punctuation (see
+<b>punct</b>), optionally followed by the specified closing
+brackets, can end sentences. The default value is
+&quot;<b>&quot;&rsquo;)&gt;]}</b>&quot;.</p>
 
-<p style="margin-left:11%;"><b>set/unset
-casesensitive</b></p>
+<p style="margin-left:11%;"><b>set casesensitive</b></p>
 
-<p style="margin-left:15%;">Do case sensitive searches by
+<p style="margin-left:15%;">Do case-sensitive searches by
 default.</p>
 
-<p style="margin-left:11%;"><b>set/unset const</b></p>
+<p style="margin-left:11%;"><b>set const</b></p>
 
 <p style="margin-left:15%;">Constantly display the cursor
 position in the status bar.</p>
 
-<p style="margin-left:11%;"><b>set/unset cut</b></p>
+<p style="margin-left:11%;"><b>set cut</b></p>
 
-<p style="margin-left:15%;">Use cut to end of line by
-default.</p>
+<p style="margin-left:15%;">Use cut-to-end-of-line by
+default, instead of cutting the whole line.</p>
+
+<p style="margin-left:11%;"><b>set fill</b>
+<i>number</i></p>
+
+<p style="margin-left:15%;">Hard-wrap lines at column
+number <i>number</i>. If <i>number</i> is 0 or less, the
+maximum line length will be the screen width less
+<i>number</i> columns. The default value is
+<b>&minus;8</b>.</p>
+
+<p style="margin-left:11%;"><b>set functioncolor</b>
+<i>fgcolor</i>,<i>bgcolor</i></p>
+
+<p style="margin-left:15%;">Specify the color combination
+to use for the function descriptions in the two help lines
+at the bottom of the screen. See <b>set titlecolor</b> for
+more details.</p>
+
+<p style="margin-left:11%;"><b>set historylog</b></p>
 
-<p style="margin-left:11%;"><b>set fill</b> <i>n</i></p>
+<p style="margin-left:15%;">Enable the use of
+<b>~/.nano/search_history</b> for saving and reading
+search/replace strings.</p>
 
-<p style="margin-left:15%;">Wrap lines at column number
-<i>n</i>. If <i>n</i> is 0 or less, the maximum line length
-will be the screen width less <i>n</i> columns. The default
-value is &minus;8.</p>
+<p style="margin-left:11%;"><b>set keycolor</b>
+<i>fgcolor</i>,<i>bgcolor</i></p>
 
-<p style="margin-left:11%;"><b>set/unset historylog</b></p>
+<p style="margin-left:15%;">Specify the color combination
+to use for the shortcut key combos in the two help lines at
+the bottom of the screen. See <b>set titlecolor</b> for more
+details.</p>
 
-<p style="margin-left:15%;">Enable <i>~/.nano_history</i>
-for saving and reading search/replace strings.</p>
+<p style="margin-left:11%;"><b>set locking</b></p>
+
+<p style="margin-left:15%;">Enable vim-style lock-files for
+when editing files.</p>
 
 <p style="margin-left:11%;"><b>set matchbrackets</b>
 <i>string</i></p>
 
 <p style="margin-left:15%;">Set the opening and closing
-brackets that can be found by bracket searches. They cannot
-contain blank characters. The former set must come before
-the latter set, and both must be in the same order. The
-default value is &quot;<i>(&lt;[{)&gt;]}</i>&quot;.</p>
+brackets that can be found by bracket searches. This may not
+include blank characters. The opening set must come before
+the closing set, and the two sets must be in the same order.
+The default value is &quot;<b>(&lt;[{)&gt;]}</b>&quot;.</p>
 
-<p style="margin-left:11%;"><b>set/unset morespace</b></p>
+<p style="margin-left:11%;"><b>set morespace</b></p>
 
 <p style="margin-left:15%;">Use the blank line below the
 titlebar as extra editing space.</p>
 
-<p style="margin-left:11%;"><b>set/unset mouse</b></p>
+<p style="margin-left:11%;"><b>set mouse</b></p>
 
 <p style="margin-left:15%;">Enable mouse support, if
 available for your system. When enabled, mouse clicks can be
 used to place the cursor, set the mark (with a double
 click), and execute shortcuts. The mouse will work in the X
-Window System, and on the console when gpm is running.</p>
+Window System, and on the console when gpm is running. Text
+can still be selected through dragging by holding down the
+Shift key.</p>
 
-<p style="margin-left:11%;"><b>set/unset
-multibuffer</b></p>
+<p style="margin-left:11%;"><b>set multibuffer</b></p>
 
 <p style="margin-left:15%;">Allow inserting files into
 their own buffers.</p>
 
-<p style="margin-left:11%;"><b>set/unset noconvert</b></p>
+<p style="margin-left:11%;"><b>set noconvert</b></p>
 
 <p style="margin-left:15%;">Don&rsquo;t convert files from
 DOS/Mac format.</p>
 
-<p style="margin-left:11%;"><b>set/unset nofollow</b></p>
+<p style="margin-left:11%;"><b>set nofollow</b></p>
 
 <p style="margin-left:15%;">Don&rsquo;t follow symlinks
 when writing files.</p>
 
-<p style="margin-left:11%;"><b>set/unset nohelp</b></p>
+<p style="margin-left:11%;"><b>set nohelp</b></p>
 
-<p style="margin-left:15%;">Don&rsquo;t display the help
-lists at the bottom of the screen.</p>
+<p style="margin-left:15%;">Don&rsquo;t display the two
+help lines at the bottom of the screen.</p>
 
-<p style="margin-left:11%;"><b>set/unset nonewlines</b></p>
+<p style="margin-left:11%;"><b>set nonewlines</b></p>
 
-<p style="margin-left:15%;">Don&rsquo;t add newlines to the
-ends of files.</p>
+<p style="margin-left:15%;">Don&rsquo;t automatically add a
+newline to the ends of files.</p>
 
-<p style="margin-left:11%;"><b>set/unset nowrap</b></p>
+<p style="margin-left:11%;"><b>set nowrap</b></p>
 
-<p style="margin-left:15%;">Don&rsquo;t wrap text at
+<p style="margin-left:15%;">Don&rsquo;t hard-wrap text at
 all.</p>
 
 <p style="margin-left:11%;"><b>set operatingdir</b>
@@ -223,10 +245,15 @@ all.</p>
 <p style="margin-left:15%;"><b>nano</b> will only read and
 write files inside <i>directory</i> and its subdirectories.
 Also, the current directory is changed to here, so files are
-inserted from this diractory. By default, the operating
+inserted from this directory. By default, the operating
 directory feature is turned off.</p>
 
-<p style="margin-left:11%;"><b>set/unset preserve</b></p>
+<p style="margin-left:11%;"><b>set poslog</b></p>
+
+<p style="margin-left:15%;">Save the cursor position of
+files between editing sessions.</p>
+
+<p style="margin-left:11%;"><b>set preserve</b></p>
 
 <p style="margin-left:15%;">Preserve the XON and XOFF keys
 (^Q and ^S).</p>
@@ -235,25 +262,26 @@ directory feature is turned off.</p>
 <i>string</i></p>
 
 <p style="margin-left:15%;">Set the characters treated as
-closing punctuation when justifying paragraphs. They cannot
-contain blank characters. Only closing punctuation,
-optionally followed by closing brackets, can end sentences.
-The default value is &quot;<i>!.?</i>&quot;.</p>
-
-<p style="margin-left:11%;"><b>set/unset quiet</b></p>
-
-<p style="margin-left:15%;"><b>nano</b> will not report
-errors in the <i>nanorc</i> file and ask them to be
-acknowledged by pressing enter at startup. If this is used
-it should be placed at the top of the file to be fully
-effective.</p>
+closing punctuation when justifying paragraphs. This may not
+include blank characters. Only the specfified closing
+punctuation, optionally followed by closing brackets (see
+<b>brackets</b>), can end sentences. The default value is
+&quot;<b>!.?</b>&quot;.</p>
 
-<p style="margin-left:11%;"><b>set/unset quickblank</b></p>
+<p style="margin-left:11%;"><b>set quickblank</b></p>
 
 <p style="margin-left:15%;">Do quick statusbar blanking.
 Statusbar messages will disappear after 1 keystroke instead
 of 25.</p>
 
+<p style="margin-left:11%;"><b>set quiet</b></p>
+
+<p style="margin-left:15%;"><b>nano</b> will not report
+errors in the <i>nanorc</i> file nor ask them to be
+acknowledged by pressing Enter at startup. If this is used,
+it should be placed at the top of the file to be fully
+effective.</p>
+
 <p style="margin-left:11%;"><b>set quotestr</b>
 <i>string</i></p>
 
@@ -261,33 +289,31 @@ of 25.</p>
 justify email-quoted paragraphs. This is an extended regular
 expression if your system supports them, otherwise a literal
 string. The default value is
-&quot;<i>^([&nbsp;\t]*[#:&gt;\|}])+</i>&quot; if you have
-extended regular expression support, or
-&quot;<i>&gt;&nbsp;</i>&quot; otherwise. Note that
+&quot;<b>^([&nbsp;\t]*[#:&gt;\|}])+</b>&quot; if you have
+extended regular expression support, and
+&quot;<b>&gt;&nbsp;</b>&quot; otherwise. Note that
 &rsquo;\t&rsquo; stands for a literal Tab character.</p>
 
-<p style="margin-left:11%;"><b>set/unset
-rebinddelete</b></p>
+<p style="margin-left:11%;"><b>set rebinddelete</b></p>
 
 <p style="margin-left:15%;">Interpret the Delete key
 differently so that both Backspace and Delete work properly.
 You should only need to use this option if Backspace acts
 like Delete on your system.</p>
 
-<p style="margin-left:11%;"><b>set/unset
-rebindkeypad</b></p>
+<p style="margin-left:11%;"><b>set rebindkeypad</b></p>
 
 <p style="margin-left:15%;">Interpret the numeric keypad
 keys so that they all work properly. You should only need to
 use this option if they don&rsquo;t, as mouse support
 won&rsquo;t work properly with this option enabled.</p>
 
-<p style="margin-left:11%;"><b>set/unset regexp</b></p>
+<p style="margin-left:11%;"><b>set regexp</b></p>
 
 <p style="margin-left:15%;">Do extended regular expression
 searches by default.</p>
 
-<p style="margin-left:11%;"><b>set/unset smarthome</b></p>
+<p style="margin-left:11%;"><b>set smarthome</b></p>
 
 <p style="margin-left:15%;">Make the Home key smarter. When
 Home is pressed anywhere but at the very beginning of
@@ -296,15 +322,15 @@ that beginning (either forwards or backwards). If the cursor
 is already at that position, it will jump to the true
 beginning of the line.</p>
 
-<p style="margin-left:11%;"><b>set/unset smooth</b></p>
+<p style="margin-left:11%;"><b>set smooth</b></p>
 
 <p style="margin-left:15%;">Use smooth scrolling by
 default.</p>
 
-<p style="margin-left:11%;"><b>set/unset softwrap</b></p>
+<p style="margin-left:11%;"><b>set softwrap</b></p>
 
 <p style="margin-left:15%;">Enable soft line wrapping for
-easier viewing of very long lones.</p>
+easier viewing of very long lines.</p>
 
 <p style="margin-left:11%;"><b>set speller</b>
 <i>spellprog</i></p>
@@ -313,100 +339,161 @@ easier viewing of very long lones.</p>
 <i>spellprog</i> instead of the built-in one, which calls
 <i>spell</i>.</p>
 
-<p style="margin-left:11%;"><b>set/unset suspend</b></p>
+<p style="margin-left:11%;"><b>set statuscolor</b>
+<i>fgcolor</i>,<i>bgcolor</i></p>
+
+<p style="margin-left:15%;">Specify the color combination
+to use for the statusbar. See <b>set titlecolor</b> for more
+details.</p>
+
+<p style="margin-left:11%;"><b>set suspend</b></p>
 
 <p style="margin-left:15%;">Allow <b>nano</b> to be
 suspended.</p>
 
-<p style="margin-left:11%;"><b>set tabsize</b> <i>n</i></p>
+<p style="margin-left:11%;"><b>set tabsize</b>
+<i>number</i></p>
 
-<p style="margin-left:15%;">Use a tab size of <i>n</i>
-columns. The value of <i>n</i> must be greater than 0. The
-default value is 8.</p>
+<p style="margin-left:15%;">Use a tab size of <i>number</i>
+columns. The value of <i>number</i> must be greater than 0.
+The default value is <b>8</b>.</p>
 
-<p style="margin-left:11%;"><b>set/unset
-tabstospaces</b></p>
+<p style="margin-left:11%;"><b>set tabstospaces</b></p>
 
 <p style="margin-left:15%;">Convert typed tabs to
 spaces.</p>
 
-<p style="margin-left:11%;"><b>set/unset tempfile</b></p>
+<p style="margin-left:11%;"><b>set tempfile</b></p>
 
 <p style="margin-left:15%;">Save automatically on exit,
 don&rsquo;t prompt.</p>
 
-<p style="margin-left:11%;"><b>set/unset undo</b></p>
+<p style="margin-left:11%;"><b>set titlecolor</b>
+<i>fgcolor</i>,<i>bgcolor</i></p>
 
-<p style="margin-left:15%;">Enable experimental
-generic-purpose undo code.</p>
+<p style="margin-left:15%;">Specify the color combination
+to use for the titlebar. Valid color names for foreground
+and background are:
+<b>white</b>,&nbsp;<b>black</b>,&nbsp;<b>red</b>,&nbsp;<b>blue</b>,&nbsp;<b>green</b>,&nbsp;<b>yellow</b>,&nbsp;<b>magenta</b>,
+and <b>cyan</b>. And either &quot;<i>fgcolor</i>&quot; or
+&quot;,<i>bgcolor</i>&quot; may be left out.</p>
 
-<p style="margin-left:11%;"><b>set/unset view</b></p>
+<p style="margin-left:11%;"><b>set view</b></p>
 
 <p style="margin-left:15%;">Disallow file modification.</p>
 
-<p style="margin-left:11%;"><b>set/unset softwrap</b></p>
-
-<p style="margin-left:15%;">Enable soft line wrapping for
-easier viewing of very long lones.</p>
-
 <p style="margin-left:11%;"><b>set whitespace</b>
 <i>string</i></p>
 
 <p style="margin-left:15%;">Set the two characters used to
-display the first characters of tabs and spaces. They must
-be single-column characters.</p>
+indicate the presence of tabs and spaces. They must be
+single-column characters.</p>
 
-<p style="margin-left:11%;"><b>set/unset wordbounds</b></p>
+<p style="margin-left:11%;"><b>set wordbounds</b></p>
 
 <p style="margin-left:15%;">Detect word boundaries more
 accurately by treating punctuation characters as parts of
 words.</p>
 
-<p style="margin-left:11%;"><b>syntax</b> <i>str</i>
-<b>[&quot;</b><i>fileregex</i><b>&quot; ... ]</b></p>
+<h2>SYNTAX HIGHLIGHTING
+<a name="SYNTAX HIGHLIGHTING"></a>
+</h2>
 
-<p style="margin-left:15%;">Defines a syntax named
-<i>str</i> which can be activated via the
-&minus;Y/&minus;&minus;syntax command line option, or will
-be automatically activated if the current filename matches
-the extended regular expression <i>fileregex</i>. All
-following <b>color</b> and <b>icolor</b> statements will
-apply to <i>syntax</i> until a new syntax is defined.</p>
 
-<p style="margin-left:15%; margin-top: 1em">The <i>none</i>
+<p style="margin-left:11%; margin-top: 1em">Coloring the
+different syntactic elements of a file is done via regular
+expressions (see the <b>color</b> command below). This is
+inherently imperfect, because regular expressions are not
+powerful enough to fully parse a file. Nevertheless, regular
+expressions can do a lot and are easy to make, so they are a
+good fit for a small editor like <b>nano</b>.</p>
+
+<p style="margin-left:11%; margin-top: 1em">A separate
+syntax can be defined for each kind of file via the
+following commands: <b><br>
+syntax</b> &quot;<i>str</i>&quot;
+[&quot;<i>fileregex</i>&quot; ...]</p>
+
+<p style="margin-left:22%;">Defines a syntax named
+<i>str</i> which can be activated via the
+<b>&minus;Y</b>/<b>&minus;&minus;syntax</b> command-line
+option, or will be automatically activated if the current
+filename matches the extended regular expression
+<i>fileregex</i>. All following <b>color</b> and
+<b>icolor</b> statements will apply to this <i>str</i>
+syntax until a new syntax is defined.</p>
+
+<p style="margin-left:22%; margin-top: 1em">The <b>none</b>
 syntax is reserved; specifying it on the command line is the
-same as not having a syntax at all. The <i>default</i>
+same as not having a syntax at all. The <b>default</b>
 syntax is special: it takes no <i>fileregex</i>, and applies
 to files that don&rsquo;t match any other syntax&rsquo;s
 <i>fileregex</i>.</p>
 
+<p style="margin-left:11%;"><b>linter</b> <i>program</i>
+[<i>arg</i> ...]</p>
+
+<p style="margin-left:22%;">For the currently defined
+syntax, use the given <i>program</i> to invoke the linter
+(this overrides the speller function when defined).</p>
+
+<p style="margin-left:11%;"><b>formatter</b> <i>program</i>
+[<i>arg</i> ...]</p>
+
+<p style="margin-left:22%;">For the currently defined
+syntax, use the given <i>program</i> to automatically
+reformat text. Useful in certain programming languages (e.g.
+go).</p>
+
+<p style="margin-left:11%;"><b>header</b> <i>regex</i>
+<b>...</b></p>
+
+<p style="margin-left:22%;">For the currently defined
+syntax, add one or more regexes which will be compared
+against the very first line of the file to be edited, to
+determine whether this syntax should be used for that
+file.</p>
+
+<p style="margin-left:11%;"><b>magic</b> <i>regex</i>
+<b>...</b></p>
+
+<p style="margin-left:22%;">For the currently defined
+syntax, add one or more regexes which will be compared
+against the result of querying the <b>magic</b> database
+about the file to be edited, to determine whether this
+syntax should be used for that file. This functionality only
+works when <b>libmagic</b> is installed on the system and
+will be silently ignored otherwise.</p>
+
 <p style="margin-left:11%;"><b>color</b>
-<i>fgcolor</i><b>,</b><i>bgcolor regex</i> <b>...</b></p>
+<i>fgcolor</i>,<i>bgcolor</i> &quot;<i>regex</i>&quot;
+...</p>
 
-<p style="margin-left:15%;">For the currently defined
+<p style="margin-left:22%;">For the currently defined
 syntax, display all expressions matching the extended
 regular expression <i>regex</i> with foreground color
 <i>fgcolor</i> and background color <i>bgcolor</i>, at least
-one of which must be specified. Legal colors for foreground
-and background color are: white, black, red, blue, green,
-yellow, magenta, and cyan. You may use the prefix
-&quot;bright&quot; to force a stronger color highlight for
-the foreground. If your terminal supports transparency, not
-specifying a <i>bgcolor</i> tells <b>nano</b> to attempt to
-use a transparent background.</p>
+one of which must be specified. Valid colors for foreground
+and background are: white, black, red, blue, green, yellow,
+magenta, and cyan. You may use the prefix &quot;bright&quot;
+to get a stronger color highlight for the foreground. If
+your terminal supports transparency, not specifying a
+<i>bgcolor</i> tells <b>nano</b> to attempt to use a
+transparent background.</p>
 
 <p style="margin-left:11%;"><b>icolor</b>
-<i>fgcolor</i><b>,</b><i>bgcolor regex</i> <b>...</b></p>
+<i>fgcolor</i>,<i>bgcolor</i> &quot;<i>regex</i>&quot;
+...</p>
 
-<p style="margin-left:15%;">Same as above, except that the
+<p style="margin-left:22%;">Same as above, except that the
 expression matching is case insensitive.</p>
 
 <p style="margin-left:11%;"><b>color</b>
-<i>fgcolor</i><b>,</b><i>bgcolor</i>
-<b>start=&quot;</b><i>sr</i><b>&quot;
-end=&quot;</b><i>er</i><b>&quot;</b></p>
+<i>fgcolor</i>,<i>bgcolor</i>
+<b>start=</b>&quot;<i>sr</i>&quot;
+<b>end=</b>&quot;<i>er</i>&quot;</p>
 
-<p style="margin-left:15%;">Display expressions which start
+<p style="margin-left:22%;">Display expressions which start
 with the extended regular expression <i>sr</i> and end with
 the extended regular expression <i>er</i> with foreground
 color <i>fgcolor</i> and background color <i>bgcolor</i>, at
@@ -417,23 +504,34 @@ is found will be highlighted until the first instance of
 <i>er</i>.</p>
 
 <p style="margin-left:11%;"><b>icolor</b>
-<i>fgcolor</i><b>,</b><i>bgcolor</i>
-<b>start=&quot;</b><i>sr</i><b>&quot;
-end=&quot;</b><i>er</i><b>&quot;</b></p>
+<i>fgcolor</i>,<i>bgcolor</i>
+<b>start=</b>&quot;<i>sr</i>&quot;
+<b>end=</b>&quot;<i>er</i>&quot;</p>
 
-<p style="margin-left:15%;">Same as above, except that the
+<p style="margin-left:22%;">Same as above, except that the
 expression matching is case insensitive.</p>
 
 <p style="margin-left:11%;"><b>include</b>
-<i>syntaxfile</i></p>
+&quot;<i>syntaxfile</i>&quot;</p>
 
-<p style="margin-left:15%;">Read in self-contained color
+<p style="margin-left:22%;">Read in self-contained color
 syntaxes from <i>syntaxfile</i>. Note that <i>syntaxfile</i>
-can only contain <b>syntax</b>, <b>color</b>, and
-<b>icolor</b> commands.</p>
-
-<h2>KEY BINDINGS
-<a name="KEY BINDINGS"></a>
+can only contain the above commands, from <b>syntax</b> to
+<b>icolor</b>.</p>
+
+<p style="margin-left:11%;"><b>extendsyntax</b> <i>str
+directive</i> [<i>arg</i> ...]</p>
+
+<p style="margin-left:22%;">Extend the syntax previously
+defined as <i>str</i> to include new information. This
+allows you to add a new <i>color</i>, <i>icolor</i>,
+<i>magic</i>, <i>header</i>, or <i>linter</i> directive to
+an already defined syntax -- useful when you want to add to
+definitions from the system-installed syntax definitions
+(which are normally not writable).</p>
+
+<h2>REBINDING KEYS
+<a name="REBINDING KEYS"></a>
 </h2>
 
 
@@ -443,481 +541,568 @@ bind</b> <i>key function menu</i></p>
 
 <p style="margin-left:22%;">Rebinds the key <i>key</i> to a
 new function named <i>function</i> in the context of menu
-<i>menu</i>. The format of <i>key</i> should be one of:</p>
+<i>menu</i> (or in all menus where the function exists by
+using <b>all</b>).</p>
+
+<p style="margin-left:11%;"><b>unbind</b> <i>key
+menu</i></p>
+
+<p style="margin-left:22%;">Unbinds the key <i>key</i> from
+the menu named <i>menu</i> (or from all menus where it
+exists by using <b>all</b>).</p>
+
+<p style="margin-left:11%;">The format of <i>key</i> should
+be one of:</p>
 
 <table width="100%" border="0" rules="none" frame="void"
        cellspacing="0" cellpadding="0">
 <tr valign="top" align="left">
-<td width="11%"></td>
+<td width="15%"></td>
 <td width="3%">
 
 
 <p><b>^</b></p></td>
-<td width="8%"></td>
-<td width="78%">
+<td width="2%"></td>
+<td width="80%">
 
 
 <p>followed by an alpha character or the word
 &quot;Space&quot;. Example: ^C</p></td></tr>
 <tr valign="top" align="left">
-<td width="11%"></td>
+<td width="15%"></td>
 <td width="3%">
 
 
 <p><b>M-</b></p></td>
-<td width="8%"></td>
-<td width="78%">
+<td width="2%"></td>
+<td width="80%">
 
 
 <p>followed by a printable character or the word
 &quot;Space&quot;. Example: M-C</p></td></tr>
 <tr valign="top" align="left">
-<td width="11%"></td>
+<td width="15%"></td>
 <td width="3%">
 
 
 <p><b>F</b></p></td>
-<td width="8%"></td>
-<td width="78%">
+<td width="2%"></td>
+<td width="80%">
 
 
 <p>followed by a numeric value from 1 to 16. Example:
 F10</p> </td></tr>
 </table>
 
-<p style="margin-left:11%;">Valid function names to be
-bound include: <b><br>
-help</b></p>
-
-<p style="margin-left:15%;">Invoke the help menu.</p>
+<p style="margin-left:11%;">Valid <i>function</i> names to
+be bound include:</p>
 
-<p style="margin-left:11%;"><b>cancel</b></p>
+<p style="margin-left:15%;"><b>help</b></p>
 
-<p style="margin-left:15%;">Cancel the current command.</p>
+<p style="margin-left:18%;">Invokes the help viewer.</p>
 
-<p style="margin-left:11%;"><b>exit</b></p>
+<p style="margin-left:15%;"><b>cancel</b></p>
 
-<p style="margin-left:15%;">Exit from the program.</p>
+<p style="margin-left:18%;">Cancels the current
+command.</p>
 
-<p style="margin-left:11%;"><b>writeout</b></p>
+<p style="margin-left:15%;"><b>exit</b></p>
 
-<p style="margin-left:15%;">Write the current buffer to
-disk.</p>
+<p style="margin-left:18%;">Exits from the program (or from
+the help viewer or the file browser).</p>
 
-<p style="margin-left:11%;"><b>justify</b></p>
+<p style="margin-left:15%;"><b>writeout</b></p>
 
-<p style="margin-left:15%;">Justify the current text.</p>
+<p style="margin-left:18%;">Writes the current buffer to
+disk.</p>
 
-<p style="margin-left:11%;"><b>insert</b></p>
+<p style="margin-left:15%;"><b>insert</b></p>
 
-<p style="margin-left:15%;">Insert a file into the current
+<p style="margin-left:18%;">Inserts a file into the current
 buffer (or into a new buffer when multibuffer is
 enabled).</p>
 
-<p style="margin-left:11%;"><b>whereis</b></p>
+<p style="margin-left:15%;"><b>whereis</b></p>
 
-<p style="margin-left:15%;">Search for text in the current
-buffer.</p>
+<p style="margin-left:18%;">Searches for text in the
+current buffer -- or for filenames matching a string in the
+current list in the file browser.</p>
 
-<p style="margin-left:11%;"><b>searchagain</b></p>
+<p style="margin-left:15%;"><b>searchagain</b></p>
 
-<p style="margin-left:15%;">Repeat the last search
+<p style="margin-left:18%;">Repeats the last search
 command.</p>
 
-<table width="100%" border="0" rules="none" frame="void"
-       cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
+<p style="margin-left:15%;"><b>replace</b></p>
 
+<p style="margin-left:18%;">Interactively replaces text
+within the current buffer.</p>
 
-<p><b>up</b></p></td>
-<td width="1%"></td>
-<td width="51%">
+<p style="margin-left:15%;"><b>cut</b></p>
 
+<p style="margin-left:18%;">Cuts and stores the current
+line (or the marked region).</p>
 
-<p>Move up in the editor or browser.</p></td>
-<td width="34%">
-</td></tr>
-</table>
+<p style="margin-left:15%;"><b>copytext</b></p>
 
-<p style="margin-left:11%;"><b>down</b></p>
+<p style="margin-left:18%;">Copies the current line (or the
+marked region) without deleting it.</p>
 
-<p style="margin-left:15%;">Move down in the editor or
-browser.</p>
+<p style="margin-left:15%;"><b>uncut</b></p>
 
-<p style="margin-left:11%;"><b>left</b></p>
+<p style="margin-left:18%;">Copies the currently stored
+text into the current buffer at the current cursor
+position.</p>
 
-<p style="margin-left:15%;">Move left in the editor or
-browser.</p>
+<p style="margin-left:15%;"><b>mark</b></p>
 
-<p style="margin-left:11%;"><b>right</b></p>
+<p style="margin-left:18%;">Sets the mark at the current
+position, to start selecting text.</p>
 
-<p style="margin-left:15%;">Move right in the editor or
-browser.</p>
+<p style="margin-left:15%;"><b>cutrestoffile</b></p>
 
-<p style="margin-left:11%;"><b>cut</b></p>
+<p style="margin-left:18%;">Cuts all text from the cursor
+position till the end of the buffer.</p>
 
-<p style="margin-left:15%;">Cut the current line of text
-and store it.</p>
+<p style="margin-left:15%;"><b>curpos</b></p>
 
-<p style="margin-left:11%;"><b>uncut</b></p>
+<p style="margin-left:18%;">Shows the current cursor
+position: the line, column, and character positions.</p>
 
-<p style="margin-left:15%;">Copy the currently stored text
-into the current buffer position.</p>
+<p style="margin-left:15%;"><b>wordcount</b></p>
 
-<p style="margin-left:11%;"><b>curpos</b></p>
+<p style="margin-left:18%;">Counts the number of words,
+lines and characters in the current buffer.</p>
 
-<p style="margin-left:15%;">Show the current line, column,
-word positions in the file.</p>
+<p style="margin-left:15%;"><b>speller</b></p>
 
-<p style="margin-left:11%;"><b>firstline</b></p>
+<p style="margin-left:18%;">Invokes a spell-checking
+program (or a linting program, if the current syntax
+highlighting defines one).</p>
 
-<p style="margin-left:15%;">Move to the first line of the
-file.</p>
+<p style="margin-left:15%;"><b>justify</b></p>
 
-<p style="margin-left:11%;"><b>lastline</b></p>
+<p style="margin-left:18%;">Justifies the current
+paragraph.</p>
 
-<p style="margin-left:15%;">Move to the last line of the
-file.</p>
+<p style="margin-left:15%;"><b>fulljustify</b></p>
 
-<p style="margin-left:11%;"><b>gotoline</b></p>
+<p style="margin-left:18%;">Justifies the entire current
+buffer.</p>
 
-<p style="margin-left:15%;">Move to a specific line (and
-column if specified).</p>
+<p style="margin-left:15%;"><b>indent</b></p>
 
-<p style="margin-left:11%;"><b>replace</b></p>
+<p style="margin-left:18%;">Indents (shifts to the right)
+the currently marked text.</p>
 
-<p style="margin-left:15%;">Interactively replace text
-within the current buffer.</p>
+<p style="margin-left:15%;"><b>unindent</b></p>
+
+<p style="margin-left:18%;">Unindents (shifts to the left)
+the currently marked text.</p>
+
+<p style="margin-left:15%;"><b>left</b></p>
 
-<p style="margin-left:11%;"><b>mark</b></p>
+<p style="margin-left:18%;">Goes left one position (in the
+editor or browser).</p>
 
-<p style="margin-left:15%;">Begin selecting text for
-cutting or pasting at the current position.</p>
+<p style="margin-left:15%;"><b>right</b></p>
 
-<p style="margin-left:11%;"><b>copytext</b></p>
+<p style="margin-left:18%;">Goes right one position (in the
+editor or browser).</p>
 
-<p style="margin-left:15%;">Copy the currently marked text
-without deleting it.</p>
+<p style="margin-left:15%;"><b>up</b></p>
 
-<p style="margin-left:11%;"><b>indent</b></p>
+<p style="margin-left:18%;">Goes one line up (in the editor
+or browser).</p>
 
-<p style="margin-left:15%;">Indent the currently marked
-text (shift to the right).</p>
+<p style="margin-left:15%;"><b>down</b></p>
 
-<p style="margin-left:11%;"><b>unindent</b></p>
+<p style="margin-left:18%;">Goes one line down (in the
+editor or browser).</p>
 
-<p style="margin-left:15%;">Un-indent the currently marked
-text (shift to the left).</p>
+<p style="margin-left:15%;"><b>scrollup</b></p>
 
-<p style="margin-left:11%;"><b>nextword</b></p>
+<p style="margin-left:18%;">Scrolls up one line of text
+from the current position.</p>
+
+<p style="margin-left:15%;"><b>scrolldown</b></p>
+
+<p style="margin-left:18%;">Scrolls down one line of text
+from the current position.</p>
 
-<p style="margin-left:15%;">Move the cursor to the
+<p style="margin-left:15%;"><b>nextword</b></p>
+
+<p style="margin-left:18%;">Moves the cursor to the
 beginning of the next word.</p>
 
-<p style="margin-left:11%;"><b>prevword</b></p>
+<p style="margin-left:15%;"><b>prevword</b></p>
 
-<p style="margin-left:15%;">Move the cursor to the
+<p style="margin-left:18%;">Moves the cursor to the
 beginning of the previous word.</p>
 
-<p style="margin-left:11%;"><b>home</b></p>
+<p style="margin-left:15%;"><b>home</b></p>
 
-<p style="margin-left:15%;">Move the cursor to the
+<p style="margin-left:18%;">Moves the cursor to the
 beginning of the current line.</p>
 
-<p style="margin-left:11%;"><b>end</b></p>
+<p style="margin-left:15%;"><b>end</b></p>
 
-<p style="margin-left:15%;">Move the cursor to the end of
+<p style="margin-left:18%;">Moves the cursor to the end of
 the current line.</p>
 
-<p style="margin-left:11%;"><b>beginpara</b></p>
+<p style="margin-left:15%;"><b>beginpara</b></p>
 
-<p style="margin-left:15%;">Move the cursor to the
+<p style="margin-left:18%;">Moves the cursor to the
 beginning of the current paragraph.</p>
 
-<p style="margin-left:11%;"><b>endpara</b></p>
+<p style="margin-left:15%;"><b>endpara</b></p>
 
-<p style="margin-left:15%;">Move the cursor to the end of
+<p style="margin-left:18%;">Moves the cursor to the end of
 the current paragraph.</p>
 
-<p style="margin-left:11%;"><b>findbracket</b></p>
+<p style="margin-left:15%;"><b>prevpage</b></p>
 
-<p style="margin-left:15%;">Move the cursor to the matching
-bracket (brace, parenthesis, etc.) of the one under the
-cursor.</p>
+<p style="margin-left:18%;">Goes up one screenful.</p>
 
-<p style="margin-left:11%;"><b>scrollup</b></p>
+<p style="margin-left:15%;"><b>nextpage</b></p>
 
-<p style="margin-left:15%;">Scroll up one line of text from
-the current position.</p>
+<p style="margin-left:18%;">Goes down one screenful.</p>
 
-<p style="margin-left:11%;"><b>scrolldown</b></p>
+<p style="margin-left:15%;"><b>firstline</b></p>
 
-<p style="margin-left:15%;">Scroll down one line of text
-from the current position.</p>
+<p style="margin-left:18%;">Goes to the first line of the
+file.</p>
+
+<p style="margin-left:15%;"><b>lastline</b></p>
+
+<p style="margin-left:18%;">Goes to the last line of the
+file.</p>
 
-<p style="margin-left:11%;"><b>prevbuf</b></p>
+<p style="margin-left:15%;"><b>gotoline</b></p>
 
-<p style="margin-left:15%;">Switch to editing/viewing the
+<p style="margin-left:18%;">Goes to a specific line (and
+column if specified).</p>
+
+<p style="margin-left:15%;"><b>gototext</b></p>
+
+<p style="margin-left:18%;">Switches from targeting a line
+number to searching for text.</p>
+
+<p style="margin-left:15%;"><b>findbracket</b></p>
+
+<p style="margin-left:18%;">Moves the cursor to the bracket
+(brace, parenthesis, etc.) that matches (pairs) with the one
+under the cursor.</p>
+
+<p style="margin-left:15%;"><b>prevbuf</b></p>
+
+<p style="margin-left:18%;">Switches to editing/viewing the
 previous buffer when using multibuffer mode.</p>
 
-<p style="margin-left:11%;"><b>nextbuf</b></p>
+<p style="margin-left:15%;"><b>nextbuf</b></p>
 
-<p style="margin-left:15%;">Switch to editing/viewing the
+<p style="margin-left:18%;">Switches to editing/viewing the
 next buffer when using multibuffer mode.</p>
 
-<p style="margin-left:11%;"><b>verbatim</b></p>
+<p style="margin-left:15%;"><b>verbatim</b></p>
 
-<p style="margin-left:15%;">Insert the next character
+<p style="margin-left:18%;">Inserts the next character
 verbatim into the file.</p>
 
-<p style="margin-left:11%;"><b>tab</b></p>
+<p style="margin-left:15%;"><b>tab</b></p>
 
-<p style="margin-left:15%;">Insert a tab at the current
+<p style="margin-left:18%;">Inserts a tab at the current
 cursor location.</p>
 
-<p style="margin-left:11%;"><b>enter</b></p>
+<p style="margin-left:15%;"><b>enter</b></p>
 
-<p style="margin-left:15%;">Insert a new line below the
+<p style="margin-left:18%;">Inserts a new line below the
 current one.</p>
 
-<p style="margin-left:11%;"><b>delete</b></p>
+<p style="margin-left:15%;"><b>delete</b></p>
 
-<p style="margin-left:15%;">Delete the character under the
+<p style="margin-left:18%;">Deletes the character under the
 cursor.</p>
 
-<p style="margin-left:11%;"><b>fulljustify</b></p>
+<p style="margin-left:15%;"><b>backspace</b></p>
 
-<p style="margin-left:15%;">Justify the entire current
-file.</p>
+<p style="margin-left:18%;">Deletes the character before
+the cursor.</p>
 
-<p style="margin-left:11%;"><b>wordcount</b></p>
+<p style="margin-left:15%;"><b>undo</b></p>
 
-<p style="margin-left:15%;">Count the number of words in
-the current buffer.</p>
+<p style="margin-left:18%;">Undoes the last performed text
+action (add text, delete text, etc).</p>
 
-<p style="margin-left:11%;"><b>refresh</b></p>
+<p style="margin-left:15%;"><b>redo</b></p>
 
-<p style="margin-left:15%;">Refresh the screen.</p>
+<p style="margin-left:18%;">Redoes the last undone action
+(i.e., it undoes an undo).</p>
 
-<p style="margin-left:11%;"><b>undo</b></p>
+<p style="margin-left:15%;"><b>refresh</b></p>
 
-<p style="margin-left:15%;">Undo the text action peformed
-(add text, delete text, etc).</p>
+<p style="margin-left:18%;">Refreshes the screen.</p>
 
-<p style="margin-left:11%;"><b>redo</b></p>
+<p style="margin-left:15%;"><b>suspend</b></p>
 
-<p style="margin-left:15%;">Redo the last undone action
-(i.e., undo an undo).</p>
-
-<p style="margin-left:11%;"><b>suspend</b></p>
-
-<p style="margin-left:15%;">Suspend the editor (if the
-suspend function is enabled, see the
+<p style="margin-left:18%;">Suspends the editor (if the
+suspending function is enabled, see the
 &quot;suspendenable&quot; entry below).</p>
 
-<p style="margin-left:11%;"><b>casesens</b></p>
+<p style="margin-left:15%;"><b>casesens</b></p>
 
-<p style="margin-left:15%;">Toggle case sensitivity in
+<p style="margin-left:18%;">Toggles case sensitivity in
 searching (search/replace menus only).</p>
 
-<p style="margin-left:11%;"><b>regexp</b></p>
+<p style="margin-left:15%;"><b>regexp</b></p>
 
-<p style="margin-left:15%;">Toggle whether
+<p style="margin-left:18%;">Toggles whether
 searching/replacing is based on literal strings or regular
 expressions.</p>
 
-<p style="margin-left:11%;"><b>prevhistory</b></p>
+<p style="margin-left:15%;"><b>backwards</b></p>
+
+<p style="margin-left:18%;">Toggles whether
+searching/replacing goes forward or backward.</p>
+
+<p style="margin-left:15%;"><b>prevhistory</b></p>
 
-<p style="margin-left:15%;">Show the previous history entry
-in the prompt menus (e.g. search).</p>
+<p style="margin-left:18%;">Shows the previous history
+entry in the prompt menus (e.g. search).</p>
 
-<p style="margin-left:11%;"><b>nexthistory</b></p>
+<p style="margin-left:15%;"><b>nexthistory</b></p>
 
-<p style="margin-left:15%;">Show the next history entry in
+<p style="margin-left:18%;">Shows the next history entry in
 the prompt menus (e.g. search).</p>
 
-<p style="margin-left:11%;"><b>dontreplace</b></p>
+<p style="margin-left:15%;"><b>flipreplace</b></p>
+
+<p style="margin-left:18%;">Toggles between searching for
+something and replacing something.</p>
+
+<p style="margin-left:15%;"><b>flipexecute</b></p>
+
+<p style="margin-left:18%;">Toggles between inserting a
+file and executing a command.</p>
 
-<p style="margin-left:15%;">Switch back to searching
-instead of replacing.</p>
+<p style="margin-left:15%;"><b>flipnewbuffer</b></p>
 
-<p style="margin-left:11%;"><b>gototext</b></p>
+<p style="margin-left:18%;">Toggles between inserting into
+the current buffer and into a new empty buffer.</p>
 
-<p style="margin-left:15%;">Search for files matching a
-string in the file browser (reading or writing files).</p>
+<p style="margin-left:15%;"><b>tofiles</b></p>
 
-<p style="margin-left:11%;"><b>dosformat</b></p>
+<p style="margin-left:18%;">Starts the file browser,
+allowing to select a file from a list.</p>
 
-<p style="margin-left:15%;">When writing a file, switch to
-writing a DOS format (CR/LF).</p>
+<p style="margin-left:15%;"><b>gotodir</b></p>
 
-<p style="margin-left:11%;"><b>macformat</b></p>
+<p style="margin-left:18%;">Goes to a directory to be
+specified, allowing to browse anywhere in the
+filesystem.</p>
 
-<p style="margin-left:15%;">When writing a file, switch to
-writing a Mac format.</p>
+<p style="margin-left:15%;"><b>dosformat</b></p>
 
-<p style="margin-left:11%;"><b>append</b></p>
+<p style="margin-left:18%;">When writing a file, switches
+to writing a DOS format (CR/LF).</p>
 
-<p style="margin-left:15%;">When writing a file, append to
+<p style="margin-left:15%;"><b>macformat</b></p>
+
+<p style="margin-left:18%;">When writing a file, switches
+to writing a Mac format.</p>
+
+<p style="margin-left:15%;"><b>append</b></p>
+
+<p style="margin-left:18%;">When writing a file, appends to
 the end instead of overwriting.</p>
 
-<p style="margin-left:11%;"><b>prepend</b></p>
+<p style="margin-left:15%;"><b>prepend</b></p>
 
-<p style="margin-left:15%;">When writing a file,
-&rsquo;prepend&rsquo; (write at the beginning) instead of
+<p style="margin-left:18%;">When writing a file,
+&rsquo;prepends&rsquo; (writes at the beginning) instead of
 overwriting.</p>
 
-<p style="margin-left:11%;"><b>backup</b></p>
+<p style="margin-left:15%;"><b>backup</b></p>
 
-<p style="margin-left:15%;">When writing a file, create a
+<p style="margin-left:18%;">When writing a file, creates a
 backup of the current file.</p>
 
-<p style="margin-left:11%;"><b>firstfile</b></p>
+<p style="margin-left:15%;"><b>firstfile</b></p>
 
-<p style="margin-left:15%;">Move to the first file when
+<p style="margin-left:18%;">Goes to the first file when
 using the file browser (reading or writing files).</p>
 
-<p style="margin-left:11%;"><b>lastfile</b></p>
+<p style="margin-left:15%;"><b>lastfile</b></p>
 
-<p style="margin-left:15%;">Move to the last file when
+<p style="margin-left:18%;">Goes to the last file when
 using the file browser (reading or writing files).</p>
 
-<p style="margin-left:11%;"><b>nohelp</b></p>
+<p style="margin-left:15%;"><b>nohelp</b></p>
 
-<p style="margin-left:15%;">Toggle showing/hiding the
+<p style="margin-left:18%;">Toggles the presence of the
 two-line list of key bindings at the bottom of the
 screen.</p>
 
-<p style="margin-left:11%;"><b>constupdate</b></p>
+<p style="margin-left:15%;"><b>constupdate</b></p>
+
+<p style="margin-left:18%;">Toggles the constant display of
+the current line, column, and character positions.</p>
 
-<p style="margin-left:15%;">Constantly display the current
-line, column, word positions.</p>
+<p style="margin-left:15%;"><b>morespace</b></p>
 
-<p style="margin-left:11%;"><b>morespace</b></p>
+<p style="margin-left:18%;">Toggles the presence of the
+blank line which &rsquo;separates&rsquo; the titlebar from
+the file text.</p>
 
-<p style="margin-left:15%;">Toggle showing/hiding the blank
-line which &rsquo;separates&rsquo; the &rsquo;title&rsquo;
-from the file text.</p>
+<p style="margin-left:15%;"><b>smoothscroll</b></p>
 
-<p style="margin-left:11%;"><b>smoothscroll</b></p>
+<p style="margin-left:18%;">Toggles smooth scrolling (when
+moving around with the arrow keys).</p>
 
-<p style="margin-left:15%;">Toggle smooth scrolling when
-moving via the arrow keys.</p>
+<p style="margin-left:15%;"><b>softwrap</b></p>
 
-<p style="margin-left:11%;"><b>whitespacedisplay</b></p>
+<p style="margin-left:18%;">Toggles the displaying of
+overlong lines on multiple screen lines.</p>
 
-<p style="margin-left:15%;">Toggle whether whitespace is
-shown.</p>
+<p style="margin-left:15%;"><b>whitespacedisplay</b></p>
 
-<p style="margin-left:11%;"><b>smarthome</b></p>
+<p style="margin-left:18%;">Toggles the showing of
+whitespace.</p>
 
-<p style="margin-left:15%;">Toggle whether the smart home
-key function is enabled.</p>
+<p style="margin-left:15%;"><b>nosyntax</b></p>
 
-<p style="margin-left:11%;"><b>autoindent</b></p>
+<p style="margin-left:18%;">Toggles syntax
+highlighting.</p>
 
-<p style="margin-left:15%;">Toggle whether new lines will
-contain the same amount of whitespace as the line above.</p>
+<p style="margin-left:15%;"><b>smarthome</b></p>
 
-<p style="margin-left:11%;"><b>cuttoend</b></p>
+<p style="margin-left:18%;">Toggles the smartness of the
+Home key.</p>
 
-<p style="margin-left:15%;">Toggle whether cutting text
+<p style="margin-left:15%;"><b>autoindent</b></p>
+
+<p style="margin-left:18%;">Toggles whether new lines will
+contain the same amount of whitespace as the preceding
+line.</p>
+
+<p style="margin-left:15%;"><b>cuttoend</b></p>
+
+<p style="margin-left:18%;">Toggles whether cutting text
 will cut the whole line or just from the current cursor
 position to the end of the line.</p>
 
-<p style="margin-left:11%;"><b>nowrap</b></p>
+<p style="margin-left:15%;"><b>nowrap</b></p>
+
+<p style="margin-left:18%;">Toggles whether long lines will
+be hard-wrapped to the next line.</p>
+
+<p style="margin-left:15%;"><b>tabstospaces</b></p>
+
+<p style="margin-left:18%;">Toggles whether typed tabs will
+be converted to spaces.</p>
+
+<p style="margin-left:15%;"><b>backupfile</b></p>
+
+<p style="margin-left:18%;">Toggles whether a backup will
+be made of the file to be edited.</p>
+
+<p style="margin-left:15%;"><b>multibuffer</b></p>
+
+<p style="margin-left:18%;">Toggles the use of multiple
+file buffers (if support for them has been compiled in).</p>
+
+<p style="margin-left:15%;"><b>mouse</b></p>
 
-<p style="margin-left:15%;">Toggle whether long lines will
-be wrapped to the next line.</p>
+<p style="margin-left:18%;">Toggles mouse support.</p>
 
-<p style="margin-left:11%;"><b>suspendenable</b></p>
+<p style="margin-left:15%;"><b>noconvert</b></p>
 
-<p style="margin-left:15%;">Toggle whether the suspend
+<p style="margin-left:18%;">Toggles automatic conversion of
+files from DOS/Mac format.</p>
+
+<p style="margin-left:15%;"><b>suspendenable</b></p>
+
+<p style="margin-left:18%;">Toggles whether the suspend
 sequence (normally ^Z) will suspend the editor window.</p>
 
-<p style="margin-left:11%; margin-top: 1em">Valid menu
-sections are: <b><br>
-main</b></p>
+<p style="margin-left:11%;">Valid <i>menu</i> sections
+are:</p>
 
-<p style="margin-left:15%;">The main editor window where
-text is entered.</p>
+<p style="margin-left:15%;"><b>main</b></p>
 
-<p style="margin-left:11%;"><b>search</b></p>
+<p style="margin-left:18%;">The main editor window where
+text is entered and edited.</p>
 
-<p style="margin-left:15%;">The search menu (AKA
+<p style="margin-left:15%;"><b>search</b></p>
+
+<p style="margin-left:18%;">The search menu (AKA
 whereis).</p>
 
-<p style="margin-left:11%;"><b>replace</b></p>
+<p style="margin-left:15%;"><b>replace</b></p>
 
-<p style="margin-left:15%;">The &rsquo;search to
+<p style="margin-left:18%;">The &rsquo;search to
 replace&rsquo; menu.</p>
 
-<p style="margin-left:11%;"><b>replacewith</b></p>
+<p style="margin-left:15%;"><b>replacewith</b></p>
 
-<p style="margin-left:15%;">The &rsquo;replace with&rsquo;
+<p style="margin-left:18%;">The &rsquo;replace with&rsquo;
 menu, which comes up after &rsquo;search to
 replace&rsquo;.</p>
 
-<p style="margin-left:11%;"><b>gotoline</b></p>
+<p style="margin-left:15%;"><b>gotoline</b></p>
 
-<p style="margin-left:15%;">The &rsquo;goto line (and
+<p style="margin-left:18%;">The &rsquo;goto line (and
 column)&rsquo; menu.</p>
 
-<p style="margin-left:11%;"><b>writeout</b></p>
+<p style="margin-left:15%;"><b>writeout</b></p>
 
-<p style="margin-left:15%;">The &rsquo;write file&rsquo;
+<p style="margin-left:18%;">The &rsquo;write file&rsquo;
 menu.</p>
 
-<p style="margin-left:11%;"><b>insert</b></p>
+<p style="margin-left:15%;"><b>insert</b></p>
 
-<p style="margin-left:15%;">The &rsquo;insert file&rsquo;
+<p style="margin-left:18%;">The &rsquo;insert file&rsquo;
 menu.</p>
 
-<p style="margin-left:11%;"><b>extcmd</b></p>
+<p style="margin-left:15%;"><b>extcmd</b></p>
 
-<p style="margin-left:15%;">The menu for inserting output
-from an external comman, reached from the insert menu.</p>
+<p style="margin-left:18%;">The menu for inserting output
+from an external command, reached from the insert menu.</p>
 
-<p style="margin-left:11%;"><b>help</b></p>
+<p style="margin-left:15%;"><b>help</b></p>
 
-<p style="margin-left:15%;">The help menu.</p>
+<p style="margin-left:18%;">The help-viewer menu.</p>
 
-<p style="margin-left:11%;"><b>spell</b></p>
+<p style="margin-left:15%;"><b>spell</b></p>
 
-<p style="margin-left:15%;">The interactive spell checker
+<p style="margin-left:18%;">The interactive spell checker
 Yes/no menu.</p>
 
-<p style="margin-left:11%;"><b>browser</b></p>
+<p style="margin-left:15%;"><b>linter</b></p>
+
+<p style="margin-left:18%;">The linter menu.</p>
 
-<p style="margin-left:15%;">The file browser for inserting
+<p style="margin-left:15%;"><b>browser</b></p>
+
+<p style="margin-left:18%;">The file browser for inserting
 or writing a file.</p>
 
-<p style="margin-left:11%;"><b>whereisfile</b></p>
+<p style="margin-left:15%;"><b>whereisfile</b></p>
 
-<p style="margin-left:15%;">The &rsquo;search for a
+<p style="margin-left:18%;">The &rsquo;search for a
 file&rsquo; menu in the file browser.</p>
 
-<p style="margin-left:11%;"><b>gotodir</b></p>
-
-<p style="margin-left:15%;">The &rsquo;go to
-directory&rsquo; menu.</p>
+<p style="margin-left:15%;"><b>gotodir</b></p>
 
-<p style="margin-left:11%;"><b>all</b></p>
+<p style="margin-left:18%;">The &rsquo;go to
+directory&rsquo; menu in the file browser.</p>
 
-<p style="margin-left:15%;">A special name meaning: apply
-to all menus where this function exists.</p>
+<p style="margin-left:15%;"><b>all</b></p>
 
-<p style="margin-left:11%;"><b>unbind</b> <i>key
-menu</i></p>
-
-<p style="margin-left:15%;">Unbind the key <i>key</i> from
-the menu named <i>menu</i> or from all menus by using
-<i>all</i>. Same key syntax as for binding. Rebinds the key
-<i>key</i> to a new function named <i>function</i> in the
-context of menu <i>menu</i>. The format of <i>key</i> should
-be one of:</p>
+<p style="margin-left:18%;">A special name that encompasses
+all menus. For <b>bind</b> it means all menus where the
+specified <i>function</i> exists; for <b>unbind</b> it means
+all menus where the specified <i>key</i> exists.</p>
 
 <h2>FILES
 <a name="FILES"></a>
@@ -925,35 +1110,39 @@ be one of:</p>
 
 
 
-<p style="margin-left:11%; margin-top: 1em"><i>SYSCONFDIR/nanorc</i></p>
+<p style="margin-left:11%; margin-top: 1em"><b>/etc/nanorc</b></p>
 
 <p style="margin-left:22%;">System-wide configuration
-file</p>
+file.</p>
 
-<p style="margin-left:11%;"><i>~/.nanorc</i></p>
+<p style="margin-left:11%;"><b>~/.nanorc</b></p>
 
-<p style="margin-left:22%;">Per-user configuration file</p>
+<p style="margin-left:22%;">Per-user configuration
+file.</p>
 
 <h2>SEE ALSO
 <a name="SEE ALSO"></a>
 </h2>
 
 
-<p style="margin-left:11%; margin-top: 1em"><b>nano</b>(1)
-<i><br>
-/usr/share/doc/nano/examples/nanorc.sample</i> (or
-equivalent on your system)</p>
+
+<p style="margin-left:11%; margin-top: 1em"><b>nano</b>(1)</p>
+
+
+<p style="margin-left:11%; margin-top: 1em"><i>/usr/share/doc/nano/examples/nanorc.sample</i>
+(or equivalent on your system)</p>
 
 <h2>AUTHOR
 <a name="AUTHOR"></a>
 </h2>
 
 
-<p style="margin-left:11%;">Chris Allegretta
-&lt;chrisa@asty.org&gt;, et al (see <i>AUTHORS</i> and
-<i>THANKS</i> for details). This manual page was originally
-written by Jordi Mallach &lt;jordi@gnu.org&gt;, for the
-Debian system (but may be used by others).</p>
+<p style="margin-left:11%; margin-top: 1em">Chris
+Allegretta &lt;chrisa@asty.org&gt;, et al (see
+<i>AUTHORS</i> and <i>THANKS</i> for details). This manual
+page was originally written by Jordi Mallach
+&lt;jordi@gnu.org&gt;, for the Debian system (but may be
+used by others).</p>
 <hr>
 </body>
 </html>
diff --git a/doc/man/rnano.1 b/doc/man/rnano.1
index 6b8a9b8..24851b2 100644
--- a/doc/man/rnano.1
+++ b/doc/man/rnano.1
@@ -1,7 +1,7 @@
 .\" Hey, EMACS: -*- nroff -*-
-.\" Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
-.\" Skeleton based on nano-tiny.1:
-.\" Copyright (C) 2002 Free Software Foundation, Inc.
+.\" $Id: rnano.1 5135 2015-03-08 15:59:15Z bens $
+.\"
+.\" Copyright (C) 2002, 2005, 2006, 2007, 2014 Free Software Foundation, Inc.
 .\"
 .\" This document is dual-licensed.  You may distribute and/or modify it
 .\" under the terms of either of the following licenses:
@@ -19,8 +19,7 @@
 .\"   Documentation License along with this program.  If not, see
 .\"   <http://www.gnu.org/licenses/>.
 .\"
-.\" $Id: rnano.1 4188 2007-12-08 04:27:44Z dolorous $
-.TH RNANO 1 "version 2.0.0" "August 23, 2007"
+.TH RNANO 1 "version 2.4.0" "March 2015"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
@@ -29,18 +28,12 @@ Pico clone
 
 .SH SYNOPSIS
 .B rnano
-.I [OPTIONS]\ [[\+LINE,COLUMN]\ FILE]...
-.br
+.RI [ options "] [[+" line , column "]\ " file "]..."
 
 .SH DESCRIPTION
-This manual page briefly documents the \fBrnano\fP command.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invoke bold face and italics, 
-.\" respectively.
 \fBnano\fP is a small, free and friendly editor which aims to replace
-Pico, the default editor included in the non-free Pine package. Rather
-than just copying Pico's look and feel, \fBnano\fP also implements some
+Pico, the default editor included in the non-free Pine package.  On
+top of copying Pico's look and feel, \fBnano\fP also implements some
 missing (or disabled by default) features in Pico, such as "search and
 replace" and "go to line and column number".
 .PP
@@ -48,7 +41,7 @@ replace" and "go to line and column number".
 specific files and doesn't allow the user access to the filesystem or a
 command shell.
 .PP
-In restricted mode, \fBnano\fP will \fInot\fP:
+In restricted mode, \fBnano\fP will \fInot\/\fP:
 .IP \[bu] 2
 read or write to any file not specified on the command line;
 .IP \[bu]
@@ -63,22 +56,13 @@ use backup files or spell checking.
 
 .SH OPTIONS
 .TP
-.B \+\fILINE\fP,\fICOLUMN\fP
-Places cursor at line number \fILINE\fP and column number \fICOLUMN\fP
-(at least one of which must be specified) on startup, instead of the
-default of line 1, column 1.
-.TP
-.B \-?
-Same as \fB-h (\-\-help)\fP.
-.TP
-.B \-h (\-\-help)
-Show a summary of command line options and exit.
+.BR \-h ", " \-\-help
+Show a summary of command-line options and exit.
 .TP
-.B \-V (\-\-version)
+.BR \-V ", " \-\-version
 Show the current version number and exit.
 .PP
-See the \fBnano\fP(1) manpage for the complete documentation of
-\fBnano\fP.
+See the \fBnano\fP(1) manpage for all of the possible options.
 
 .SH BUGS
 Please send any comments or bug reports to \fBnano@nano-editor.org\fP.
@@ -92,7 +76,7 @@ of "subscribe".
 http://www.nano-editor.org/
 
 .SH AUTHOR
-Chris Allegretta <chrisa@asty.org>, et al (see AUTHORS for details).
+Chris Allegretta <chrisa@asty.org>, et al (see the file AUTHORS for details).
 This manual page was originally written by Thijs Kinkhorst
 <thijs@kinkhorst.com>, for the Debian system (but may be used by
 others).
diff --git a/doc/man/rnano.1.html b/doc/man/rnano.1.html
index 5fc5991..0dd2db0 100644
--- a/doc/man/rnano.1.html
+++ b/doc/man/rnano.1.html
@@ -1,5 +1,5 @@
-<!-- Creator     : groff version 1.20.1 -->
-<!-- CreationDate: Tue Aug 10 22:44:00 2010 -->
+<!-- Creator     : groff version 1.22.2 -->
+<!-- CreationDate: Sun Mar 22 23:46:10 2015 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
@@ -46,22 +46,20 @@ free Pico clone</p>
 
 
 <p style="margin-left:11%; margin-top: 1em"><b>rnano</b>
-<i>[OPTIONS]&nbsp;[[+LINE,COLUMN]&nbsp;FILE]...</i></p>
+[<i>options</i>]
+[[+<i>line</i>,<i>column</i>]&nbsp;<i>file</i>]...</p>
 
 <h2>DESCRIPTION
 <a name="DESCRIPTION"></a>
 </h2>
 
 
-<p style="margin-left:11%; margin-top: 1em">This manual
-page briefly documents the <b>rnano</b> command.</p>
-
 <p style="margin-left:11%; margin-top: 1em"><b>nano</b> is
 a small, free and friendly editor which aims to replace
 Pico, the default editor included in the non-free Pine
-package. Rather than just copying Pico&rsquo;s look and
-feel, <b>nano</b> also implements some missing (or disabled
-by default) features in Pico, such as &quot;search and
+package. On top of copying Pico&rsquo;s look and feel,
+<b>nano</b> also implements some missing (or disabled by
+default) features in Pico, such as &quot;search and
 replace&quot; and &quot;go to line and column
 number&quot;.</p>
 
@@ -140,45 +138,20 @@ under a different name;</p></td></tr>
 
 
 
-<p style="margin-left:11%; margin-top: 1em"><b>+</b><i>LINE</i><b>,</b><i>COLUMN</i></p>
-
-<p style="margin-left:22%;">Places cursor at line number
-<i>LINE</i> and column number <i>COLUMN</i> (at least one of
-which must be specified) on startup, instead of the default
-of line 1, column 1.</p>
-
-<table width="100%" border="0" rules="none" frame="void"
-       cellspacing="0" cellpadding="0">
-<tr valign="top" align="left">
-<td width="11%"></td>
-<td width="3%">
-
-
-<p><b>&minus;?</b></p></td>
-<td width="8%"></td>
-<td width="30%">
-
-
-<p>Same as <b>-h (&minus;&minus;help)</b>.</p></td>
-<td width="48%">
-</td></tr>
-</table>
-
-<p style="margin-left:11%;"><b>&minus;h
-(&minus;&minus;help)</b></p>
+<p style="margin-left:11%; margin-top: 1em"><b>&minus;h</b>,
+<b>&minus;&minus;help</b></p>
 
-<p style="margin-left:22%;">Show a summary of command line
+<p style="margin-left:22%;">Show a summary of command-line
 options and exit.</p>
 
-<p style="margin-left:11%;"><b>&minus;V
-(&minus;&minus;version)</b></p>
+<p style="margin-left:11%;"><b>&minus;V</b>,
+<b>&minus;&minus;version</b></p>
 
 <p style="margin-left:22%;">Show the current version number
 and exit.</p>
 
 <p style="margin-left:11%; margin-top: 1em">See the
-<b>nano</b>(1) manpage for the complete documentation of
-<b>nano</b>.</p>
+<b>nano</b>(1) manpage for all of the possible options.</p>
 
 <h2>BUGS
 <a name="BUGS"></a>
@@ -210,10 +183,10 @@ email to <b>nano-devel-request@gnu.org</b> with a subject of
 
 
 <p style="margin-left:11%; margin-top: 1em">Chris
-Allegretta &lt;chrisa@asty.org&gt;, et al (see AUTHORS for
-details). This manual page was originally written by Thijs
-Kinkhorst &lt;thijs@kinkhorst.com&gt;, for the Debian system
-(but may be used by others).</p>
+Allegretta &lt;chrisa@asty.org&gt;, et al (see the file
+AUTHORS for details). This manual page was originally
+written by Thijs Kinkhorst &lt;thijs@kinkhorst.com&gt;, for
+the Debian system (but may be used by others).</p>
 <hr>
 </body>
 </html>
diff --git a/doc/nanorc.sample.in b/doc/nanorc.sample.in
index f164c26..911f2b9 100644
--- a/doc/nanorc.sample.in
+++ b/doc/nanorc.sample.in
@@ -5,7 +5,7 @@
 ## DOS or Mac format, and that characters specially interpreted by the
 ## shell should not be escaped here.
 ##
-## To make sure a value is disabled, use "unset <option>".
+## To make sure an option is disabled, use "unset <option>".
 ##
 ## For the options that take parameters, the default value is given.
 ## Other options are unset by default.
@@ -15,10 +15,15 @@
 ## its end.  For example, for the "brackets" option, ""')>]}" will match
 ## ", ', ), >, ], and }.
 
+## Silently ignore problems with unknown directives in the nanorc file.
+## Useful when your nanorc file might be read on systems with multiple
+## versions of nano installed (e.g. your home directory is on NFS).
+# set quiet
+
 ## Use auto-indentation.
 # set autoindent
 
-## Backup files to filename~.
+## Back up files to the current filename plus a tilde.
 # set backup
 
 ## The directory to put unique backup files in.
@@ -34,32 +39,34 @@
 ## paragraphs.  They cannot contain blank characters.  Only closing
 ## punctuation, optionally followed by closing brackets, can end
 ## sentences.
-##
 # set brackets ""')>]}"
 
-## Do case sensitive searches by default.
+## Do case-sensitive searches by default.
 # set casesensitive
 
 ## Constantly display the cursor position in the statusbar.  Note that
 ## this overrides "quickblank".
 # set const
 
-## Use cut to end of line by default.
+## Use cut-to-end-of-line by default.
 # set cut
 
 ## Set the line length for wrapping text and justifying paragraphs.
-## If fill is 0 or less, the line length will be the screen width less
-## this number.
-##
+## If the value is 0 or less, the wrapping point will be the screen
+## width less this number.
 # set fill -8
 
 ## Enable ~/.nano_history for saving and reading search/replace strings.
 # set historylog
 
+## Enable vim-style lock-files.  This is just to let a vim user know you
+## are editing a file [s]he is trying to edit and vice versa. There are
+## no plans to implement vim-style undo state in these files.
+# set locking
+
 ## The opening and closing brackets that can be found by bracket
 ## searches.  They cannot contain blank characters.  The former set must
 ## come before the latter set, and both must be in the same order.
-##
 # set matchbrackets "(<[{)>]}"
 
 ## Use the blank line below the titlebar as extra editing space.
@@ -69,13 +76,10 @@
 ## mouse clicks can be used to place the cursor, set the mark (with a
 ## double click), and execute shortcuts.  The mouse will work in the X
 ## Window System, and on the console when gpm is running.
-##
 # set mouse
 
-## Allow multiple file buffers (inserting a file will put it into a
-## separate buffer).  You must have configured with --enable-multibuffer
-## for this to work.
-##
+## Switch on multiple file buffers (inserting a file will put it into
+## a separate buffer).
 # set multibuffer
 
 ## Don't convert files from DOS/Mac format.
@@ -96,10 +100,12 @@
 ## Set operating directory.  nano will not read or write files outside
 ## this directory and its subdirectories.  Also, the current directory
 ## is changed to here, so any files are inserted from this dir.  A blank
-## string means the operating directory feature is turned off.
-##
+## string means the operating-directory feature is turned off.
 # set operatingdir ""
 
+## Remember the cursor position in each file for the next editing session.
+# set poslog
+
 ## Preserve the XON and XOFF keys (^Q and ^S).
 # set preserve
 
@@ -107,19 +113,18 @@
 ## paragraphs.  They cannot contain blank characters.  Only closing
 ## punctuation, optionally followed by closing brackets, can end
 ## sentences.
-##
 # set punct "!.?"
 
 ## Do quick statusbar blanking.  Statusbar messages will disappear after
 ## 1 keystroke instead of 26.  Note that "const" overrides this.
-##
 # set quickblank
 
 ## The email-quote string, used to justify email-quoted paragraphs.
 ## This is an extended regular expression if your system supports them,
-## otherwise a literal string.  Default:
+## otherwise a literal string.
+## If you have extended regular expression support, the default is:
 # set quotestr "^([ 	]*[#:>\|}])+"
-## if you have extended regular expression support, otherwise:
+## Otherwise:
 # set quotestr "> "
 
 ## Fix Backspace/Delete confusion problem.
@@ -141,12 +146,11 @@
 ## Use smooth scrolling as the default.
 # set smooth
 
-## Enable soft line wrapping (AKA full line display).
+## Enable soft line wrapping (AKA full-line display).
 # set softwrap
 
 ## Use this spelling checker instead of the internal one.  This option
 ## does not properly have a default value.
-##
 # set speller "aspell -x -c"
 
 ## Allow nano to be suspended.
@@ -158,27 +162,34 @@
 ## Convert typed tabs to spaces.
 # set tabstospaces
 
-## Save automatically on exit, don't prompt.
+## Save automatically on exit; don't prompt.
 # set tempfile
 
-## Enable the new (EXPERIMENTAL) generic undo code, not just for line
-## cuts.
-# set undo
-
 ## Disallow file modification.  Why would you want this in an rcfile? ;)
 # set view
 
 ## The two single-column characters used to display the first characters
 ## of tabs and spaces.  187 in ISO 8859-1 (0000BB in Unicode) and 183 in
 ## ISO-8859-1 (0000B7 in Unicode) seem to be good values for these.
-# set whitespace "  "
+## The default when in a UTF-8 locale:
+# set whitespace "»·"
+## The default otherwise:
+# set whitespace ">."
 
 ## Detect word boundaries more accurately by treating punctuation
 ## characters as parts of words.
 # set wordbounds
 
 
-## Color setup
+## Paint the interface elements of nano.
+## This is an example; by default there are no colors.
+# set titlecolor brightwhite,blue
+# set statuscolor brightwhite,green
+# set keycolor green
+# set functioncolor yellow
+
+
+## Setup of syntax coloring.
 ##
 ## Format:
 ##
@@ -193,8 +204,8 @@
 ## or
 ## icolor foreground,background "regex" ["regex"...]
 ##
-## "color" will do case sensitive matches, while "icolor" will do case
-## insensitive matches.
+## "color" will do case-sensitive matches, while "icolor" will do
+## case-insensitive matches.
 ##
 ## Valid colors: white, black, red, blue, green, yellow, magenta, cyan.
 ## For foreground colors, you may use the prefix "bright" to get a
@@ -207,9 +218,10 @@
 ## color will use a transparent color.  If you don't want this, be sure
 ## to set the background color to black or white.
 ##
-## If you wish, you may put your syntaxes in separate files.  You can
-## make use of such files (which can only include "syntax", "color", and
-## "icolor" commands) as follows:
+## All regexes should be extended regular expressions.
+##
+## If you wish, you may put your syntax definitions in separate files.
+## You can make use of such files as follows:
 ##
 ## include "/path/to/syntax_file.nanorc"
 ##
@@ -218,95 +230,18 @@
 ## name inside that file.  These names are kept fairly short to make
 ## them easier to remember and faster to type using nano's -Y option.
 ##
-## All regexes should be extended regular expressions.
+## To include all existing syntax definitions, you can do:
+# include "@PKGDATADIR@/*.nanorc"
 
-## Key bindings
-## Please see nanorc(5) for more details on this
+
+## Key bindings.
+## See nanorc(5) for more details on this.
 ##
-## Here are some samples to get you going
+## Here are a few samples to get you going.
 ##
 # bind M-W nowrap main
 # bind M-A casesens search
 # bind ^S research main
 
-## Set this if your backspace key sends delete most of the time (2.1.3+)
-# bind kdel backspace all
-
-
-## Nanorc files
-# include "@PKGDATADIR@/nanorc.nanorc"
-
-## C/C++
-# include "@PKGDATADIR@/c.nanorc"
-
-## Makefiles
-# include "@PKGDATADIR@/makefile.nanorc"
-
-## Cascading Style Sheets
-# include "@PKGDATADIR@/css.nanorc"
-
-## Debian files
-# include "@PKGDATADIR@/debian.nanorc"
-
-## Gentoo files
-# include "@PKGDATADIR@/gentoo.nanorc"
-
-## HTML
-# include "@PKGDATADIR@/html.nanorc"
-
-## PHP
-# include "@PKGDATADIR@/php.nanorc"
-
-## TCL
-# include "@PKGDATADIR@/tcl.nanorc"
-
-## TeX
-# include "@PKGDATADIR@/tex.nanorc"
-
-## Quoted emails (under e.g. mutt)
-# include "@PKGDATADIR@/mutt.nanorc"
-
-## Patch files
-# include "@PKGDATADIR@/patch.nanorc"
-
-## Manpages
-# include "@PKGDATADIR@/man.nanorc"
-
-## Groff
-# include "@PKGDATADIR@/groff.nanorc"
-
-## Perl
-# include "@PKGDATADIR@/perl.nanorc"
-
-## Python
-# include "@PKGDATADIR@/python.nanorc"
-
-## Ruby
-# include "@PKGDATADIR@/ruby.nanorc"
-
-## Java
-# include "@PKGDATADIR@/java.nanorc"
-
-## Fortran
-# include "@PKGDATADIR@/fortran.nanorc"
-
-## Objective-C
-# include "@PKGDATADIR@/objc.nanorc"
-
-## OCaml
-# include "@PKGDATADIR@/ocaml.nanorc"
-
-## AWK
-# include "@PKGDATADIR@/awk.nanorc"
-
-## Assembler
-# include "@PKGDATADIR@/asm.nanorc"
-
-## Bourne shell scripts
-# include "@PKGDATADIR@/sh.nanorc"
-
-## POV-Ray
-# include "@PKGDATADIR@/pov.nanorc"
-
-## XML-type files
-# include "@PKGDATADIR@/xml.nanorc"
+## Set this if your backspace key sends Del most of the time.
+# bind Del backspace all
diff --git a/doc/syntax/Makefile.am b/doc/syntax/Makefile.am
index 372ddb2..03bc8e3 100644
--- a/doc/syntax/Makefile.am
+++ b/doc/syntax/Makefile.am
@@ -1,30 +1,39 @@
 pkgdata_DATA =	asm.nanorc \
-		c.nanorc \
+		awk.nanorc \
+		changelog.nanorc \
 		cmake.nanorc \
+		c.nanorc \
+		css.nanorc \
+		debian.nanorc \
+		default.nanorc \
+		fortran.nanorc \
+		gentoo.nanorc \
+		go.nanorc \
 		groff.nanorc \
 		html.nanorc \
 		java.nanorc \
+		javascript.nanorc \
+		json.nanorc \
+		lua.nanorc \
+		makefile.nanorc \
 		man.nanorc \
+		mgp.nanorc \
 		mutt.nanorc \
 		nanorc.nanorc \
+		objc.nanorc \
+		ocaml.nanorc \
 		patch.nanorc \
 		perl.nanorc \
+		php.nanorc \
+		po.nanorc \
 		pov.nanorc \
 		python.nanorc \
 		ruby.nanorc \
 		sh.nanorc \
-		tex.nanorc \
+		spec.nanorc \
 		tcl.nanorc \
-		php.nanorc \
-		gentoo.nanorc \
-		debian.nanorc \
-		awk.nanorc \
-		css.nanorc \
-		xml.nanorc \
-		ocaml.nanorc \
-		objc.nanorc \
-		fortran.nanorc \
-		makefile.nanorc \
-		mgp.nanorc
+		tex.nanorc \
+		texinfo.nanorc \
+		xml.nanorc
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/doc/syntax/Makefile.in b/doc/syntax/Makefile.in
index 90fe9eb..f86e504 100644
--- a/doc/syntax/Makefile.in
+++ b/doc/syntax/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,11 +78,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-target_triplet = @target@
 subdir = doc/syntax
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
+	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -50,8 +95,25 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -73,11 +135,19 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(pkgdatadir)"
 DATA = $(pkgdata_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -123,6 +193,11 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NCURSESW_CFLAGS = @NCURSESW_CFLAGS@
+NCURSESW_CONFIG = @NCURSESW_CONFIG@
+NCURSESW_LIBS = @NCURSESW_LIBS@
+NCURSES_CFLAGS = @NCURSES_CFLAGS@
+NCURSES_LIBS = @NCURSES_LIBS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -134,6 +209,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKGDATADIR = @PKGDATADIR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -163,6 +240,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+haveit = @haveit@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -187,42 +265,47 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-target = @target@
 target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 pkgdata_DATA = asm.nanorc \
-		c.nanorc \
+		awk.nanorc \
+		changelog.nanorc \
 		cmake.nanorc \
+		c.nanorc \
+		css.nanorc \
+		debian.nanorc \
+		default.nanorc \
+		fortran.nanorc \
+		gentoo.nanorc \
+		go.nanorc \
 		groff.nanorc \
 		html.nanorc \
 		java.nanorc \
+		javascript.nanorc \
+		json.nanorc \
+		lua.nanorc \
+		makefile.nanorc \
 		man.nanorc \
+		mgp.nanorc \
 		mutt.nanorc \
 		nanorc.nanorc \
+		objc.nanorc \
+		ocaml.nanorc \
 		patch.nanorc \
 		perl.nanorc \
+		php.nanorc \
+		po.nanorc \
 		pov.nanorc \
 		python.nanorc \
 		ruby.nanorc \
 		sh.nanorc \
-		tex.nanorc \
+		spec.nanorc \
 		tcl.nanorc \
-		php.nanorc \
-		gentoo.nanorc \
-		debian.nanorc \
-		awk.nanorc \
-		css.nanorc \
-		xml.nanorc \
-		ocaml.nanorc \
-		objc.nanorc \
-		fortran.nanorc \
-		makefile.nanorc \
-		mgp.nanorc
+		tex.nanorc \
+		texinfo.nanorc \
+		xml.nanorc
 
 EXTRA_DIST = $(pkgdata_DATA)
 all: all-am
@@ -260,8 +343,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-pkgdataDATA: $(pkgdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -275,14 +361,12 @@ uninstall-pkgdataDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -332,10 +416,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -415,16 +504,17 @@ uninstall-am: uninstall-pkgdataDATA
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkgdataDATA install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-pkgdataDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-pkgdataDATA install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am \
+	uninstall-pkgdataDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/doc/syntax/asm.nanorc b/doc/syntax/asm.nanorc
index e94ee90..4e21591 100644
--- a/doc/syntax/asm.nanorc
+++ b/doc/syntax/asm.nanorc
@@ -1,17 +1,23 @@
 ## Here is an example for assembler.
-##
+
 syntax "asm" "\.(S|s|asm)$"
+magic "[Aa]ssembl(y|er)"
+
 color red "\<[A-Z_]{2,}\>"
 color brightgreen "\.(data|subsection|text)"
 color green "\.(align|file|globl|global|hidden|section|size|type|weak)"
 color brightyellow "\.(ascii|asciz|byte|double|float|hword|int|long|short|single|struct|word)"
 icolor brightred "^[[:space:]]*[.0-9A-Z_]*:"
 color brightcyan "^[[:space:]]*#[[:space:]]*(define|undef|include|ifn?def|endif|elif|else|if|warning|error)"
-## Highlight strings (note: VERY resource intensive)
+
+# Strings.
 color brightyellow "<[^= 	]*>" ""(\\.|[^"])*""
+# Multiline strings (note: VERY resource intensive).
 color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
-## Highlight comments
+
+# Comments.
 color brightblue "//.*"
 color brightblue start="/\*" end="\*/"
-## Highlight trailing whitespace
+
+# Trailing whitespace.
 color ,green "[[:space:]]+$"
diff --git a/doc/syntax/awk.nanorc b/doc/syntax/awk.nanorc
index 696ab6a..bfc6387 100644
--- a/doc/syntax/awk.nanorc
+++ b/doc/syntax/awk.nanorc
@@ -1,23 +1,25 @@
 ## Here is an example for awk.
-##
+
 syntax "awk" "\.awk$"
-## records
+magic "awk.*script text"
+
+# Records.
 icolor brightred "\$[0-9A-Z_!@#$*?-]+"
-## awk-set variables
+# Awk-set variables.
 color red "\<(ARGC|ARGIND|ARGV|BINMODE|CONVFMT|ENVIRON|ERRNO|FIELDWIDTHS)\>"
 color red "\<(FILENAME|FNR|FS|IGNORECASE|LINT|NF|NR|OFMT|OFS|ORS)\>"
 color red "\<(PROCINFO|RS|RT|RSTART|RLENGTH|SUBSEP|TEXTDOMAIN)\>"
-## function declarations and special patterns
+# Function declarations and special patterns.
 color brightgreen "\<(function|extension|BEGIN|END)\>"
-## operators
+# Operators.
 color green "(\{|\}|\(|\)|\;|\]|\[|\\|<|>|!|=|&|\+|-|\*|%|/|\?:|\^|\|)"
-## flow control
+# Flow control.
 color brightyellow "\<(for|if|while|do|else|in|delete|exit)\>"
 color brightyellow "\<(break|continue|return)\>"
-## I/O statements
+# I/O statements.
 color brightgreen "\<(close|getline|next|nextfile|print|printf)\>"
 color brightgreen "\<(system|fflush)\>"
-## standard functions
+# Standard functions.
 color magenta "\<(atan2|cos|exp|int|log|rand|sin|sqrt|srand)\>"
 color magenta "\<(asort|asorti|gensub|gsub|index|length|match)\>"
 color magenta "\<(split|sprintf|strtonum|sub|substr|tolower|toupper)\>"
@@ -25,14 +27,10 @@ color magenta "\<(mktime|strftime|systime)\>"
 color magenta "\<(and|compl|lshift|or|rshift|xor)\>"
 color magenta "\<(bindtextdomain|dcgettext|dcngettext)\>"
 
-##
-## String highlighting.  You will in general want your comments and
-## strings to come last, because syntax highlighting rules will be
-## applied in the order they are read in.
+# Strings.
 color brightyellow "<[^= 	]*>" ""(\\.|[^"])*""
-
-## Comment highlighting
+# Comments.
 color brightblue "(^|[[:space:]])#.*$"
 
-## Trailing whitespace
+# Trailing whitespace.
 color ,green "[[:space:]]+$"
diff --git a/doc/syntax/c.nanorc b/doc/syntax/c.nanorc
index b89c9d2..8fe7088 100644
--- a/doc/syntax/c.nanorc
+++ b/doc/syntax/c.nanorc
@@ -1,8 +1,10 @@
 ## Here is an example for C/C++.
-##
-syntax "c" "\.(c(c|pp|xx)?|C)$" "\.(h(h|pp|xx)?|H)$" "\.ii?$"
-color brightred "\<[A-Z_][0-9A-Z_]+\>" 
-color green "\<(float|double|bool|char|int|short|long|sizeof|enum|void|static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
+
+syntax "c" "\.(c(c|pp|xx|\+\+)?|C)$" "\.(h(h|pp|xx)?|H)$" "\.ii?$"
+magic "(ASCII|UTF-8 Unicode) C(\+\+)? program text"
+
+color brightred "\<[A-Z_][0-9A-Z_]+\>"
+color green "\<(float|double|bool|char|int|short|long|sizeof|enum|void|auto|static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
 color green "\<((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\>"
 color green "\<(class|namespace|template|public|protected|private|typename|this|friend|virtual|using|mutable|volatile|register|explicit)\>"
 color brightyellow "\<(for|if|while|do|else|case|default|switch)\>"
@@ -10,21 +12,22 @@ color brightyellow "\<(try|throw|catch|operator|new|delete)\>"
 color magenta "\<(goto|continue|break|return)\>"
 color brightcyan "^[[:space:]]*#[[:space:]]*(define|include(_next)?|(un|ifn?)def|endif|el(if|se)|if|warning|error|pragma)"
 color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
-##
-## GCC builtins
+
+# GCC builtins.
 color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
-##
-## String highlighting.  You will in general want your comments and
-## strings to come last, because syntax highlighting rules will be
-## applied in the order they are read in.
+
+# Strings.  In general you will want your strings and comments to come last,
+# because highlighting rules are applied in the order they are read in.
 color brightyellow "<[^= 	]*>" ""(\\.|[^"])*""
-##
-## This string is VERY resource intensive!
+# Multiline strings.  This regex is VERY resource intensive!
 color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
 
-## Comment highlighting
+# Comments.
 color brightblue "//.*"
 color brightblue start="/\*" end="\*/"
 
-## Trailing whitespace
+# Reminders.
+color ,yellow "(FIXME|TODO|XXX)"
+
+# Trailing whitespace.
 color ,green "[[:space:]]+$"
diff --git a/doc/syntax/changelog.nanorc b/doc/syntax/changelog.nanorc
new file mode 100644
index 0000000..60666bd
--- /dev/null
+++ b/doc/syntax/changelog.nanorc
@@ -0,0 +1,25 @@
+## Colouring for Changelogs.
+
+syntax "changelog" "Change[Ll]og.*"
+
+# Author lines.
+color green "^(19|20).*$"
+# Dates.
+color red "^(19|20)[0-9-]{8}"
+# Email addresses.
+color yellow "<[^>]*@[^>]*>"
+
+# Changed files.
+color magenta "[[:space:]]\*[[:space:]].*:"
+
+# Command-line options.
+color cyan "[[:space:]]-[a-zA-Z\$]" "--[8a-z-]+"
+# Bug numbers.
+color cyan "bug #[0-9]{5}"
+# Probable variables, for variety.
+color brightred "\<[A-Z_][0-9A-Z_]+\>"
+# Key sequences.
+color brightblue "\^[A-Z]" "\<M-." "\<F1?[0-9]" "(\^|M-)Space"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/doc/syntax/cmake.nanorc b/doc/syntax/cmake.nanorc
index 3c52f7d..dc43702 100644
--- a/doc/syntax/cmake.nanorc
+++ b/doc/syntax/cmake.nanorc
@@ -1,5 +1,5 @@
-## CMake syntax highlighter for GNU Nano
-##
+## Syntax highlighting for CMake files.
+
 syntax "cmake" "(CMakeLists\.txt|\.cmake)$"
 
 icolor green "^[[:space:]]*[A-Z0-9_]+"
diff --git a/doc/syntax/css.nanorc b/doc/syntax/css.nanorc
index 98eea18..a806d7c 100644
--- a/doc/syntax/css.nanorc
+++ b/doc/syntax/css.nanorc
@@ -1,6 +1,7 @@
-## Here is an example for css files.
-##
+## Here is an example for CSS files.
+
 syntax "css" "\.css$"
+
 color brightred     "."
 color brightyellow  start="\{" end="\}"
 color brightwhite   start=":" end="([;^\{]|$)"
diff --git a/doc/syntax/debian.nanorc b/doc/syntax/debian.nanorc
index a945dee..630b4d0 100644
--- a/doc/syntax/debian.nanorc
+++ b/doc/syntax/debian.nanorc
@@ -1,20 +1,19 @@
-## Here is an exmaple for apt's sources.list
-## Adapted from http://milianw.de/blog/Syntax-Highlighting-in-Nano
-## (mail@milianw.de).
-##
-syntax "apt/sources.list" "sources\.list(\.old|~)?$"
-# component
-color brightmagenta "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+ .+$"
-# distribution
-color brightred "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+"
-# URI
-color brightgreen "(http|file|ftp):/[^ ]+"
-# cdroms
-# [^\]] does not work...
+## Here is an example for apt's sources.list.
+
+syntax "apt/sources.list" "sources\.list(\.old|~)?$" "apt/sources\.list\.d/.*\.list$"
+
+# Coloring the deb lines, working from tail to head.  First the
+# components -- well, everything, and thus also the components.
+color brightmagenta "^deb.*"
+# Distribution -- well, everything, except the components.
+color brightred "^deb(-src)? ((http(s)?|ftp|rsh|ssh|file|copy|tor|spacewalk):/[^ ]+|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+"
+# URIs.
+color brightgreen "(http(s)?|ftp|rsh|ssh|file|copy|tor|spacewalk):/[^ ]+"
+# CDroms.
 color brightgreen "cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/"
-# deb / deb-src
-color yellow "^deb"
-color yellow "^deb-src"
-# comments
+# And finally the initial deb tag.
+color yellow "^deb(-src)?"
+
+# Comments.
 color brightblue "#.*"
 
diff --git a/doc/syntax/default.nanorc b/doc/syntax/default.nanorc
new file mode 100644
index 0000000..34ff29b
--- /dev/null
+++ b/doc/syntax/default.nanorc
@@ -0,0 +1,10 @@
+## A default syntax, which is used
+## for files that do not match any other syntax.
+
+syntax "default"
+
+# Spaces in front of tabs.
+color ,red " +	+"
+
+# Nano's name, including version.
+color brightred "(GNU )?nano [1-9]\.[0-9]\.[^[:space:][:punct:]]+"
diff --git a/doc/syntax/fortran.nanorc b/doc/syntax/fortran.nanorc
index cc0c726..45873ac 100644
--- a/doc/syntax/fortran.nanorc
+++ b/doc/syntax/fortran.nanorc
@@ -1,9 +1,8 @@
-## Here is an example for Fortran 90/95
+## Here is an example for Fortran 90/95.
 
-syntax "fortran" "\.(f|f90|f95)$" 
+syntax "fortran" "\.(f|f90|f95)$"
 
-#color red "\<[A-Z_]a[0-9A-Z_]+\>" 
-color red "\<[0-9]+\>" 
+color red "\<[0-9]+\>"
 
 icolor green "\<(action|advance|all|allocatable|allocated|any|apostrophe)\>"
 icolor green "\<(append|asis|assign|assignment|associated|character|common)\>"
@@ -15,16 +14,16 @@ icolor green "\<(operator|optional|pack|parameter|pointer|position|private)\>"
 icolor green "\<(program|public|real|recl|recursive|selected_int_kind)\>"
 icolor green "\<(selected_real_kind|subroutine|status)\>"
 
-icolor cyan "\<(abs|achar|adjustl|adjustr|allocate|bit_size|call|char)\>" 
-icolor cyan "\<(close|contains|count|cpu_time|cshift|date_and_time)\>" 
-icolor cyan "\<(deallocate|digits|dot_product|eor|eoshift|function|iachar)\>" 
-icolor cyan "\<(iand|ibclr|ibits|ibset|ichar|ieor|iolength|ior|ishft|ishftc)\>" 
-icolor cyan "\<(lbound|len|len_trim|matmul|maxexponent|maxloc|maxval|merge)\>" 
-icolor cyan "\<(minexponent|minloc|minval|mvbits|namelist|nearest|nullify)\>" 
-icolor cyan "\<(open|pad|present|print|product|pure|quote|radix)\>" 
-icolor cyan "\<(random_number|random_seed|range|read|readwrite|replace)\>" 
-icolor cyan "\<(reshape|rewind|save|scan|sequence|shape|sign|size|spacing)\>" 
-icolor cyan "\<(spread|sum|system_clock|target|transfer|transpose|trim)\>" 
+icolor cyan "\<(abs|achar|adjustl|adjustr|allocate|bit_size|call|char)\>"
+icolor cyan "\<(close|contains|count|cpu_time|cshift|date_and_time)\>"
+icolor cyan "\<(deallocate|digits|dot_product|eor|eoshift|function|iachar)\>"
+icolor cyan "\<(iand|ibclr|ibits|ibset|ichar|ieor|iolength|ior|ishft|ishftc)\>"
+icolor cyan "\<(lbound|len|len_trim|matmul|maxexponent|maxloc|maxval|merge)\>"
+icolor cyan "\<(minexponent|minloc|minval|mvbits|namelist|nearest|nullify)\>"
+icolor cyan "\<(open|pad|present|print|product|pure|quote|radix)\>"
+icolor cyan "\<(random_number|random_seed|range|read|readwrite|replace)\>"
+icolor cyan "\<(reshape|rewind|save|scan|sequence|shape|sign|size|spacing)\>"
+icolor cyan "\<(spread|sum|system_clock|target|transfer|transpose|trim)\>"
 icolor cyan "\<(ubound|unpack|verify|write|tiny|type|use|yes)\>"
 
 icolor yellow "\<(.and.|case|do|else|else?if|else?where|end|end?do|end?if)\>"
@@ -33,9 +32,8 @@ icolor yellow "\<(.or.|repeat|select case|then|where|while)\>"
 
 icolor magenta "\<(continue|cycle|exit|go?to|result|return)\>"
 
-## String highlighting.  
+# Strings.
 icolor yellow "<[^= 	]*>" ""(\\.|[^"])*""
 
-## Comment highlighting
+# Comments.
 icolor blue "!.*"
-
diff --git a/doc/syntax/gentoo.nanorc b/doc/syntax/gentoo.nanorc
index 2ad1597..249e224 100644
--- a/doc/syntax/gentoo.nanorc
+++ b/doc/syntax/gentoo.nanorc
@@ -1,31 +1,41 @@
-## Here is an example for Gentoo ebuilds/eclasses
-##
+## Here is an example for Gentoo ebuilds/eclasses.
+
 syntax "ebuild" "\.e(build|class)$"
+
 ## All the standard portage functions
-color brightgreen "^src_(unpack|prepare|configure|compile|install|test)" "^pkg_(config|nofetch|setup|(pre|post)(inst|rm))"
+color brightgreen "(^|\<default_)src_(unpack|prepare|configure|compile|install|test)\>"
+color brightgreen "^pkg_(config|nofetch|info|pretend|setup|(pre|post)(inst|rm))\>"
+color brightgreen "\<default(_pkg_nofetch|_src_(unpack|prepare|configure|compile|test))?\>"
 ## Highlight bash related syntax
-color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while|continue|break)\>"
-color green "\<(declare|eval|exec|let)\>"
-color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
-color green "-[edfgruwxL]\>"
-color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
+color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>"
+color green "\<(declare|eval|exec|export|let|local)\>"
+color green "[{}():;|`$<>!=&\\]" "(\]|\[)"
+color green "-[defhnrsuwxzL]\>"
+color green "-(eq|ne|gt|lt|ge|le)\>"
 ## Highlight variables ... official portage ones in red, all others in bright red
-color brightred "\$\{?[a-zA-Z_0-9]+\}?"
-color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|(P|R)?DEPEND|PROVIDE|PROPERTIES|RESTRICT|USERLAND)\>"
-color red "\<(S|D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|ROOT|WORKDIR)\>" "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\<C(HOST|TARGET|BUILD)\>"
-color red "\<QA_((TEXTRELS|EXECSTACK|WX_LOAD)(_[a-zA-Z_0-9]+)?|DT_HASH|PRESTRIPPED)\>" "\<WANT_AUTO(CONF|MAKE)\>" "\<AT_M4DIR\>"
+color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*"
+color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:digit:]]|@)+\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})"
+color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|[HPR]?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>"
+color red "\<(S|E?D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|EPREFIX|E?ROOT|WORKDIR)\>"
+color red "\<(AS|C(PP|XX)?|LD)FLAGS\>" "\<C(HOST|TARGET|BUILD)\>" "\<(MERGE_TYPE|REPLACING_VERSIONS|REPLACED_BY_VERSION)\>"
+color red "\<EBUILD_PHASE(_FUNC)?\>"
+color red "\<QA_((TEXTRELS|EXECSTACK|WX_LOAD)(_[a-zA-Z_0-9]+)?|DT_HASH|PRESTRIPPED)\>"
+color red "\<(PATCHES|(HTML_)?DOCS)\>" "\<WANT_(AUTO(CONF|MAKE)|LIBTOOL)\>" "\<AT_M4DIR\>"
 ## Highlight portage commands
-color magenta "\<use(_(with|enable))?\> [!a-zA-Z0-9_+ -]*" "inherit.*"
-color brightblue "\<e(begin|end|conf|install|make|qmake[34]|ant|(qa)?warn|infon?|error|log|patch|new(group|user))\>"
-color brightblue "\<e(pause|beep|mktemp|(cvs|svn)_clean|punt_cxx)\>" "\<e(aclocal|auto(reconf|header|conf|make))\>"
-color brightblue "\<built_with_use\>" "\<make_desktop_entry\>" "\<unpack(_(makeself|pdv))?\>"
-color brightblue "\<die\>" "\<use(_(with|enable))?\>" "\<inherit\>" "\<has\>" "\<(has|best)_version\>"
+color magenta "\<(use(_(with|enable|if_iuse)|x)?|in_iuse)\> [!a-zA-Z0-9_+ -]*" "inherit.*"
+color brightblue "\<e(begin|end|conf|install|make|qmake4|ant|(qa)?warn|infon?|error|log|patch(_user)?|new(group|user))\>"
+color brightblue "\<e(pause|beep|mktemp|(cvs|svn)_clean|punt_cxx)\>" "\<e(aclocal|auto(reconf|header|conf|make)|libtoolize)\>"
+color brightblue "\<e(stack|shopts|umask)_(push|pop)\>" "\<version_is_at_least\>"
+color brightblue "\<make_desktop_entry\>" "\<unpack(_(makeself|pdv))?\>"
+color brightblue "\<(die|hasv?|inherit|nonfatal)\>" "\<(use(_(with|enable|if_iuse)|x)?|in_iuse)\>" "\<(has|best)_version\>"
 color brightblue "\<(do|new)(ins|(games)?s?bin|doc|lib(\.so|\.a)?|man|info|exe|initd|confd|envd|pam|menu|icon)\>"
-color brightblue "\<do(python|sed|dir|hard|sym|html|jar|mo)\>" "\<keepdir\>"
-color brightblue "prepall(docs|info|man|strip)?" "prep(info|lib|lib\.(so|a)|man|strip|gamesdirs)"
+color brightblue "\<do(compress|header|python|sed|dir|hard|sym|html|jar|mo)\>" "\<keepdir\>"
+color brightblue "\<prepall(docs|info|man|strip)?\>" "\<prep(info|lib|lib\.(so|a)|man|strip|gamesdirs)\>"
 color brightblue "\<(doc|ins|exe)?into\>" "\<(f|games)(owners|perms)\>" "\<(exe|ins|dir)opts\>"
+color brightblue "\<tc-get(BUILD_)?(AR|AS|CC|CPP|CXX|LD|NM|OBJCOPY|PKG_CONFIG|RANLIB)\>"
+color brightblue "\<tc-(arch(-kernel)?|export|has-(tls|openmp))\>"
 ## Highlight common commands used in ebuilds
-color blue "\<make\>" "\<(awk|cat|cd|chmod|chown|cp|echo|env|export|find|e?grep|ln|mkdir|mv|rm|sed|set|tar|touch|unset|xargs)\>"
+color blue "\<(awk|cat|cd|chmod|chown|cp|echo|env|find|e?grep|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|unset|xargs)\>"
 ## Highlight comments (doesnt work that well)
 color yellow "(^|[[:space:]])#.*$"
 ## Highlight strings (doesnt work that well)
@@ -33,9 +43,9 @@ color brightyellow ""(\\.|[^\"])*"" "'(\\.|[^'])*'"
 ## Trailing space is bad!
 color ,green "[[:space:]]+$"
 
-## Here is an example for Portage control files
+## Here is an example for Portage control files.
 ##
-syntax "/etc/portage" "\.(keywords|mask|unmask|use)(/.+)?$"
+syntax "/etc/portage" "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$"
 ## Base text:
 color green "^.+$"
 ## Use flags:
@@ -53,3 +63,5 @@ color cyan "^[[:space:]]*.*/"
 color brightmagenta "^[[:space:]]*(=|~|<|<=|=<|>|>=|=>)"
 ## Comments:
 color yellow "#.*$"
+## Trailing space is bad!
+color ,green "[[:space:]]+$"
diff --git a/doc/syntax/go.nanorc b/doc/syntax/go.nanorc
new file mode 100644
index 0000000..0b62334
--- /dev/null
+++ b/doc/syntax/go.nanorc
@@ -0,0 +1,45 @@
+## Here is an example for Go.
+
+syntax "go" "\.go$"
+
+# Types.
+color green "\<(bool|u?int(8|16|32|64)?|float(32|64)|complex(64|128)|byte|rune|uintptr|string|error)\>"
+color green "\<((<-[[:space:]]*)chan|chan[[:space:]]*<-|const|func|interface|map|struct|type|var)\>"
+
+# Predefined functions.
+color blue "\<(append|cap|close|complex|copy|delete|imag|len|make|new|panic|print|println|real|recover)\>"
+
+# Control structures.
+color brightyellow "\<(case|default|defer|else|for|go|if|range|select|switch)\>"
+
+# Control flow.
+color magenta "\<(break|continue|fallthrough|goto|return)\>"
+
+# Declarations.
+color brightcyan "\<(package|import)\>"
+color brightcyan "//[[:space:]]*\+build[[:space:]]+(([a-zA-Z_0-9]+[[:space:]]*)+,[[:space:]]*)*[a-zA-Z_0-9]+"
+
+# Literals.
+color red "\<[0-9]+\.[0-9]*([Ee][+-][0-9]+)?i?\>"
+color red "\<[0-9]+[Ee][+-][0-9]+i?\>"
+color red "\<\.[0-9]+([Ee][+-][0-9]+)?i?\>"
+color red "\<[0-9]+i\>"
+color red "\<[1-9][0-9]*\>"
+color red "\<0[0-7]*\>"
+icolor red "\<0x[0-9a-f]+\>"
+
+# Strings and characters; slightly fuzzy.
+color red "\<(true|false|nil|iota|_)\>"
+color red "'(\\.|[^'])+'"
+color red ""(\\.|[^"])*""
+color red start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+
+# Comments.
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
+
+# Set up the formatter since spelling is probably useless...
+formatter gofmt -w
diff --git a/doc/syntax/groff.nanorc b/doc/syntax/groff.nanorc
index 02b82b8..70f641d 100644
--- a/doc/syntax/groff.nanorc
+++ b/doc/syntax/groff.nanorc
@@ -1,24 +1,25 @@
 ## Here is an example for groff.
-##
+
 syntax "groff" "\.m[ems]$" "\.rof" "\.tmac$" "^tmac."
-## The argument of .ds or .nr
+
+# The argument of .ds or .nr
 color cyan "^\.(ds|nr) [^[[:space:]]]*"
-## Single character escapes
+# Single-character escapes
 color brightmagenta "\\."
-## Highlight the argument of \f or \s in the same color
+# The argument of \f or \s in the same color
 color brightmagenta "\\f." "\\f\(.." "\\s(\+|\-)?[0-9]"
-## Newlines
+# Newlines
 color cyan "(\\|\\\\)n(.|\(..)"
 color cyan start="(\\|\\\\)n\[" end="]"
-## Requests
+# Requests
 color brightgreen "^\.[[:space:]]*[^[[:space:]]]*"
-## Comments
+# Comments
 color yellow "^\.\\".*$"
-## Strings
+# Strings
 color green "(\\|\\\\)\*(.|\(..)"
 color green start="(\\|\\\\)\*\[" end="]"
-## Characters
+# Characters
 color brightred "\\\(.."
 color brightred start="\\\[" end="]"
-## Macro arguments
+# Macro arguments
 color brightcyan "\\\\\$[1-9]"
diff --git a/doc/syntax/html.nanorc b/doc/syntax/html.nanorc
index d31467d..8782dc3 100644
--- a/doc/syntax/html.nanorc
+++ b/doc/syntax/html.nanorc
@@ -1,5 +1,8 @@
 ## Here is a short example for HTML.
-##
-syntax "html" "\.html$"
-color blue start="<" end=">"
-color red "&[^;[[:space:]]]*;"
+
+syntax "html" "\.html?$"
+magic "HTML document text"
+
+color cyan start="<" end=">"
+color red "&[^;[:space:]]*;"
+color green ""(\\.|[^"])*""
diff --git a/doc/syntax/java.nanorc b/doc/syntax/java.nanorc
index a432f81..829c8af 100644
--- a/doc/syntax/java.nanorc
+++ b/doc/syntax/java.nanorc
@@ -1,9 +1,12 @@
 ## Here is an example for Java.
-##
+
 syntax "java" "\.java$"
+magic "Java "
+
 color green "\<(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\>"
 color red "\<(break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)\>"
-color cyan "\<(abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)\>"
+color cyan "\<(abstract|class|extends|final|implements|import|instanceof|interface|native)\>"
+color cyan "\<(package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)\>"
 color red ""[^"]*""
 color yellow "\<(true|false|null)\>"
 color blue "//.*"
diff --git a/doc/syntax/javascript.nanorc b/doc/syntax/javascript.nanorc
new file mode 100644
index 0000000..991f54b
--- /dev/null
+++ b/doc/syntax/javascript.nanorc
@@ -0,0 +1,19 @@
+## Here is an example for Javascript.
+
+syntax "javascript" "\.js$"
+
+color brightred "\<[A-Z_][0-9A-Z_]+\>"
+color green "\<(const|function|let|this|typeof|var|void)\>"
+color brightyellow "\<(for|if|while|with|do|else|case|default|switch)\>"
+color brightyellow "\<(export|try|throw|catch|new|delete)\>"
+color magenta "\<(continue|break|return|yield)\>"
+color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
+
+# Strings.
+color brightyellow "<[^= 	]*>" ""(\\.|[^"])*"" "'(\\.|[^'])*'"
+# Comments.
+color brightblue "//.*"
+color brightblue start="/\*" end="\*/"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/doc/syntax/json.nanorc b/doc/syntax/json.nanorc
new file mode 100644
index 0000000..0f799f1
--- /dev/null
+++ b/doc/syntax/json.nanorc
@@ -0,0 +1,32 @@
+## Syntax highlighting for JSON files.
+
+# See:  http://www.json.org/
+# Original author:  Aapo Rantalainen
+# License:  GPLv3 or newer
+
+syntax "json" "\.json$"
+
+# Numbers (used as value).
+color green ":[[:space:]]*\-?(0|[1-9][0-9]*)(\.[0-9]+)?([Ee]?[-+]?[0-9]+)?"
+# Values (well, any string).
+color brightmagenta "\".+\""
+# Hex numbers (used as value).
+color green ":[[:space:]]*\"#[0-9abcdefABCDEF]+\""
+# Escapes.
+color green "\\\\" "\\\"" "\\[bfnrt]" "\\u[0-9abcdefABCDEF]{4})"
+# Special words.
+color green "(true|false|null)"
+
+# Names (very unlikely to contain a quote).
+color brightblue "\"[^"]+\"[[:space:]]*:"
+
+# Brackets, braces, and separators.
+color brightblue "\[" "\]"
+color brightred "\{" "\}"
+color brightred "," ":"
+
+# Comments.
+color cyan "(^|[[:space:]]+)(//|#).*$"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/doc/syntax/lua.nanorc b/doc/syntax/lua.nanorc
new file mode 100644
index 0000000..3dbbea8
--- /dev/null
+++ b/doc/syntax/lua.nanorc
@@ -0,0 +1,62 @@
+## Syntax highlighting for Lua.
+#
+## Author:  Matthew Wild <mwild1 (at) gmail.com>
+## License: GPL 3 or later
+## Version: 2011-05-05
+
+syntax "lua" "\.lua$"
+
+color brightwhite "\[\[.*\]\]"
+
+# Operators
+color brightyellow ":|\*|/|%|\+|-|\^|>|>=|<|<=|~=|=|\.\.|\<(not|and|or)\>"
+
+# Statements
+color brightblue "\<(do|end|while|repeat|until|if|elseif|then|else|for|in|function|local|return|break)\>"
+
+# Keywords
+color brightyellow "\<(io|math|os|string|table|coroutine|debug)\>\."
+color brightyellow "\<(_G|_VERSION|assert|collectgarbage|dofile|error|getfenv|getmetatable|ipairs|load|loadfile|module|next|pairs|pcall|print|rawequal|rawget|rawset|require|select|setfenv|setmetatable|tonumber|tostring|type|unpack|xpcall)\s*\("
+
+# Standard library
+color brightyellow "io\.\<(close|flush|input|lines|open|output|popen|read|tmpfile|type|write|stdin|stdout|stderr)\>"
+color brightyellow "math\.\<(abs|acos|asin|atan2|atan|ceil|cosh|cos|deg|exp|floor|fmod|frexp|huge|ldexp|log10|log)\>"
+color brightyellow "math\.\<(max|min|mod|modf|pi|pow|rad|random|randomseed|sinh|tan)\>"
+color brightyellow "os\.\<(clock|date|difftime|execute|exit|getenv|remove|rename|setlocale|time|tmpname)\>"
+color brightyellow "package\.\<(cpath|loaded|loadlib|path|preload|seeall)\>"
+color brightyellow "string\.\<(byte|char|dump|find|format|gmatch|gsub|len|lower|match|rep|reverse|sub|upper)\>"
+color brightyellow "table\.\<(concat|insert|maxn|remove|sort)\>"
+color brightyellow "coroutine\.\<(create|resume|running|status|wrap|yield)\>"
+color brightyellow "debug\.\<(debug|getfenv|gethook|getinfo|getlocal|getmetatable|getregistry|getupvalue)\>"
+color brightyellow "debug\.\<(setfenv|sethook|setlocal|setmetatable|setupvalue|traceback)\>"
+
+# File handle methods
+color brightyellow "\:\<(close|flush|lines|read|seek|setvbuf|write)\>"
+
+# false, nil, true
+color brightmagenta "\<(false|nil|true)\>"
+
+# External files
+color brightgreen "\<(dofile|require)\>"
+
+# Numbers
+color red "\<([0-9]+)\>"
+
+# Symbols
+color brightmagenta "(\(|\)|\[|\]|\{|\})"
+
+# Shebang
+color brightcyan   "^#!.*"
+
+# Simple comments
+color green        "\-\-.*$"
+
+# Multiline comments
+color green         start="\-\-\[\[" end="\]\]"
+
+# Strings
+color red "\"(\\.|[^\\\"])*\"|'(\\.|[^\\'])*'"
+##color red         start="\[\[" end="\]\]"
+
+# Hex literals
+color red "0x[0-9a-fA-F]*"
diff --git a/doc/syntax/makefile.nanorc b/doc/syntax/makefile.nanorc
index 93a1e76..0416390 100644
--- a/doc/syntax/makefile.nanorc
+++ b/doc/syntax/makefile.nanorc
@@ -1,8 +1,12 @@
-# unattributed syntax highlighting example from wiki.linuxhelp.net/
+## Here is an example for Makefiles.
 
 syntax "makefile" "Makefile[^/]*$"
+
 color red "[:=]"
 color magenta "\<(if|ifeq|else|endif)\>"
 color blue "\$+[{(][a-zA-Z0-9_-]+[})]"
 color brightblue "^[^ 	]+:"
 color green "#.*$"
+
+## Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/doc/syntax/man.nanorc b/doc/syntax/man.nanorc
index 85efd26..6c296bb 100644
--- a/doc/syntax/man.nanorc
+++ b/doc/syntax/man.nanorc
@@ -1,9 +1,17 @@
 ## Here is an example for manpages.
-##
+
 syntax "man" "\.[1-9]x?$"
-color green "\.(S|T)H.*$"
-color brightgreen "\.(S|T)H" "\.TP"
-color brightred "\.(BR?|I[PR]?).*$"
-color brightblue "\.(BR?|I[PR]?|PP)"
-color brightwhite "\\f[BIPR]"
-color yellow "\.(br|DS|RS|RE|PD)"
+magic "troff or preprocessor input text"
+
+color green "\.(SH|SS|TH) .*$"
+color brightgreen "\.(SH|SS|TH) " "\.([HIT]P)"
+color brightred "\.(B[IR]?|I[BR]?|R[BI]|S[BM]) .*$"
+color brightblue "\.(B[IR]?|I[BR]?|R[BI]|S[BM]) " "\.([LP]?P)$"
+color magenta "\\f[BIPR]"
+color yellow "\.(br|DT|RS|RE|PD)"
+
+# Comments.
+color cyan "\.?\\\".*$"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/doc/syntax/mgp.nanorc b/doc/syntax/mgp.nanorc
index daba282..c0a5d20 100644
--- a/doc/syntax/mgp.nanorc
+++ b/doc/syntax/mgp.nanorc
@@ -1,7 +1,8 @@
-## Here is an example for Magicpoint presentations
-##
+## Here is an example for Magicpoint presentations.
+
 syntax "mgp" "\.mgp$"
 header "^%include.*"
+
 icolor green "^%[a-z].*$"
 color cyan "(^|[[:space:]])#.*$"
 color cyan "(^|[[:space:]])%%.*$"
diff --git a/doc/syntax/mutt.nanorc b/doc/syntax/mutt.nanorc
index 2e68399..80fbcf4 100644
--- a/doc/syntax/mutt.nanorc
+++ b/doc/syntax/mutt.nanorc
@@ -1,4 +1,9 @@
 ## Here is an example for quoted emails (under e.g. mutt).
-##
+
 syntax "mutt"
+
+# Quoted lines.
 color green "^>.*"
+
+# Signatures, even quoted ones.
+color yellow start="^>* ?-- $" end="^>* ?$"
diff --git a/doc/syntax/nanorc.nanorc b/doc/syntax/nanorc.nanorc
index 19ab533..1858f2b 100644
--- a/doc/syntax/nanorc.nanorc
+++ b/doc/syntax/nanorc.nanorc
@@ -1,16 +1,28 @@
 ## Here is an example for nanorc files.
-##
+
 syntax "nanorc" "\.?nanorc$"
-## Possible errors and parameters
-icolor brightwhite "^[[:space:]]*((un)?set|include|syntax|i?color).*$"
-## Keywords
-icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(allow_insecure_backup|autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|preserve|punct)\>" "^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|softwrap|speller|suspend|suspendenable|tabsize|tabstospaces|tempfile|undo|view|whitespace|wordbounds)\>"
-icolor green "^[[:space:]]*(set|unset|include|syntax|header)\>"
-## Colors
+
+# Possible errors and parameters
+icolor brightred "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|linter|i?color|extendsyntax).*$"
+
+# Keywords
+icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(allow_insecure_backup|autoindent|backup|backwards|boldtext|casesensitive|const|cut|fill|historylog|locking|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|poslog|preserve|quickblank|quiet|rebinddelete|rebindkeypad|regexp|smarthome|smooth|softwrap|suspend|tabsize|tabstospaces|tempfile|view|wordbounds)\>"
+icolor yellow "^[[:space:]]*set[[:space:]]+(functioncolor|keycolor|statuscolor|titlecolor)[[:space:]]+(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
+icolor brightgreen "^[[:space:]]*set[[:space:]]+(backupdir|brackets|functioncolor|keycolor|matchbrackets|operatingdir|punct|quotestr|speller|statuscolor|titlecolor|whitespace)[[:space:]]+"
+icolor brightgreen "^[[:space:]]*bind[[:space:]]+((\^|M-)([[:alpha:]]|space|[]]|[0-9_=+{}|;:'\",./<>\?-])|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+[[:alpha:]]+[[:space:]]+[[:alpha:]]+[[:space:]]*$"
+icolor brightgreen "^[[:space:]]*unbind[[:space:]]+((\^|M-)([[:alpha:]]|space|[]]|[0-9_=+{}|;:'\",./<>\?-])|F([1-9]|1[0-6])|Ins|Del)[[:space:]]+[[:alpha:]]+[[:space:]]*$"
+icolor brightgreen "^[[:space:]]*extendsyntax[[:space:]]+[[:alpha:]]+[[:space:]]+(i?color|header|magic|linter|formatter)[[:space:]]+.*$"
+icolor green "^[[:space:]]*((un)?(bind|set)|include|syntax|header|magic|linter|extendsyntax)\>"
+
+# Colors
 icolor yellow "^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
 icolor magenta "^[[:space:]]*i?color\>" "\<(start|end)="
-## Strings
-icolor white ""(\\.|[^"])*""
-## Comments
+
+# Strings
+icolor brightmagenta ""(\\.|[^"])*""
+# Comments
 icolor brightblue "^[[:space:]]*#.*$"
 icolor cyan "^[[:space:]]*##.*$"
+
+# Trailing whitespace
+color ,green "[[:space:]]+$"
diff --git a/doc/syntax/objc.nanorc b/doc/syntax/objc.nanorc
index cdf6e48..bfbae12 100644
--- a/doc/syntax/objc.nanorc
+++ b/doc/syntax/objc.nanorc
@@ -1,10 +1,9 @@
 ## Here is an example for C/C++/Obj-C.
-##
-syntax "m" "\.m$"
 
+syntax "m" "\.m$"
 
-## Stuffs
-color brightwhite "\<[A-Z_][0-9A-Z_]+\>" 
+# Stuffs,
+color brightwhite "\<[A-Z_][0-9A-Z_]+\>"
 color green "\<(float|double|BOOL|bool|char|int|short|long|id|sizeof|enum|void|static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
 color green "\<[[:alpha:]_][[:alnum:]_]*_t\>"
 color green "\<(class|namespace|template|public|protected|private|typename|this|friend|virtual|using|mutable|volatile|register|explicit)\>"
@@ -12,30 +11,29 @@ color brightgreen "\<(for|if|while|do|else|case|default|switch)\>"
 color brightgreen "\<(try|throw|catch|operator|new|delete)\>"
 color brightgreen "\<(goto|continue|break|return)\>"
 color brightgreen "@\<(en(code|d)|i(mplementation|nterface)|selector)\>"
-##
-## GCC builtins
+
+# GCC builtins.
 color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
 
-## Selector/method
+# Selector/method.
 color brightmagenta "(^|[[:space:]])\[.*[[:space:]].*\]"
 color white ":[[:alnum:]]*"
 color magenta "[[:alnum:]]*:"
 color white "\[[^][:space:]]*\]"
 
-##
-## String highlighting.  You will in general want your comments and
-## strings to come last, because syntax highlighting rules will be
-## applied in the order they are read in.
+# Strings.
 color brightblack "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
 color brightblack "<[^= 	]*>" ""(\\.|[^"])*""
 color brightblue "@"(\\.|[^"])*""
-##
-## This string is VERY resource intensive!
+# Multiline strings.  This regex is VERY resource intensive!
 ## color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
 
+# Preprocessor commands.
 color brightblue "^[[:space:]]*#[[:space:]]*(define|include|import|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
 
-## Comment highlighting
+# Comments.
 color yellow "//.*"
 color yellow start="/\*" end="\*/"
 
+# Trailing whitespace.                                                                                                       
+color ,green "[[:space:]]+$"
diff --git a/doc/syntax/ocaml.nanorc b/doc/syntax/ocaml.nanorc
index fc71ae2..8decb72 100644
--- a/doc/syntax/ocaml.nanorc
+++ b/doc/syntax/ocaml.nanorc
@@ -1,6 +1,7 @@
-# OCaml sample nanorc
-#
+## Syntax highlighting for OCaml.
+
 syntax "ocaml" "\.mli?$"
+
 #uid
 color red "\<[A-Z][0-9a-z_]{2,}\>"
 #declarations
@@ -10,7 +11,7 @@ color red "\<(type|open|class|module|exception|external)\>"
 #patterns
 color blue "\<(fun|function|functor|match|try|with)\>"
 #patterns-modifiers
-color yellow "\<(as|when|of)\>" 
+color yellow "\<(as|when|of)\>"
 #conditions
 color cyan "\<(if|then|else)\>"
 #blocs
diff --git a/doc/syntax/patch.nanorc b/doc/syntax/patch.nanorc
index a788b35..f5c1dd5 100644
--- a/doc/syntax/patch.nanorc
+++ b/doc/syntax/patch.nanorc
@@ -1,10 +1,21 @@
 ## Here is an example for patch files.
-##
+
 syntax "patch" "\.(patch|diff)$"
+magic "diff output text"
+
+# Added lines.
 color brightgreen "^\+.*"
-color green "^\+\+\+.*"
+# Show trailing whitespace only on added lines.
+color ,green "[[:space:]]+$"
+# Context lines.
 color brightblue "^ .*"
+# Deleted lines.
 color brightred "^-.*"
+
+# File names and dates.
 color red "^---.*"
+color green "^\+\+\+.*"
+# Line numbers.
 color brightyellow "^@@.*"
+# Header lines.
 color magenta "^diff.*"
diff --git a/doc/syntax/perl.nanorc b/doc/syntax/perl.nanorc
index b5a5606..6a70d3d 100644
--- a/doc/syntax/perl.nanorc
+++ b/doc/syntax/perl.nanorc
@@ -1,7 +1,9 @@
 ## Here is an example for Perl.
-##
+
 syntax "perl" "\.p[lm]$"
-header "^#!.*/perl[-0-9._]*"
+header "^#!.*perl[-0-9._]*"
+magic "Perl script text"
+
 color red "\<(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork))\>" "\<(get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join)\>" "\<(keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek(dir)?)\>" "\<(se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr(y)?|truncate|umask)\>" "\<(un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\>"
 color magenta "\<(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\>"
 icolor cyan start="[$@%]" end="( |[^0-9A-Z_]|-)"
diff --git a/doc/syntax/php.nanorc b/doc/syntax/php.nanorc
index 8ef495f..e3c4f1f 100644
--- a/doc/syntax/php.nanorc
+++ b/doc/syntax/php.nanorc
@@ -1,30 +1,31 @@
-## Here is an example for PHP
-##
+## Here is an example for PHP.
+
 syntax "php" "\.php[2345s~]?$"
+magic "PHP script text"
 
-## php markings
+# PHP markings.
 color brightgreen "(<\?(php)?|\?>)"
 
-## functions
+# Functions.
 color white "\<[a-z_]*\("
 
-## types
+# Types.
 color green "\<(var|float|global|double|bool|char|int|enum|const)\>"
 
-## structure
+# Structure.
 color brightyellow "\<(class|new|private|public|function|for|foreach|if|while|do|else|elseif|case|default|switch)\>"
 
-## control flow
+# Control flow.
 color magenta "\<(goto|continue|break|return)\>"
 
-## strings
+# Strings.
 color brightyellow "<[^=       ]*>" ""(\.|[^"])*""
 
-## comments
+# Comments.
 color brightblue "//.*"
 color brightblue start="/\*" end="\*/"
-#color blue start="<" end=">"
-#color red "&[^;[[:space:]]]*;"
+##color blue start="<" end=">"
+##color red "&[^;[[:space:]]]*;"
 
-## Trailing whitespace
+# Trailing whitespace.
 color ,green "[[:space:]]+$"
diff --git a/doc/syntax/po.nanorc b/doc/syntax/po.nanorc
new file mode 100644
index 0000000..567ef7a
--- /dev/null
+++ b/doc/syntax/po.nanorc
@@ -0,0 +1,27 @@
+## Colouring for PO files.
+
+syntax "po" "\.pot?$"
+
+# Comments.
+color green "^#.*$"
+color yellow "Copyright|\(C\)"
+# Header fields.
+color brightmagenta "\<(Project\-Id\-Version|Report\-Msgid\-Bugs\-To|Last\-Translator|Language\-Team|Language|X\-Generator|Plural\-Forms)\>"
+color cyan "\<(POT\-Creation\-Date|PO\-Revision\-Date|MIME\-Version|Content\-Type|Content\-Transfer\-Encoding)\>"
+# Encodings and numbers.
+color yellow "\<(UTF|ISO|Windows|Mac|IBM)\>\-[0-9]"
+color yellow "[0-9]|pre[0-9]|[0-9]bit"
+# Msgids.
+color brightblue "\<(msgid|msgid_plural|msgstr)\>"
+# Tags.
+color red "\<fuzzy\>"
+color yellow "\<c-format\>"
+# Format specifiers.
+color brightmagenta "%([1-9]\$)?[a-z]*"
+# Quotes and newlines.
+color yellow "\""
+color cyan "\\n"
+# Reminders.
+color ,yellow "(FIXME|TODO|XXX)"
+# Obsolete strings.
+color red "#~.*$"
diff --git a/doc/syntax/pov.nanorc b/doc/syntax/pov.nanorc
index 298b201..b7033b1 100644
--- a/doc/syntax/pov.nanorc
+++ b/doc/syntax/pov.nanorc
@@ -1,6 +1,7 @@
 ## Here is an example for POV-Ray.
-##
+
 syntax "pov" "\.(pov|POV|povray|POVRAY)$"
+
 color brightcyan "^[[:space:]]*#[[:space:]]*(declare)"
 color brightyellow "\<(sphere|cylinder|translate|matrix|rotate|scale)\>"
 color brightyellow "\<(orthographic|location|up|right|direction|clipped_by)\>"
@@ -10,6 +11,7 @@ color brightred "\<(light_source|background)\>"
 color brightred "\<(fog|object|camera)\>"
 color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
 color brightmagenta "\<(union|group|subgroup)\>"
-## Comment highlighting
+
+# Comments.
 color brightblue "//.*"
 color brightblue start="/\*" end="\*/"
diff --git a/doc/syntax/python.nanorc b/doc/syntax/python.nanorc
index 4280274..de876bd 100644
--- a/doc/syntax/python.nanorc
+++ b/doc/syntax/python.nanorc
@@ -1,10 +1,25 @@
 ## Here is an example for Python.
-##
+
 syntax "python" "\.py$"
-header "^#!.*/python[-0-9._]*"
+header "^#!.*python[-0-9._]*"
+
+# Function definitions.
 icolor brightblue "def [0-9A-Z_]+"
-color brightcyan "\<(and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield)\>"
+# Keywords.
+color brightcyan "\<(and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from)\>"
+color brightcyan "\<(global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield)\>"
+
+# Strings.
 color brightgreen "['][^']*[^\\][']" "[']{3}.*[^\\][']{3}"
 color brightgreen "["][^"]*[^\\]["]" "["]{3}.*[^\\]["]{3}"
-color brightgreen start=""""[^"]" end=""""" start="'''[^']" end="'''"
-color brightred "#.*$"
+# Multiline strings.
+color brightgreen start="\"\"\"([^"),]|$)" end="(^|[^(])\"\"\""
+color brightgreen    start="'''([^'),]|$)" end="(^|[^(])'''"
+
+# Comments.
+color brightred "(^|[[:blank:]])#.*$"
+# Reminders.
+color ,yellow "(FIXME|TODO|XXX)"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/doc/syntax/ruby.nanorc b/doc/syntax/ruby.nanorc
index b30b229..298425f 100644
--- a/doc/syntax/ruby.nanorc
+++ b/doc/syntax/ruby.nanorc
@@ -1,31 +1,33 @@
 ## Here is an example for Ruby.
-##
+
 syntax "ruby" "\.rb$"
-header "^#!.*/ruby[-0-9._]*"
-## Asciibetical list of reserved words
-color yellow "\<(BEGIN|END|alias|and|begin|break|case|class|def|defined\?|do|else|elsif|end|ensure|false|for|if|in|module|next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\>"
-## Constants
+header "^#!.*ruby[-0-9._]*"
+
+# Reserved words.
+color yellow "\<(BEGIN|END|alias|and|begin|break|case|class|def|defined\?|do|else|elsif|end|ensure|false|for|if|in|module)\>"
+color yellow "\<(next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\>"
+# Constants.
 color brightblue "(\$|@|@@)?\<[A-Z]+[0-9A-Z_a-z]*"
-## Ruby "symbols"
+# Ruby "symbols".
 icolor magenta "([ 	]|^):[0-9A-Z_]+\>"
-## Some unique things we want to stand out
+# Some unique things we want to stand out.
 color brightyellow "\<(__FILE__|__LINE__)\>"
-## Regular expressions
+# Regular expressions.
 color brightmagenta "/([^/]|(\\/))*/[iomx]*" "%r\{([^}]|(\\}))*\}[iomx]*"
-## Shell command expansion is in `backticks` or like %x{this}.  These are
-## "double-quotish" (to use a perlism).
+# Shell command expansion is in `backticks` or like %x{this}.  These are
+# "double-quotish" (to use a perlism).
 color brightblue "`[^`]*`" "%x\{[^}]*\}"
-## Strings, double-quoted
+# Strings, double-quoted.
 color green ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\[[^]]*\]" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!"
-## Expression substitution.  These go inside double-quoted strings,
-## "like #{this}".
+# Expression substitution.  These go inside double-quoted strings,
+# "like #{this}".
 color brightgreen "#\{[^}]*\}"
-## Strings, single-quoted
+# Strings, single-quoted.
 color green "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"
-## Comments
+# Comments.
 color cyan "#[^{].*$" "#$"
 color brightcyan "##[^{].*$" "##$"
-## "Here" docs
+# "Here" docs.
 color green start="<<-?'?EOT'?" end="^EOT"
-## Some common markers
+# Some common markers.
 color brightcyan "(XXX|TODO|FIXME|\?\?\?)"
diff --git a/doc/syntax/sh.nanorc b/doc/syntax/sh.nanorc
index ecce22e..074e03a 100644
--- a/doc/syntax/sh.nanorc
+++ b/doc/syntax/sh.nanorc
@@ -1,14 +1,27 @@
 ## Here is an example for Bourne shell scripts.
-##
+
 syntax "sh" "\.sh$"
-header "^#!.*/(ba|k|pdk)?sh[-0-9_]*"
+header "^#!.*((ba|da|k|pdk)?sh[-0-9_]*|openrc-run|runscript)"
+magic "(POSIX|Bourne.*) shell script text"
+
 icolor brightgreen "^[0-9A-Z_]+\(\)"
-color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\>"
-color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>"
+color green "\<(declare|eval|exec|export|let|local)\>"
+color green "[{}():;|`$<>!=&\\]" "(\]|\[)"
 color green "-[Ldefgruwx]\>"
 color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
-color brightblue "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|install|let|ln|make|mkdir|mv|rm|sed|set|tar|touch|umask|unset)\>"
-icolor brightred "\$\{?[0-9A-Z_!@#$*?-]+\}?"
+color brightblue "\<(awk|cat|cd|ch(grp|mod|own)|cp|echo|env|grep|install|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|umask|unset)\>"
+
+# Basic variable names (no braces).
+color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*"
+# More complicated variable names; handles braces and replacements and arrays.
+color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:space:]]*[[:alnum:]_]+[[:space:]]*|@)\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})"
+
+# Comments.
 color cyan "(^|[[:space:]])#.*$"
+
+# Strings.
 color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
+
+# Trailing whitespace.
 color ,green "[[:space:]]+$"
diff --git a/doc/syntax/spec.nanorc b/doc/syntax/spec.nanorc
new file mode 100644
index 0000000..47de211
--- /dev/null
+++ b/doc/syntax/spec.nanorc
@@ -0,0 +1,39 @@
+## Syntax highlighting for RPM spec files.
+
+syntax "spec" "\.(spec$|spec\.*)"
+
+# Main tags.
+color brightblue "((Icon|ExclusiveOs|ExcludeOs)[[:space:]]*:)"
+color brightblue "((BuildArch|BuildArchitectures|ExclusiveArch|ExcludeArch)[[:space:]]*:)"
+color brightblue "((Conflicts|Obsoletes|Provides|Requires|Requires\(.*\)|Enhances|Suggests|BuildConflicts|BuildRequires|Recommends|PreReq|Supplements)[[:space:]]*:)"
+color brightblue "((Epoch|Serial|Nosource|Nopatch)[[:space:]]*:)"
+color brightblue "((AutoReq|AutoProv|AutoReqProv)[[:space:]]*:)"
+color brightblue "((Copyright|License|Summary|Summary\(.*\)|Distribution|Vendor|Packager|Group|Source\d*|Patch\d*|BuildRoot|Prefix)[[:space:]]*:)"
+color brightblue "((Name|Version|Release|Url|URL)[[:space:]]*:)"
+color brightblue start="^Source" end=":" start="^Patch" end=":"
+# Architectures.
+color brightred "(i386|i486|i586|i686|athlon|ia64|alpha|alphaev5|alphaev56|alphapca56|alphaev6|alphaev67|sparc|sparcv9|sparc64armv3l|armv4b|armv4lm|ips|mipsel|ppc|ppc|iseries|ppcpseries|ppc64|m68k|m68kmint|Sgi|rs6000|i370|s390x|s390|noarch)"
+# Architecture conditionals.
+color brightred "(ifarch|ifnarch)"
+# OS conditionals.
+color brightred "(ifos|ifnos)"
+# %* strings.
+color green "%([A-Z_a-z_0-9_]*)"
+color magenta "%_([A-Z_a-z_0-9_]*)"
+color yellow start="%__" end="\ "
+color magenta start="%\{" end="\}"
+color yellow start="%\{__" end="\}"
+# Sections.
+color red "^%(build$|changelog|check$|clean$|description|files|install$|package|pre|prep$|pretrans|preun)"
+color red "^%(post|posttrans|postun|trigger|triggerin|triggerpostun|triggerun|verifyscript)"
+# Conditionals and defines.
+color brightred "%(if|else|endif|define|global|undefine)"
+
+# Comments.
+color cyan "#.*$"
+# Special case: "# norootforbuild" is handled as main tag.
+color brightblue "^# norootforbuild"
+# %changelog date entries.
+color brightyellow "^\* .*\)$"
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/doc/syntax/tcl.nanorc b/doc/syntax/tcl.nanorc
index ad3401f..8bcec24 100644
--- a/doc/syntax/tcl.nanorc
+++ b/doc/syntax/tcl.nanorc
@@ -1,13 +1,15 @@
+## Syntax highlighting for Tcl files.
+
 syntax "tcl" "\.tcl$"
 
-## Standard Tcl [info commands]
+# Standard Tcl [info commands]:
 color green "\<(after|append|array|auto_execok|auto_import|auto_load|auto_load_index|auto_qualify|binary|break|case|catch|cd|clock|close|concat|continue|encoding|eof|error|eval|exec|exit|expr|fblocked|fconfigure|fcopy|file|fileevent|flush|for|foreach|format|gets|glob|global|history|if|incr|info|interp|join|lappend|lindex|linsert|list|llength|load|lrange|lreplace|lsearch|lset|lsort|namespace|open|package|pid|puts|pwd|read|regexp|regsub|rename|return|scan|seek|set|socket|source|split|string|subst|switch|tclLog|tell|time|trace|unknown|unset|update|uplevel|upvar|variable|vwait|while)\>"
-## Basic Tcl sub commands.
+# Basic Tcl subcommands:
 color green "\<(array anymore|array donesearch|array exists|array get|array names|array nextelement|array set|array size|array startsearch|array statistics|array unset)\>"
 color green "\<(string bytelength|string compare|string equal|string first|string index|string is|string last|string length|string map|string match|string range|string repeat|string replace|string to|string tolower|string totitle|string toupper|string trim|string trimleft|string trimright|string will|string wordend|string wordstart)\>"
-## Extended TclX [info commands]
+# Extended TclX [info commands]:
 color green "\<(alarm|auto_load_pkg|bsearch|catclose|catgets|catopen|ccollate|cconcat|cequal|chgrp|chmod|chown|chroot|cindex|clength|cmdtrace|commandloop|crange|csubstr|ctoken|ctype|dup|echo|execl|fcntl|flock|fork|fstat|ftruncate|funlock|host_info|id|infox|keyldel|keylget|keylkeys|keylset|kill|lassign|lcontain|lempty|lgets|link|lmatch|loadlibindex|loop|lvarcat|lvarpop|lvarpush|max|min|nice|pipe|profile|random|readdir|replicate|scancontext|scanfile|scanmatch|select|server_accept|server_create|signal|sleep|sync|system|tclx_findinit|tclx_fork|tclx_load_tndxs|tclx_sleep|tclx_system|tclx_wait|times|translit|try_eval|umask|wait)\>"
-## Syntax.
+# Syntax:
 color brightblue "proc[[:space:]]" "(\{|\})"
 color green "(\(|\)|\;|`|\\|\$|<|>|!|=|&|\|)"
 color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
diff --git a/doc/syntax/tex.nanorc b/doc/syntax/tex.nanorc
index 23ca3a4..7fa417c 100644
--- a/doc/syntax/tex.nanorc
+++ b/doc/syntax/tex.nanorc
@@ -1,6 +1,7 @@
 ## Here is a short example for TeX files.
-##
+
 syntax "tex" "\.tex$"
+
 icolor green "\\.|\\[A-Z]*"
 color magenta "[{}]"
 color blue "(^|[^\])%.*"
diff --git a/doc/syntax/texinfo.nanorc b/doc/syntax/texinfo.nanorc
new file mode 100644
index 0000000..63354ba
--- /dev/null
+++ b/doc/syntax/texinfo.nanorc
@@ -0,0 +1,20 @@
+## Here is an example for Texinfo files.
+
+syntax "texinfo" "\.texi$"
+header "^\\input texinfo"
+magic "Texinfo source text"
+
+# Command arguments, trailing and enclosed.
+color cyan "^@[a-z]+[[:space:]]+.*$"
+color brightmagenta "@[a-z]+\{[^}]*\}"
+# Commands themselves.
+color yellow "@[a-z]+\{?" "\}"
+
+# Menu items.
+color brightred "^\*[[:space:]]+.*::.*$"
+
+# Comments.
+color green "@c[[:space:]]+.*$"
+
+# Trailing whitespace.
+color ,green "[[:space:]]+$"
diff --git a/doc/syntax/xml.nanorc b/doc/syntax/xml.nanorc
index 1f68c05..69982ea 100644
--- a/doc/syntax/xml.nanorc
+++ b/doc/syntax/xml.nanorc
@@ -1,6 +1,8 @@
-## Here is an example for xml files.
-##
+## Here is an example for XML files.
+
 syntax "xml" "\.([jrs]html?|sgml?|xml|xslt?)$"
+magic "(XML|SGML) (sub)?document text"
+
 color green  start="<" end=">"
 color cyan   "<[^> ]+"
 color cyan   ">"
diff --git a/doc/texinfo/Makefile.in b/doc/texinfo/Makefile.in
index 386be23..c46889e 100644
--- a/doc/texinfo/Makefile.in
+++ b/doc/texinfo/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -33,11 +77,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-target_triplet = @target@
 subdir = doc/texinfo
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in texinfo.tex
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/mkinstalldirs texinfo.tex
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
+	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -49,8 +94,48 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+AM_V_DVIPS = $(am__v_DVIPS_@AM_V@)
+am__v_DVIPS_ = $(am__v_DVIPS_@AM_DEFAULT_V@)
+am__v_DVIPS_0 = @echo "  DVIPS   " $@;
+am__v_DVIPS_1 = 
+AM_V_MAKEINFO = $(am__v_MAKEINFO_@AM_V@)
+am__v_MAKEINFO_ = $(am__v_MAKEINFO_@AM_DEFAULT_V@)
+am__v_MAKEINFO_0 = @echo "  MAKEINFO" $@;
+am__v_MAKEINFO_1 = 
+AM_V_INFOHTML = $(am__v_INFOHTML_@AM_V@)
+am__v_INFOHTML_ = $(am__v_INFOHTML_@AM_DEFAULT_V@)
+am__v_INFOHTML_0 = @echo "  INFOHTML" $@;
+am__v_INFOHTML_1 = 
+AM_V_TEXI2DVI = $(am__v_TEXI2DVI_@AM_V@)
+am__v_TEXI2DVI_ = $(am__v_TEXI2DVI_@AM_DEFAULT_V@)
+am__v_TEXI2DVI_0 = @echo "  TEXI2DVI" $@;
+am__v_TEXI2DVI_1 = 
+AM_V_TEXI2PDF = $(am__v_TEXI2PDF_@AM_V@)
+am__v_TEXI2PDF_ = $(am__v_TEXI2PDF_@AM_DEFAULT_V@)
+am__v_TEXI2PDF_0 = @echo "  TEXI2PDF" $@;
+am__v_TEXI2PDF_1 = 
+AM_V_texinfo = $(am__v_texinfo_@AM_V@)
+am__v_texinfo_ = $(am__v_texinfo_@AM_DEFAULT_V@)
+am__v_texinfo_0 = -q
+am__v_texinfo_1 = 
+AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
+am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
+am__v_texidevnull_0 = > /dev/null
+am__v_texidevnull_1 = 
 INFO_DEPS = $(srcdir)/nano.info
 am__TEXINFO_TEX_DIR = $(srcdir)
 DVIS = nano.dvi
@@ -63,6 +148,11 @@ TEXI2PDF = $(TEXI2DVI) --pdf --batch
 MAKEINFOHTML = $(MAKEINFO) --html
 AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
 DVIPS = dvips
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__installdirs = "$(DESTDIR)$(infodir)"
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -85,9 +175,17 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -133,6 +231,11 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NCURSESW_CFLAGS = @NCURSESW_CFLAGS@
+NCURSESW_CONFIG = @NCURSESW_CONFIG@
+NCURSESW_LIBS = @NCURSESW_LIBS@
+NCURSES_CFLAGS = @NCURSES_CFLAGS@
+NCURSES_LIBS = @NCURSES_LIBS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -144,6 +247,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKGDATADIR = @PKGDATADIR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -173,6 +278,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+haveit = @haveit@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -197,11 +303,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-target = @target@
 target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
@@ -245,7 +347,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 .texi.info:
-	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+	$(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
 	am__cwd=`pwd` && $(am__cd) $(srcdir) && \
 	rm -rf $$backupdir && mkdir $$backupdir && \
 	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
@@ -267,34 +369,32 @@ $(am__aclocal_m4_deps):
 	rm -rf $$backupdir; exit $$rc
 
 .texi.dvi:
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2DVI) $<
+	$(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
+	$<
 
 .texi.pdf:
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2PDF) $<
+	$(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
+	$<
 
 .texi.html:
-	rm -rf $(@:.html=.htp)
-	if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+	$(AM_V_MAKEINFO)rm -rf $(@:.html=.htp)
+	$(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
 	 -o $(@:.html=.htp) $<; \
 	then \
-	  rm -rf $@; \
-	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-	    mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
+	  rm -rf $@ && mv $(@:.html=.htp) $@; \
 	else \
-	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
-	  exit 1; \
+	  rm -rf $(@:.html=.htp); exit 1; \
 	fi
 $(srcdir)/nano.info: nano.texi 
 nano.dvi: nano.texi 
 nano.pdf: nano.texi 
 .dvi.ps:
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	$(DVIPS) -o $@ $<
+	$(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	$(DVIPS) $(AM_V_texinfo) -o $@ $<
 
 uninstall-dvi-am:
 	@$(NORMAL_UNINSTALL)
@@ -316,9 +416,7 @@ uninstall-html-am:
 
 uninstall-info-am:
 	@$(PRE_UNINSTALL)
-	@if test -d '$(DESTDIR)$(infodir)' && \
-	    (install-info --version && \
-	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
+	@if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -375,9 +473,7 @@ dist-info: $(INFO_DEPS)
 	done
 
 mostlyclean-aminfo:
-	-rm -rf nano.aux nano.cp nano.cps nano.fn nano.fns nano.ky nano.kys \
-	  nano.log nano.pg nano.pgs nano.tmp nano.toc nano.tp nano.tps \
-	  nano.vr nano.vrs
+	-rm -rf nano.t2d nano.t2p
 
 clean-aminfo:
 	-test -z "nano.dvi nano.pdf nano.ps nano.html" \
@@ -389,11 +485,11 @@ maintainer-clean-aminfo:
 	  echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
 	  rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
 	done
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -448,10 +544,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -490,8 +591,11 @@ install-dvi: install-dvi-am
 
 install-dvi-am: $(DVIS)
 	@$(NORMAL_INSTALL)
-	test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
 	@list='$(DVIS)'; test -n "$(dvidir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -506,18 +610,22 @@ install-html: install-html-am
 
 install-html-am: $(HTMLS)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
 	@list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  $(am__strip_dir) \
-	  if test -d "$$d$$p"; then \
+	  d2=$$d$$p; \
+	  if test -d "$$d2"; then \
 	    echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
 	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
-	    echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \
-	    $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
+	    echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+	    $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
 	  else \
-	    list2="$$list2 $$d$$p"; \
+	    list2="$$list2 $$d2"; \
 	  fi; \
 	done; \
 	test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
@@ -529,9 +637,12 @@ install-info: install-info-am
 
 install-info-am: $(INFO_DEPS)
 	@$(NORMAL_INSTALL)
-	test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \
+	fi; \
 	for file in $$list; do \
 	  case $$file in \
 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
@@ -549,8 +660,7 @@ install-info-am: $(INFO_DEPS)
 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
 	@$(POST_INSTALL)
-	@if (install-info --version && \
-	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
+	@if $(am__can_run_installinfo); then \
 	  list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
 	  for file in $$list; do \
 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
@@ -564,8 +674,11 @@ install-pdf: install-pdf-am
 
 install-pdf-am: $(PDFS)
 	@$(NORMAL_INSTALL)
-	test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
 	@list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -577,8 +690,11 @@ install-ps: install-ps-am
 
 install-ps-am: $(PSS)
 	@$(NORMAL_INSTALL)
-	test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
 	@list='$(PSS)'; test -n "$(psdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -611,16 +727,17 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
 .MAKE: all check install install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-aminfo clean-generic \
-	dist-info distclean distclean-generic distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
-	mostlyclean-aminfo mostlyclean-generic pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-dvi-am uninstall-html-am \
+	cscopelist-am ctags-am dist-info distclean distclean-generic \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-aminfo \
+	maintainer-clean-generic mostlyclean mostlyclean-aminfo \
+	mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-dvi-am uninstall-html-am \
 	uninstall-info-am uninstall-pdf-am uninstall-ps-am
 
 
diff --git a/doc/texinfo/nano.html b/doc/texinfo/nano.html
index b673557..0568413 100644
--- a/doc/texinfo/nano.html
+++ b/doc/texinfo/nano.html
@@ -1,363 +1,583 @@
-<html lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- Created by GNU Texinfo 5.2, http://www.gnu.org/software/texinfo/ -->
 <head>
 <title>nano Command Manual</title>
-<meta http-equiv="Content-Type" content="text/html">
+
 <meta name="description" content="nano Command Manual">
-<meta name="generator" content="makeinfo 4.13">
-<link title="Top" rel="top" href="#Top">
-<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<style type="text/css"><!--
-  pre.display { font-family:inherit }
-  pre.format  { font-family:inherit }
-  pre.smalldisplay { font-family:inherit; font-size:smaller }
-  pre.smallformat  { font-family:inherit; font-size:smaller }
-  pre.smallexample { font-size:smaller }
-  pre.smalllisp    { font-size:smaller }
-  span.sc    { font-variant:small-caps }
-  span.roman { font-family:serif; font-weight:normal; } 
-  span.sansserif { font-family:sans-serif; font-weight:normal; } 
---></style>
+<meta name="keywords" content="nano Command Manual">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="makeinfo">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<link href="#Top" rel="start" title="Top">
+<link href="#SEC_Contents" rel="contents" title="Table of Contents">
+<link href="dir.html#Top" rel="up" title="(dir)">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.smallquotation {font-size: smaller}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.indentedblock {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+div.smalldisplay {margin-left: 3.2em}
+div.smallexample {margin-left: 3.2em}
+div.smallindentedblock {margin-left: 3.2em; font-size: smaller}
+div.smalllisp {margin-left: 3.2em}
+kbd {font-style:oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: inherit; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: inherit; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.nocodebreak {white-space:nowrap}
+span.nolinebreak {white-space:nowrap}
+span.roman {font-family:serif; font-weight:normal}
+span.sansserif {font-family:sans-serif; font-weight:normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
 </head>
-<body>
-<h1 class="settitle">nano Command Manual</h1>
-<div class="node">
-<a name="Top"></a>
-<p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#Introduction">Introduction</a>,
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#dir">(dir)</a>,
-Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
 
-</div>
+<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
+<h1 class="settitle" align="center">nano Command Manual</h1>
 
-   <p>This manual documents GNU <code>nano</code>, a small and friendly text
-editor.
 
-<ul class="menu">
-<li><a accesskey="1" href="#Introduction">Introduction</a>
-<li><a accesskey="2" href="#Editor-Basics">Editor Basics</a>
-<li><a accesskey="3" href="#Online-Help">Online Help</a>
-<li><a accesskey="4" href="#Feature-Toggles">Feature Toggles</a>
-<li><a accesskey="5" href="#Nanorc-Files">Nanorc Files</a>
-<li><a accesskey="6" href="#The-File-Browser">The File Browser</a>
-<li><a accesskey="7" href="#Pico-Compatibility">Pico Compatibility</a>
-<li><a accesskey="8" href="#Building-and-Configure-Options">Building and Configure Options</a>
-</ul>
 
-<div class="node">
-<a name="Introduction"></a>
-<p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#Editor-Basics">Editor Basics</a>,
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#Top">Top</a>,
-Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 
+
+
+<a name="Top"></a>
+<div class="header">
+<p>
+Next: <a href="#Introduction" accesskey="n" rel="next">Introduction</a>, Up: <a href="dir.html#Top" accesskey="u" rel="up">(dir)</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
+<a name="SEC_Top"></a>
 
+<p>This manual documents GNU <code>nano</code>, a small and friendly text
+editor.
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top">&bull; <a href="#Introduction" accesskey="1">Introduction</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Editor-Basics" accesskey="2">Editor Basics</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Online-Help" accesskey="3">Online Help</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Feature-Toggles" accesskey="4">Feature Toggles</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Nanorc-Files" accesskey="5">Nanorc Files</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#The-File-Browser" accesskey="6">The File Browser</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Pico-Compatibility" accesskey="7">Pico Compatibility</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Building-and-Configure-Options" accesskey="8">Building and Configure Options</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+</table>
+
+
+<hr>
+<a name="Introduction"></a>
+<div class="header">
+<p>
+Next: <a href="#Editor-Basics" accesskey="n" rel="next">Editor Basics</a>, Previous: <a href="#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+</div>
+<a name="Introduction-1"></a>
 <h2 class="chapter">1 Introduction</h2>
 
 <p>GNU <code>nano</code> is a small and friendly text editor.  Besides basic text
-editing, <code>nano</code> offers many extra features like an interactive
-search and replace, go to line and column number, auto-indentation,
+editing, <code>nano</code> offers many extra features, like an interactive
+search-and-replace, go-to-line-and-column-number, auto-indentation,
 feature toggles, internationalization support, and filename tab
 completion.
-
-<ul class="menu">
-<li><a accesskey="1" href="#Overview">Overview</a>
-<li><a accesskey="2" href="#Command-Line-Options">Command Line Options</a>
-</ul>
-
-<div class="node">
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top">&bull; <a href="#Overview" accesskey="1">Overview</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Command-Line-Options" accesskey="2">Command Line Options</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<hr>
 <a name="Overview"></a>
-<p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#Command-Line-Options">Command Line Options</a>,
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#Introduction">Introduction</a>,
-Up:&nbsp;<a rel="up" accesskey="u" href="#Introduction">Introduction</a>
-
+<div class="header">
+<p>
+Next: <a href="#Command-Line-Options" accesskey="n" rel="next">Command Line Options</a>, Up: <a href="#Introduction" accesskey="u" rel="up">Introduction</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-
+<a name="Overview-1"></a>
 <h3 class="section">1.1 Overview</h3>
 
 <p>The original goal for <code>nano</code> was a complete bug-for-bug compatible
-emulation of Pico, but <code>nano</code>'s current goal is to be as compatible
-as possible while offering a superset of Pico's functionality.  See
+emulation of Pico, but <code>nano</code>&rsquo;s current goal is to be as compatible
+as possible while offering a superset of Pico&rsquo;s functionality.  See
 See <a href="#Pico-Compatibility">Pico Compatibility</a>, for more info.
-
-   <p>The usual way to invoke <code>nano</code> is:
-
-   <blockquote>
-<code>nano [OPTION]... [FILE]</code>
-</blockquote>
-
-   <p>But it is also possible to edit several files in a row.  Additionally,
+</p>
+<p>The usual way to invoke <code>nano</code> is:
+</p>
+<blockquote>
+<p><code>nano [OPTION]&hellip; [FILE]</code>
+</p></blockquote>
+
+<p>But it is also possible to edit several files in a row.  Additionally,
 the cursor can be put on a desired line number by adding this number
 with a plus sign before any filename, and even in a desired column by
 adding it with a comma.  So the complete synopsis is:
-
-   <blockquote>
-<code>nano [OPTION]... [[+LINE] FILE]...</code>
-
-   <p><code>nano [OPTION]... [[+,COLUMN] FILE]...</code>
-
-   <p><code>nano [OPTION]... [[+LINE,COLUMN] FILE]...</code>
-</blockquote>
-
-   <p>Email bug reports to <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a>.
-
-<div class="node">
+</p>
+<blockquote>
+<p><code>nano [OPTION]&hellip; [[+LINE] FILE]&hellip;</code>
+</p>
+<p><code>nano [OPTION]&hellip; [[+,COLUMN] FILE]&hellip;</code>
+</p>
+<p><code>nano [OPTION]&hellip; [[+LINE,COLUMN] FILE]&hellip;</code>
+</p></blockquote>
+
+<p>Email bug reports to <a href="mailto:nano@nano-editor.org">nano@nano-editor.org</a>.
+</p>
+<hr>
 <a name="Command-Line-Options"></a>
-<p><hr>
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#Overview">Overview</a>,
-Up:&nbsp;<a rel="up" accesskey="u" href="#Introduction">Introduction</a>
-
+<div class="header">
+<p>
+Previous: <a href="#Overview" accesskey="p" rel="prev">Overview</a>, Up: <a href="#Introduction" accesskey="u" rel="up">Introduction</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-
+<a name="Command-Line-Options-1"></a>
 <h3 class="section">1.2 Command Line Options</h3>
 
 <p><code>nano</code> takes the following options from the command line:
-
-     <dl>
-<dt><code>+LINE,COLUMN</code><dd>Start at line number LINE and column number COLUMN (at least one of
+</p>
+<dl compact="compact">
+<dt><samp>+<var>line</var>,<var>column</var></samp></dt>
+<dd><p>Start at line number <var>line</var> and column number <var>column</var> (at least one of
 which must be specified) instead of the default of line 1, column 1.
-
-     <br><dt><code>-?</code><dd>Same as <code>-h, --help</code>.
-
-     <br><dt><code>-A, --smarthome</code><dd>Make the Home key smarter.  When Home is pressed anywhere but at the
+</p>
+</dd>
+<dt><samp>-A</samp></dt>
+<dt><samp>--smarthome</samp></dt>
+<dd><p>Make the Home key smarter.  When Home is pressed anywhere but at the
 very beginning of non-whitespace characters on a line, the cursor will
 jump to that beginning (either forwards or backwards).  If the cursor is
 already at that position, it will jump to the true beginning of the
 line.
-
-     <br><dt><code>-B, --backup</code><dd>When saving a file, back up the previous version of it to the current
-filename suffixed with a ~.
-
-     <br><dt><code>-C &lt;dir&gt;, --backupdir=&lt;dir&gt;</code><dd>Set the directory where <code>nano</code> puts unique backup files if file
+</p>
+</dd>
+<dt><samp>-B</samp></dt>
+<dt><samp>--backup</samp></dt>
+<dd><p>When saving a file, back up the previous version of it to the current
+filename suffixed with a &lsquo;<samp>~</samp>&rsquo;.
+</p>
+</dd>
+<dt><samp>-C <var>directory</var></samp></dt>
+<dt><samp>--backupdir=<var>directory</var></samp></dt>
+<dd><p>Set the directory where <code>nano</code> puts unique backup files if file
 backups are enabled.
-
-     <br><dt><code>-D, --boldtext</code><dd>Use bold text instead of reverse video text.
-
-     <br><dt><code>-E, --tabstospaces</code><dd>Convert typed tabs to spaces.
-
-     <br><dt><code>-F, --multibuffer</code><dd>Enable multiple file buffers, if available.
-
-     <br><dt><code>-H, --historylog</code><dd>Log search and replace strings to ~/.nano_history, so they can be
-retrieved in later sessions, if nanorc support is available.
-
-     <br><dt><code>-I, --ignorercfiles</code><dd>Don't look at SYSCONFDIR/nanorc or ~/.nanorc, if nanorc support is
-available.
-
-     <br><dt><code>-K, --rebindkeypad</code><dd>Interpret the numeric keypad keys so that they all work properly.  You
-should only need to use this option if they don't, as mouse support
-won't work properly with this option enabled.
-
-     <br><dt><code>-L, --nonewlines</code><dd>Don't add newlines to the ends of files.
-
-     <br><dt><code>-N, --noconvert</code><dd>Don't convert files from DOS/Mac format.
-
-     <br><dt><code>-O, --morespace</code><dd>Use the blank line below the titlebar as extra editing space.
-
-     <br><dt><code>-Q &lt;str&gt;, --quotestr=&lt;str&gt;</code><dd>Set the quoting string for justifying.  The default value is
-
-     <blockquote>
-<code>^([ \t]*[|&gt;:}#])+</code>
-</blockquote>
-
-     <p>if extended regular expression support is available, or "&gt; " otherwise. 
+</p>
+</dd>
+<dt><samp>-D</samp></dt>
+<dt><samp>--boldtext</samp></dt>
+<dd><p>Use bold text instead of reverse video text.
+</p>
+</dd>
+<dt><samp>-E</samp></dt>
+<dt><samp>--tabstospaces</samp></dt>
+<dd><p>Convert typed tabs to spaces.
+</p>
+</dd>
+<dt><samp>-F</samp></dt>
+<dt><samp>--multibuffer</samp></dt>
+<dd><p>Enable multiple file buffers (if support for them has been compiled in).
+</p>
+</dd>
+<dt><samp>-G</samp></dt>
+<dt><samp>--locking</samp></dt>
+<dd><p>Enable vim-style file locking when editing files.
+</p>
+</dd>
+<dt><samp>-H</samp></dt>
+<dt><samp>--historylog</samp></dt>
+<dd><p>Log search and replace strings to <samp>~/.nano/search_history</samp>,
+so they can be retrieved in later sessions.
+</p>
+</dd>
+<dt><samp>-I</samp></dt>
+<dt><samp>--ignorercfiles</samp></dt>
+<dd><p>Don&rsquo;t look at the system&rsquo;s nanorc file nor at the user&rsquo;s <samp>~/.nanorc</samp>.
+</p>
+</dd>
+<dt><samp>-K</samp></dt>
+<dt><samp>--rebindkeypad</samp></dt>
+<dd><p>Interpret the numeric keypad keys so that they all work properly.  You
+should only need to use this option if they don&rsquo;t, as mouse support
+won&rsquo;t work properly with this option enabled.
+</p>
+</dd>
+<dt><samp>-L</samp></dt>
+<dt><samp>--nonewlines</samp></dt>
+<dd><p>Don&rsquo;t add newlines to the ends of files.
+</p>
+</dd>
+<dt><samp>-N</samp></dt>
+<dt><samp>--noconvert</samp></dt>
+<dd><p>Disable automatic conversion of files from DOS/Mac format.
+</p>
+</dd>
+<dt><samp>-O</samp></dt>
+<dt><samp>--morespace</samp></dt>
+<dd><p>Use the blank line below the titlebar as extra editing space.
+</p>
+</dd>
+<dt><samp>-P</samp></dt>
+<dt><samp>--poslog</samp></dt>
+<dd><p>Log for each file the last location of the cursor, and read it
+back upon reopening the file and place it there again.
+</p>
+</dd>
+<dt><samp>-Q &quot;<var>characters</var>&quot;</samp></dt>
+<dt><samp>--quotestr=&quot;<var>characters</var>&quot;</samp></dt>
+<dd><p>Set the quoting string for justifying.  The default value is
+</p>
+<blockquote>
+<p>&quot;^([ \t]*[|&gt;:}#])+&quot;
+</p></blockquote>
+
+<p>if extended regular expression support is available, or <code>&gt; </code> otherwise.
 Note that <code>\t</code> above stands for a literal Tab character.
-
-     <br><dt><code>-R, --restricted</code><dd>Restricted mode: don't read or write to any file not specified on the
-command line; read any nanorc files; allow suspending; allow a file to
-be appended to, prepended to, or saved under a different name if it
-already has one; or use backup files or spell checking.  Also accessible
-by invoking <code>nano</code> with any name beginning with 'r' (e.g. "rnano").
-
-     <br><dt><code>-S, --smooth</code><dd>Enable smooth scrolling.  Text will scroll line-by-line, instead of the
+</p>
+</dd>
+<dt><samp>-R</samp></dt>
+<dt><samp>--restricted</samp></dt>
+<dd><p>Restricted mode: don&rsquo;t read or write to any file not specified on the
+command line; don&rsquo;t read any nanorc files nor history files; don&rsquo;t allow
+suspending nor spell checking; don&rsquo;t
+allow a file to be appended to, prepended to, or saved under a different
+name if it already has one; and don&rsquo;t use backup files.
+This restricted mode is also accessible by invoking <code>nano</code> with
+any name beginning with &lsquo;<samp>r</samp>&rsquo; (e.g. <code>rnano</code>).
+</p>
+</dd>
+<dt><samp>-S</samp></dt>
+<dt><samp>--smooth</samp></dt>
+<dd><p>Enable smooth scrolling.  Text will scroll line-by-line, instead of the
 usual chunk-by-chunk behavior.
-
-     <br><dt><code>-T &lt;#cols&gt;, --tabsize=&lt;#cols&gt;</code><dd>Set the displayed tab length to #cols columns.  The value of #cols must
-be greater than 0.  The default value is 8.
-
-     <br><dt><code>-U, --quickblank</code><dd>Do quick statusbar blanking.  Statusbar messages will disappear after 1
-keystroke instead of 25.  Note that -c overrides this.
-
-     <br><dt><code>-V, --version</code><dd>Show the current version number and exit.
-
-     <br><dt><code>-W, --wordbounds</code><dd>Detect word boundaries more accurately by treating punctuation
+</p>
+</dd>
+<dt><samp>-T <var>number</var></samp></dt>
+<dt><samp>--tabsize=<var>number</var></samp></dt>
+<dd><p>Set the displayed tab length to <var>number</var> columns.  The value of
+<var>number</var> must be greater than 0.  The default value is &lsquo;<samp>8</samp>&rsquo;.
+</p>
+</dd>
+<dt><samp>-U</samp></dt>
+<dt><samp>--quickblank</samp></dt>
+<dd><p>Do quick statusbar blanking.  Statusbar messages will disappear after 1
+keystroke instead of 25.  Note that <samp>-c</samp> overrides this.
+</p>
+</dd>
+<dt><samp>-V</samp></dt>
+<dt><samp>--version</samp></dt>
+<dd><p>Show the current version number and exit.
+</p>
+</dd>
+<dt><samp>-W</samp></dt>
+<dt><samp>--wordbounds</samp></dt>
+<dd><p>Detect word boundaries more accurately by treating punctuation
 characters as parts of words.
-
-     <br><dt><code>-Y &lt;str&gt;, --syntax=&lt;str&gt;</code><dd>Specify a specific syntax highlighting from the nanorc to use, if
-available.  See See <a href="#Nanorc-Files">Nanorc Files</a>, for more info.
-
-     <br><dt><code>-c, --const</code><dd>Constantly display the cursor position and line number on the statusbar. 
-Note that this overrides -U.
-
-     <br><dt><code>-d, --rebinddelete</code><dd>Interpret the Delete key differently so that both Backspace and Delete
+</p>
+</dd>
+<dt><samp>-Y <var>name</var></samp></dt>
+<dt><samp>--syntax=<var>name</var></samp></dt>
+<dd><p>Specify a specific syntax from the nanorc files to use for highlighting.
+See See <a href="#Syntax-Highlighting">Syntax Highlighting</a>, for more info.
+</p>
+</dd>
+<dt><samp>-c</samp></dt>
+<dt><samp>--const</samp></dt>
+<dd><p>Constantly display the cursor position and line number on the statusbar.
+Note that this overrides <samp>-U</samp>.
+</p>
+</dd>
+<dt><samp>-d</samp></dt>
+<dt><samp>--rebinddelete</samp></dt>
+<dd><p>Interpret the Delete key differently so that both Backspace and Delete
 work properly.  You should only need to use this option if Backspace
 acts like Delete on your system.
-
-     <br><dt><code>-h, --help</code><dd>Show a summary of command line options and exit.
-
-     <br><dt><code>-i, --autoindent</code><dd>Automatically indent new lines to the same number of spaces and tabs as
+</p>
+</dd>
+<dt><samp>-h</samp></dt>
+<dt><samp>--help</samp></dt>
+<dd><p>Show a summary of command-line options and exit.
+</p>
+</dd>
+<dt><samp>-i</samp></dt>
+<dt><samp>--autoindent</samp></dt>
+<dd><p>Automatically indent new lines to the same number of spaces and tabs as
 the previous line.
-
-     <br><dt><code>-k, --cut</code><dd>Cut from the current cursor position to the end of the current line.
-
-     <br><dt><code>-l, --nofollow</code><dd>When writing files, if the given file is a symbolic link, it is removed
+</p>
+</dd>
+<dt><samp>-k</samp></dt>
+<dt><samp>--cut</samp></dt>
+<dd><p>Make the &rsquo;Cut Text&rsquo; command (normally ^K) cut from the current cursor
+position to the end of the line, instead of cutting the entire line.
+</p>
+</dd>
+<dt><samp>-l</samp></dt>
+<dt><samp>--nofollow</samp></dt>
+<dd><p>When writing files, if the given file is a symbolic link, it is removed
 and a new file is created.
-
-     <br><dt><code>-m, --mouse</code><dd>Enable mouse support, if available for your system.  When enabled, mouse
+</p>
+</dd>
+<dt><samp>-m</samp></dt>
+<dt><samp>--mouse</samp></dt>
+<dd><p>Enable mouse support, if available for your system.  When enabled, mouse
 clicks can be used to place the cursor, set the mark (with a double
 click), and execute shortcuts.  The mouse will work in the X Window
-System, and on the console when gpm is running.
-
-     <br><dt><code>-o &lt;dir&gt;, --operatingdir=&lt;dir&gt;</code><dd>Set operating directory.  Makes <code>nano</code> set up something similar to
-a chroot.
-
-     <br><dt><code>-p, --preserve</code><dd>Preserve the ^Q (XON) and ^S (XOFF) sequences so data being sent to the
-editor can be can be stopped and started.
-
-     <br><dt><code>-q, --quiet</code><dd>Do not report errors in the nanorc file and ask them to be acknowledged
+System, and on the console when gpm is running.  Text can still be
+selected through dragging by holding down the Shift key.
+</p>
+</dd>
+<dt><samp>-n</samp></dt>
+<dt><samp>--noread</samp></dt>
+<dd><p>Treat any name given on the command line as a new file.  This allows
+<code>nano</code> to write to named pipes: it will start with a blank buffer,
+and will write to the pipe when the user saves the &quot;file&quot;.  This way
+<code>nano</code> can be used as an editor in combination with for instance
+<code>gpg</code> without having to write sensitive data to disk first.
+</p>
+</dd>
+<dt><samp>-o <var>directory</var></samp></dt>
+<dt><samp>--operatingdir=<var>directory</var></samp></dt>
+<dd><p>Set the operating directory.  This makes <code>nano</code> set up something
+similar to a chroot.
+</p>
+</dd>
+<dt><samp>-p</samp></dt>
+<dt><samp>--preserve</samp></dt>
+<dd><p>Preserve the ^Q (XON) and ^S (XOFF) sequences so data being sent to the
+editor can be stopped and started.
+</p>
+</dd>
+<dt><samp>-q</samp></dt>
+<dt><samp>--quiet</samp></dt>
+<dd><p>Do not report errors in the nanorc file nor ask them to be acknowledged
 by pressing Enter at startup.
-
-     <br><dt><code>-r &lt;#cols&gt;, --fill=&lt;#cols&gt;</code><dd>Wrap lines at column #cols.  If this value is 0 or less, wrapping will
-occur at the width of the screen less #cols, allowing it to vary along
-with the width of the screen if the screen is resized.  The default
-value is -8.
-
-     <br><dt><code>-s &lt;prog&gt;, --speller=&lt;prog&gt;</code><dd>Invoke the given program as the spell checker.  By default, <code>nano</code>
-uses the command specified in the SPELL environment variable, or, if
-SPELL is not set, its own interactive spell checker that requires the
-<code>spell</code> program to be installed on your system.
-
-     <br><dt><code>-t, --tempfile</code><dd>Don't ask whether or not to save the current contents of the file when
+</p>
+</dd>
+<dt><samp>-r <var>number</var></samp></dt>
+<dt><samp>--fill=<var>number</var></samp></dt>
+<dd><p>Hard-wrap lines at column <var>number</var> (by inserting a newline character).
+If the given value is 0 or less, wrapping will occur at the width of
+the screen minus the given amount, allowing the wrapping width to
+vary along with the width of the screen if and when it is resized.
+The default value is &lsquo;<samp>-8</samp>&rsquo;.  This option conflicts with <samp>-w</samp>
+&ndash; the last one given takes effect.
+</p>
+</dd>
+<dt><samp>-s <var>program</var></samp></dt>
+<dt><samp>--speller=<var>program</var></samp></dt>
+<dd><p>Invoke the given program as the spell checker.  By default, <code>nano</code>
+uses the command specified in the <code>SPELL</code> environment variable, or,
+if <code>SPELL</code> is not set, its own interactive spell checker that requires
+the <code>spell</code> program to be installed on your system.
+</p>
+</dd>
+<dt><samp>-t</samp></dt>
+<dt><samp>--tempfile</samp></dt>
+<dd><p>Don&rsquo;t ask whether or not to save the current contents of the file when
 exiting, assume yes.  This is most useful when using <code>nano</code> as the
 composer of a mailer program.
-
-     <br><dt><code>-u, --undo</code><dd>Enable experimental generic-purpose undo code.  By default, the undo and
-redo shortcuts are Meta-U and Meta-E, respectively.
-
-     <br><dt><code>-v, --view</code><dd>Don't allow the contents of the file to be altered.  Note that this
+</p>
+</dd>
+<dt><samp>-v</samp></dt>
+<dt><samp>--view</samp></dt>
+<dd><p>Don&rsquo;t allow the contents of the file to be altered.  Note that this
 option should NOT be used in place of correct file permissions to
 implement a read-only file.
-
-     <br><dt><code>-w, --nowrap</code><dd>Don't wrap long lines at any length.  This option overrides any value
-for -r.
-
-     <p><a name="Expert-Mode"></a><br><dt><code>-x, --nohelp</code><dd>Expert Mode: don't show the Shortcut Lists at the bottom of the screen. 
+</p>
+</dd>
+<dt><samp>-w</samp></dt>
+<dt><samp>--nowrap</samp></dt>
+<dd><p>Don&rsquo;t hard-wrap long lines at any length.  This option conflicts with
+<samp>-r</samp> &ndash; the last one given takes effect.
+</p>
+<a name="Expert-Mode"></a></dd>
+<dt><samp>-x</samp></dt>
+<dt><samp>--nohelp</samp></dt>
+<dd><p>Expert Mode: don&rsquo;t show the Shortcut Lists at the bottom of the screen.
 This affects the location of the statusbar as well, as in Expert Mode it
 is located at the very bottom of the editor.
-
-     <p>Note: When accessing the help system, Expert Mode is temporarily
-disabled to display the help system navigation keys.
-
-     <br><dt><code>-z, --suspend</code><dd>Enable <code>nano</code>'s suspend ability using the system's suspend
+</p>
+<p>Note: When accessing the help system, Expert Mode is temporarily
+disabled to display the help-system navigation keys.
+</p>
+</dd>
+<dt><samp>-z</samp></dt>
+<dt><samp>--suspend</samp></dt>
+<dd><p>Enable the ability to suspend <code>nano</code> using the system&rsquo;s suspend
 keystroke (usually ^Z).
-
-     <br><dt><code>-$, --softwrap</code><dd>Enable 'soft wrapping'.  <code>nano</code> will attempt to display the entire
-contents of a line, even if it is longer than the screen width.  Since
-'$' normally refers to a variable in the Unix shell, you should specify
-this option last when using other options (e.g. 'nano -wS$') or pass it
-separately (e.g. 'nano -wS -$').
-
-     <br><dt><code>-a, -b, -e, -f, -g, -j</code><dd>Ignored, for compatibility with Pico. 
+</p>
+</dd>
+<dt><samp>-$</samp></dt>
+<dt><samp>--softwrap</samp></dt>
+<dd><p>Enable &rsquo;soft wrapping&rsquo;.  This will make <code>nano</code> attempt to display the
+entire contents of any line, even if it is longer than the screen width, by
+continuing it over multiple screen lines.  Since
+&lsquo;<samp>$</samp>&rsquo; normally refers to a variable in the Unix shell, you should specify
+this option last when using other options (e.g. <code>nano -wS$</code>) or pass it
+separately (e.g. <code>nano -wS -$</code>).
+</p>
+</dd>
+<dt><samp>-a</samp></dt>
+<dt><samp>-b</samp></dt>
+<dt><samp>-e</samp></dt>
+<dt><samp>-f</samp></dt>
+<dt><samp>-g</samp></dt>
+<dt><samp>-j</samp></dt>
+<dd><p>Ignored, for compatibility with Pico.
+</p></dd>
 </dl>
 
-<div class="node">
-<a name="Editor-Basics"></a>
-<p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#Online-Help">Online Help</a>,
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#Introduction">Introduction</a>,
-Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 
+<hr>
+<a name="Editor-Basics"></a>
+<div class="header">
+<p>
+Next: <a href="#Online-Help" accesskey="n" rel="next">Online Help</a>, Previous: <a href="#Introduction" accesskey="p" rel="prev">Introduction</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-
+<a name="Editor-Basics-1"></a>
 <h2 class="chapter">2 Editor Basics</h2>
 
-<ul class="menu">
-<li><a accesskey="1" href="#Entering-Text">Entering Text</a>
-<li><a accesskey="2" href="#Special-Functions">Special Functions</a>
-<li><a accesskey="3" href="#The-Titlebar">The Titlebar</a>
-<li><a accesskey="4" href="#The-Statusbar">The Statusbar</a>
-<li><a accesskey="5" href="#Shortcut-Lists">Shortcut Lists</a>
-<li><a accesskey="6" href="#Using-the-Mouse">Using the Mouse</a>
-</ul>
-
-<div class="node">
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top">&bull; <a href="#Entering-Text" accesskey="1">Entering Text</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Special-Functions" accesskey="2">Special Functions</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#The-Cutbuffer" accesskey="3">The Cutbuffer</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#The-Mark" accesskey="4">The Mark</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#The-Titlebar" accesskey="5">The Titlebar</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#The-Statusbar" accesskey="6">The Statusbar</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Shortcut-Lists" accesskey="7">Shortcut Lists</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Using-the-Mouse" accesskey="8">Using the Mouse</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<hr>
 <a name="Entering-Text"></a>
-<p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#Special-Functions">Special Functions</a>,
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#Editor-Basics">Editor Basics</a>,
-Up:&nbsp;<a rel="up" accesskey="u" href="#Editor-Basics">Editor Basics</a>
-
+<div class="header">
+<p>
+Next: <a href="#Special-Functions" accesskey="n" rel="next">Special Functions</a>, Up: <a href="#Editor-Basics" accesskey="u" rel="up">Editor Basics</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-
+<a name="Entering-Text-1"></a>
 <h3 class="section">2.1 Entering Text</h3>
 
-<p>All key sequences in <code>nano</code> are entered using the keyboard. 
-<code>nano</code> is a "modeless" editor.  All keys, with the exception of
-Control and Meta key sequences, will enter text into the file being
-edited.
-
-<div class="node">
+<p><code>nano</code> is a &quot;modeless&quot; editor.  All keystrokes, with the exception
+of Control and Meta key sequences, enter text into the file being edited.
+All key sequences in <code>nano</code> are entered using the keyboard.
+</p>
+<hr>
 <a name="Special-Functions"></a>
-<p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#The-Titlebar">The Titlebar</a>,
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#Entering-Text">Entering Text</a>,
-Up:&nbsp;<a rel="up" accesskey="u" href="#Editor-Basics">Editor Basics</a>
-
+<div class="header">
+<p>
+Next: <a href="#The-Cutbuffer" accesskey="n" rel="next">The Cutbuffer</a>, Previous: <a href="#Entering-Text" accesskey="p" rel="prev">Entering Text</a>, Up: <a href="#Editor-Basics" accesskey="u" rel="up">Editor Basics</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-
+<a name="Special-Functions-1"></a>
 <h3 class="section">2.2 Special Functions</h3>
 
-<p>Special functions use the Control (Ctrl) key, displayed in the help and
-shortcut lists as ^; the Meta key, displayed as M; or the Escape (Esc)
-key.
-
-     <ul>
-<li>Control key sequences are entered by holding down the Ctrl key and
-pressing the desired key, or by pressing the Esc key twice and pressing
-the desired key. 
-<li>Pressing Esc twice and then typing a three-digit number from 000 to 255
-will enter the character with the corresponding value. 
-<li>Meta key sequences are entered by holding down the Meta key (normally
+<p>Special functions use the Control key (Ctrl), displayed in the help and
+shortcut lists as ^; the Meta key (Alt or Cmd), displayed as M-; or the
+Escape key (Esc).
+</p>
+<ul>
+<li> Control key sequences are entered by holding down the Ctrl key and
+pressing the desired key, or by pressing the Esc key twice and then
+pressing the desired key.
+</li><li> Pressing the Esc key twice and then typing a three-digit number from
+000 to 255 will enter the character with the corresponding value.
+</li><li> Meta key sequences are entered by holding down the Meta key (normally
 the Alt key) and pressing the desired key, or by pressing the Esc key
-once and pressing the desired key.  Certain operating systems "swallow"
+once and then pressing the desired key.  Certain operating systems &quot;swallow&quot;
 the Alt key so that it never reaches the application; if your operating
 system does this, you should use the Esc key to generate Meta key
-sequences. 
-</ul>
+sequences.
+</li></ul>
 
-<div class="node">
+<hr>
+<a name="The-Cutbuffer"></a>
+<div class="header">
+<p>
+Next: <a href="#The-Mark" accesskey="n" rel="next">The Mark</a>, Previous: <a href="#Special-Functions" accesskey="p" rel="prev">Special Functions</a>, Up: <a href="#Editor-Basics" accesskey="u" rel="up">Editor Basics</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+</div>
+<a name="The-Cutbuffer-1"></a>
+<h3 class="section">2.3 The Cutbuffer</h3>
+
+<p>Text can be cut from a file, a whole line at a time, by using the &rsquo;Cut Text&rsquo;
+command (default key binding: ^K).  The cut line is stored in the cutbuffer.
+Consecutive strokes of ^K will add each cut line to this buffer, but a ^K
+after any other keystroke will overwrite the entire cutbuffer.
+</p>
+<p>The contents of the cutbuffer can be pasted back into the file with the
+&rsquo;Uncut Text&rsquo; command (default key binding: ^U).
+</p>
+<p>A line of text can be copied into the cutbuffer (without cutting it) with
+the &rsquo;Copy Text&rsquo; command (default key binding: M-6).
+</p>
+<hr>
+<a name="The-Mark"></a>
+<div class="header">
+<p>
+Next: <a href="#The-Titlebar" accesskey="n" rel="next">The Titlebar</a>, Previous: <a href="#The-Cutbuffer" accesskey="p" rel="prev">The Cutbuffer</a>, Up: <a href="#Editor-Basics" accesskey="u" rel="up">Editor Basics</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+</div>
+<a name="The-Mark-1"></a>
+<h3 class="section">2.4 The Mark</h3>
+
+<p>Text can be selected by first &rsquo;setting the Mark&rsquo; (default key bindings:
+^6 and M-A) and then moving the cursor to the other end of the portion
+to be selected.  The selected portion of text will be highlighted in
+reverse video (or in bold if you set the boldtext option).
+This selection can now be cut or copied in its entirety with a single
+^K or M-6.  Or the selection can be used to limit the scope of a
+search-and-replace (^\) or spell-checking session (^T).
+</p>
+<p>Cutting or copying selected text will toggle the mark off automatically.
+If necessary, it can be toggled off manually with another ^6 or M-A.
+</p>
+<hr>
 <a name="The-Titlebar"></a>
-<p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#The-Statusbar">The Statusbar</a>,
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#Special-Functions">Special Functions</a>,
-Up:&nbsp;<a rel="up" accesskey="u" href="#Editor-Basics">Editor Basics</a>
-
+<div class="header">
+<p>
+Next: <a href="#The-Statusbar" accesskey="n" rel="next">The Statusbar</a>, Previous: <a href="#The-Mark" accesskey="p" rel="prev">The Mark</a>, Up: <a href="#Editor-Basics" accesskey="u" rel="up">Editor Basics</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-
-<h3 class="section">2.3 The Titlebar</h3>
+<a name="The-Titlebar-1"></a>
+<h3 class="section">2.5 The Titlebar</h3>
 
 <p>The titlebar is the line displayed at the top of the editor.  There are
 three sections: left, center and right.  The section on the left
 displays the version of <code>nano</code> being used.  The center section
-displays the current filename, or "New Buffer" if the file has not yet
-been named.  The section on the right will display "Modified" if the
+displays the current filename, or &quot;New Buffer&quot; if the file has not yet
+been named.  The section on the right will display &quot;Modified&quot; if the
 file has been modified since it was last saved or opened.
-
-   <p>Special modes: When <code>nano</code> is in "File browser" mode, the center
+</p>
+<p>Special modes: When <code>nano</code> is in &quot;File browser&quot; mode, the center
 section will display the current directory instead of the filename.  See
 See <a href="#The-File-Browser">The File Browser</a>, for more info.
-
-<div class="node">
+</p>
+<hr>
 <a name="The-Statusbar"></a>
-<p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#Shortcut-Lists">Shortcut Lists</a>,
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#The-Titlebar">The Titlebar</a>,
-Up:&nbsp;<a rel="up" accesskey="u" href="#Editor-Basics">Editor Basics</a>
-
+<div class="header">
+<p>
+Next: <a href="#Shortcut-Lists" accesskey="n" rel="next">Shortcut Lists</a>, Previous: <a href="#The-Titlebar" accesskey="p" rel="prev">The Titlebar</a>, Up: <a href="#Editor-Basics" accesskey="u" rel="up">Editor Basics</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-
-<h3 class="section">2.4 The Statusbar</h3>
+<a name="The-Statusbar-1"></a>
+<h3 class="section">2.6 The Statusbar</h3>
 
 <p>The statusbar is the third line from the bottom of the screen, or the
 bottom line in Expert Mode.  See See <a href="#Expert-Mode">Expert Mode</a>, for more info.  It
@@ -365,358 +585,1052 @@ shows important and informational messages.  Any error messages that
 occur from using the editor will appear on the statusbar.  Any questions
 that are asked of the user will be asked on the statusbar, and any user
 input (search strings, filenames, etc.) will be input on the statusbar.
-
-<div class="node">
+</p>
+<hr>
 <a name="Shortcut-Lists"></a>
-<p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#Using-the-Mouse">Using the Mouse</a>,
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#The-Statusbar">The Statusbar</a>,
-Up:&nbsp;<a rel="up" accesskey="u" href="#Editor-Basics">Editor Basics</a>
-
+<div class="header">
+<p>
+Next: <a href="#Using-the-Mouse" accesskey="n" rel="next">Using the Mouse</a>, Previous: <a href="#The-Statusbar" accesskey="p" rel="prev">The Statusbar</a>, Up: <a href="#Editor-Basics" accesskey="u" rel="up">Editor Basics</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-
-<h3 class="section">2.5 Shortcut Lists</h3>
+<a name="Shortcut-Lists-1"></a>
+<h3 class="section">2.7 Shortcut Lists</h3>
 
 <p>The Shortcut Lists are the two lines at the bottom of the screen which
 show some of the more commonly used functions in the editor.
-
-<div class="node">
+</p>
+<hr>
 <a name="Using-the-Mouse"></a>
-<p><hr>
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#Shortcut-Lists">Shortcut Lists</a>,
-Up:&nbsp;<a rel="up" accesskey="u" href="#Editor-Basics">Editor Basics</a>
-
+<div class="header">
+<p>
+Previous: <a href="#Shortcut-Lists" accesskey="p" rel="prev">Shortcut Lists</a>, Up: <a href="#Editor-Basics" accesskey="u" rel="up">Editor Basics</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-
-<h3 class="section">2.6 Using the Mouse</h3>
+<a name="Using-the-Mouse-1"></a>
+<h3 class="section">2.8 Using the Mouse</h3>
 
 <p>When mouse support has been configured and enabled, a single mouse click
 places the cursor at the indicated position.  Clicking a second time in
 the same position toggles the mark.  Clicking in the shortcut list
-executes the selected shortcut.
-
-   <p>The mouse will work in the X Window System, and on the console when gpm
+executes the selected shortcut.  To be able to select text with the
+left button, or paste text with the middle button, hold down the
+Shift key during those actions.
+</p>
+<p>The mouse will work in the X Window System, and on the console when gpm
 is running.
+</p>
 
-<div class="node">
+<hr>
 <a name="Online-Help"></a>
-<p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#Feature-Toggles">Feature Toggles</a>,
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#Editor-Basics">Editor Basics</a>,
-Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
-
+<div class="header">
+<p>
+Next: <a href="#Feature-Toggles" accesskey="n" rel="next">Feature Toggles</a>, Previous: <a href="#Editor-Basics" accesskey="p" rel="prev">Editor Basics</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-
+<a name="Online-Help-1"></a>
 <h2 class="chapter">3 Online Help</h2>
 
-<p>The online help system in <code>nano</code> is available by pressing ^G. 
-It is fairly self explanatory, documenting the various parts of the
+<p>The online help system in <code>nano</code> is available by pressing ^G.
+It is fairly self-explanatory, documenting the various parts of the
 editor and available keystrokes.  Navigation is via the ^Y (Page Up)
 and ^V (Page Down) keys.  ^X exits the help system.
+</p>
 
-<div class="node">
+<hr>
 <a name="Feature-Toggles"></a>
-<p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#Nanorc-Files">Nanorc Files</a>,
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#Online-Help">Online Help</a>,
-Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
-
+<div class="header">
+<p>
+Next: <a href="#Nanorc-Files" accesskey="n" rel="next">Nanorc Files</a>, Previous: <a href="#Online-Help" accesskey="p" rel="prev">Online Help</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-
+<a name="Feature-Toggles-1"></a>
 <h2 class="chapter">4 Feature Toggles</h2>
 
 <p>Toggles allow you to change certain aspects of the editor that would
-normally be done via command line options.  They are invoked via Meta
+normally be done via command-line options.  They are invoked via Meta
 key sequences.  See See <a href="#Special-Functions">Special Functions</a>, for more info.  The
 following global toggles are available:
+</p>
+<dl compact="compact">
+<dt><code>Backup Files Toggle (Meta-B)</code></dt>
+<dd><p>toggles the -B (<code>--backup</code>) command line option.
+</p>
+</dd>
+<dt><code>Constant Cursor Position Display Toggle (Meta-C)</code></dt>
+<dd><p>toggles the -c (<code>--const</code>) command line option.
+</p>
+</dd>
+<dt><code>Multiple File Buffers Toggle (Meta-F)</code></dt>
+<dd><p>toggles the -F (<code>--multibuffer</code>) command line option.
+</p>
+</dd>
+<dt><code>Smart Home Key Toggle (Meta-H)</code></dt>
+<dd><p>toggles the -A (<code>--smarthome</code>) command line option.
+</p>
+</dd>
+<dt><code>Auto Indent Toggle (Meta-I)</code></dt>
+<dd><p>toggles the -i (<code>--autoindent</code>) command line option.
+</p>
+</dd>
+<dt><code>Cut To End Toggle (Meta-K)</code></dt>
+<dd><p>toggles the -k (<code>--cut</code>) command line option.
+</p>
+</dd>
+<dt><code>Long Line Wrapping Toggle (Meta-L)</code></dt>
+<dd><p>toggles the -w (<code>--nowrap</code>) command line option.
+</p>
+</dd>
+<dt><code>Mouse Support Toggle (Meta-M)</code></dt>
+<dd><p>toggles the -m (<code>--mouse</code>) command line option.
+</p>
+</dd>
+<dt><code>No Conversion From DOS/Mac Format Toggle (Meta-N)</code></dt>
+<dd><p>toggles the -N (<code>--noconvert</code>) command line option.
+</p>
+</dd>
+<dt><code>More Space For Editing Toggle (Meta-O)</code></dt>
+<dd><p>toggles the -O (<code>--morespace</code>) command line option.
+</p>
+</dd>
+<dt><code>Whitespace Display Toggle (Meta-P)</code></dt>
+<dd><p>toggles whitespace-display mode.
+See See <a href="#Whitespace">Whitespace</a>, for more info.
+</p>
+</dd>
+<dt><code>Tabs to Spaces Toggle (Meta-Q)</code></dt>
+<dd><p>toggles the -E (<code>--tabstospaces</code>) command line option.
+</p>
+</dd>
+<dt><code>Smooth Scrolling Toggle (Meta-S)</code></dt>
+<dd><p>toggles the -S (<code>--smooth</code>) command line option.
+</p>
+</dd>
+<dt><code>Expert/No Help Toggle (Meta-X)</code></dt>
+<dd><p>toggles the -x (<code>--nohelp</code>) command line option.
+</p>
+</dd>
+<dt><code>Color Syntax Highlighting Toggle (Meta-Y)</code></dt>
+<dd><p>toggles color syntax highlighting if you have color syntaxes in your
+nanorc.  See See <a href="#Syntax-Highlighting">Syntax Highlighting</a>, for more info.
+</p>
+</dd>
+<dt><code>Suspend Toggle (Meta-Z)</code></dt>
+<dd><p>toggles the -z (<code>--suspend</code>) command line option.
+</p>
+</dd>
+<dt><code>Soft Wrapping Toggle (Meta-$)</code></dt>
+<dd><p>toggles the -$ (<code>--softwrap</code>) command line option.
+</p>
+</dd>
+</dl>
 
-     <dl>
-<dt><code>Backup Files Toggle (Meta-B)</code><dd>toggles the -B (<code>--backup</code>) command line option.
-
-     <br><dt><code>Constant Cursor Position Display Toggle (Meta-C)</code><dd>toggles the -c (<code>--const</code>) command line option.
-
-     <br><dt><code>Multiple File Buffers Toggle (Meta-F)</code><dd>toggles the -F (<code>--multibuffer</code>) command line option.
-
-     <br><dt><code>Smart Home Key Toggle (Meta-H)</code><dd>toggles the -A (<code>--smarthome</code>) command line option.
-
-     <br><dt><code>Auto Indent Toggle (Meta-I)</code><dd>toggles the -i (<code>--autoindent</code>) command line option.
-
-     <br><dt><code>Cut To End Toggle (Meta-K)</code><dd>toggles the -k (<code>--cut</code>) command line option.
-
-     <br><dt><code>Long Line Wrapping Toggle (Meta-L)</code><dd>toggles the -w (<code>--nowrap</code>) command line option.
-
-     <br><dt><code>Mouse Support Toggle (Meta-M)</code><dd>toggles the -m (<code>--mouse</code>) command line option.
-
-     <br><dt><code>No Conversion From DOS/Mac Format Toggle (Meta-N)</code><dd>toggles the -N (<code>--noconvert</code>) command line option.
-
-     <br><dt><code>More Space For Editing Toggle (Meta-O)</code><dd>toggles the -O (<code>--morespace</code>) command line option.
-
-     <br><dt><code>Whitespace Display Toggle (Meta-P)</code><dd>toggles whitespace display mode if you have a "whitespace" option in
-your nanorc.  See See <a href="#Nanorc-Files">Nanorc Files</a>, for more info.
-
-     <br><dt><code>Tabs to Spaces Toggle (Meta-Q)</code><dd>toggles the -E (<code>--tabstospaces</code>) command line option.
-
-     <br><dt><code>Smooth Scrolling Toggle (Meta-S)</code><dd>toggles the -S (<code>--smooth</code>) command line option.
-
-     <br><dt><code>Expert/No Help Toggle (Meta-X)</code><dd>toggles the -x (<code>--nohelp</code>) command line option.
-
-     <br><dt><code>Color Syntax Highlighting Toggle (Meta-Y)</code><dd>toggles color syntax highlighting if you have color syntaxes in your
-nanorc.  See See <a href="#Nanorc-Files">Nanorc Files</a>, for more info.
-
-     <br><dt><code>Suspend Toggle (Meta-Z)</code><dd>toggles the -z (<code>--suspend</code>) command line option.
-
-     <br><dt><code>Soft Wrapping Toggle (Meta-$)</code><dd>toggles the -$ (<code>--softwrap</code>) command line option.
-
-   </dl>
 
-<div class="node">
+<hr>
 <a name="Nanorc-Files"></a>
-<p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#The-File-Browser">The File Browser</a>,
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#Feature-Toggles">Feature Toggles</a>,
-Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
-
+<div class="header">
+<p>
+Next: <a href="#The-File-Browser" accesskey="n" rel="next">The File Browser</a>, Previous: <a href="#Feature-Toggles" accesskey="p" rel="prev">Feature Toggles</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-
+<a name="Nanorc-Files-1"></a>
 <h2 class="chapter">5 Nanorc Files</h2>
 
 <p>The nanorc files contain the default settings for <code>nano</code>.  They
-should not be in DOS or Mac format.  During startup, <code>nano</code> will
-first read its system-wide settings from SYSCONFDIR/nanorc, and then
-user-specific settings from ~/.nanorc.
-
-   <p>A nanorc file accepts a series of "set" and "unset" commands, which can
-be used to configure <code>nano</code> on startup without using the command
-line options.  Additionally, the "syntax", "color", and "icolor"
-keywords are used to define syntax highlighting rules for different text
-patterns.  <code>nano</code> will read one command per line.
-
-   <p>Options in nanorc files take precedence over <code>nano</code>'s defaults, and
-command line options override nanorc settings.  Options are also unset
-by default, except for those that take arguments.
-
-   <p>Quotes inside string parameters don't have to be escaped with
+should be in Unix format, not in DOS or Mac format.  During startup,
+<code>nano</code> will first read the system-wide settings, from /etc/nanorc
+(the exact path might be different), and then the user-specific settings,
+from ~/.nanorc.
+</p>
+<p>A nanorc file accepts a series of &quot;set&quot; and &quot;unset&quot; commands, which can
+be used to configure <code>nano</code> on startup without using command-line
+options.  Additionally, there are some commands to define syntax highlighting
+and to rebind keys &ndash; See <a href="#Syntax-Highlighting">Syntax Highlighting</a>, and See <a href="#Rebinding-Keys">Rebinding Keys</a>.
+<code>nano</code> will read one command per line.
+</p>
+<p>Options in nanorc files take precedence over <code>nano</code>&rsquo;s defaults, and
+command-line options override nanorc settings.  Also, options that do not
+take an argument are unset by default.  So using the <code>unset</code> command
+is only needed when wanting to override a setting of the system&rsquo;s nanorc
+file in your own <samp>~/.nanorc</samp>.  Options that take an argument cannot
+be unset.
+</p>
+<p>Quotes inside string parameters don&rsquo;t have to be escaped with
 backslashes.  The last double quote in the string will be treated as its
-end.  For example, for the "brackets" option,
-
-   <blockquote>
-<code>""')&gt;]}"</code>
-</blockquote>
-
-   <p>will match <code>"</code>, <code>'</code>, <code>)</code>, <code>&gt;</code>, <code>]</code>, and
-<code>}</code>.
-
-   <p>The supported commands and arguments are:
-
-     <dl>
-<dt><code>set/unset autoindent</code><dd>Use auto-indentation.
-
-     <br><dt><code>set/unset backup</code><dd>Create backup files in "filename~".
-
-     <br><dt><code>set backupdir "directory"</code><dd>Set the directory where <code>nano</code> puts unique backup files if file
+end.  For example, for the &quot;brackets&quot; option, <code>&quot;&quot;')&gt;]}&quot;</code> will match
+<code>&quot;</code>, <code>'</code>, <code>)</code>, <code>&gt;</code>, <code>]</code>, and <code>}</code>.
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top">&bull; <a href="#Settings" accesskey="1">Settings</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Syntax-Highlighting" accesskey="2">Syntax Highlighting</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+<tr><td align="left" valign="top">&bull; <a href="#Rebinding-Keys" accesskey="3">Rebinding Keys</a>:</td><td>&nbsp;&nbsp;</td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<hr>
+<a name="Settings"></a>
+<div class="header">
+<p>
+Next: <a href="#Syntax-Highlighting" accesskey="n" rel="next">Syntax Highlighting</a>, Up: <a href="#Nanorc-Files" accesskey="u" rel="up">Nanorc Files</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+</div>
+<a name="Settings-1"></a>
+<h3 class="section">5.1 Settings</h3>
+
+<p>The supported settings in a nanorc file are:
+</p>
+<dl compact="compact">
+<dt><code>set allow_insecure_backup</code></dt>
+<dd><p>When backing up files, allow the backup to succeed even if its
+permissions can&rsquo;t be (re)set due to special OS considerations.
+You should NOT enable this option unless you are sure you need it.
+</p>
+</dd>
+<dt><code>set autoindent</code></dt>
+<dd><p>Use auto-indentation.
+</p>
+</dd>
+<dt><code>set backup</code></dt>
+<dd><p>When saving a file, back up the previous version of it to the current
+filename suffixed with a tilde (<code>~</code>).
+</p>
+</dd>
+<dt><code>set backupdir &quot;directory&quot;</code></dt>
+<dd><p>Set the directory where <code>nano</code> puts unique backup files, if file
 backups are enabled.
-
-     <br><dt><code>set/unset backwards</code><dd>Do backwards searches by default.
-
-     <br><dt><code>set/unset boldtext</code><dd>Use bold text instead of reverse video text.
-
-     <br><dt><code>set brackets "string"</code><dd>Set the characters treated as closing brackets when justifying
-paragraphs.  They cannot contain blank characters.  Only closing
-punctuation, optionally followed by closing brackets, can end sentences. 
+</p>
+</dd>
+<dt><code>set backwards</code></dt>
+<dd><p>Do backwards searches by default.
+</p>
+</dd>
+<dt><code>set boldtext</code></dt>
+<dd><p>Use bold instead of reverse video for the titlebar, statusbar, key combos,
+and selected text.  This can be overridden for the first three by setting
+the options &quot;titlecolor&quot;, &quot;statuscolor&quot;, and &quot;keycolor&quot;.
+</p>
+</dd>
+<dt><code>set brackets &quot;<var>string</var>&quot;</code></dt>
+<dd><p>Set the characters treated as closing brackets when justifying
+paragraphs.  This may not include blank characters.  Only closing
+punctuation (see &quot;punct&quot;), optionally followed by the specified
+closing brackets, can end sentences.  The default value is
+</p>
+<blockquote>
+<p>&quot;&quot;&rsquo;)&gt;]}&quot;
+</p></blockquote>
+
+</dd>
+<dt><code>set casesensitive</code></dt>
+<dd><p>Do case-sensitive searches by default.
+</p>
+</dd>
+<dt><code>set const</code></dt>
+<dd><p>Constantly display the cursor position in the status bar.
+</p>
+</dd>
+<dt><code>set cut</code></dt>
+<dd><p>Use cut-to-end-of-line by default, instead of cutting the whole line.
+</p>
+</dd>
+<dt><code>set fill <var>number</var></code></dt>
+<dd><p>Hard-wrap lines at column number <var>number</var>.  If <var>number</var> is 0 or less,
+the maximum line length will be the screen width less <var>number</var> columns.
+The default value is -8.
+</p>
+</dd>
+<dt><code>set functioncolor <var>fgcolor</var>,<var>bgcolor</var></code></dt>
+<dd><p>Specify the color combination to use for the function descriptions
+in the two help lines at the bottom of the screen.
+See <code>set titlecolor</code> for more details.
+</p>
+</dd>
+<dt><code>set historylog</code></dt>
+<dd><p>Enable the use of <samp>~/.nano/search_history</samp> for saving and reading
+search/replace strings.
+</p>
+</dd>
+<dt><code>set keycolor <var>fgcolor</var>,<var>bgcolor</var></code></dt>
+<dd><p>Specify the color combination to use for the shortcut key combos
+in the two help lines at the bottom of the screen.
+See <code>set titlecolor</code> for more details.
+</p>
+</dd>
+<dt><code>set locking</code></dt>
+<dd><p>Enable vim-style lock-files for when editing files.
+</p>
+</dd>
+<dt><code>set matchbrackets &quot;<var>string</var>&quot;</code></dt>
+<dd><p>Set the opening and closing brackets that can be found by bracket
+searches.  This may not include blank characters.  The opening set must
+come before the closing set, and the two sets must be in the same order.
 The default value is
-
-     <blockquote>
-<code>""')&gt;]}"</code>
-</blockquote>
-
-     <br><dt><code>set/unset casesensitive</code><dd>Do case sensitive searches by default.
-
-     <br><dt><code>set/unset const</code><dd>Constantly display the cursor position in the status bar.
-
-     <br><dt><code>set/unset cut</code><dd>Use cut to end of line by default, instead of cutting the whole line.
-
-     <br><dt><code>set fill "n"</code><dd>Wrap lines at column number "n".  If "n" is 0 or less, the maximum line
-length will be the screen width less "n" columns.  The default value is
--8.
-
-     <br><dt><code>set/unset historylog</code><dd>Enable ~/.nano_history for saving and reading search/replace strings.
-
-     <br><dt><code>set matchbrackets "string"</code><dd>Set the opening and closing brackets that can be found by bracket
-searches.  They cannot contain blank characters.  The former set must
-come before the latter set, and both must be in the same order.  The
-default value is
-
-     <blockquote>
-<code>"(&lt;[{)&gt;]}"</code>
-</blockquote>
-
-     <br><dt><code>set/unset morespace</code><dd>Use the blank line below the titlebar as extra editing space.
-
-     <br><dt><code>set/unset mouse</code><dd>Enable mouse support, so that mouse clicks can be used to place the
+</p>
+<blockquote>
+<p>&quot;(&lt;[{)&gt;]}&quot;
+</p></blockquote>
+
+</dd>
+<dt><code>set morespace</code></dt>
+<dd><p>Use the blank line below the titlebar as extra editing space.
+</p>
+</dd>
+<dt><code>set mouse</code></dt>
+<dd><p>Enable mouse support, so that mouse clicks can be used to place the
 cursor, set the mark (with a double click), or execute shortcuts.
-
-     <br><dt><code>set/unset multibuffer</code><dd>Allow inserting files into their own buffers.
-
-     <br><dt><code>set/unset noconvert</code><dd>Don't convert files from DOS/Mac format.
-
-     <br><dt><code>set/unset nofollow</code><dd>Don't follow symlinks when writing files.
-
-     <br><dt><code>set/unset nohelp</code><dd>Don't display the help lists at the bottom of the screen.
-
-     <br><dt><code>set/unset nonewlines</code><dd>Don't add newlines to the ends of files.
-
-     <br><dt><code>set/unset nowrap</code><dd>Don't wrap text at all.
-
-     <br><dt><code>set operatingdir "directory"</code><dd><code>nano</code> will only read and write files inside "directory" and its
+</p>
+</dd>
+<dt><code>set multibuffer</code></dt>
+<dd><p>Allow inserting files into their own buffers.
+</p>
+</dd>
+<dt><code>set noconvert</code></dt>
+<dd><p>Don&rsquo;t convert files from DOS/Mac format.
+</p>
+</dd>
+<dt><code>set nofollow</code></dt>
+<dd><p>Don&rsquo;t follow symlinks when writing files.
+</p>
+</dd>
+<dt><code>set nohelp</code></dt>
+<dd><p>Don&rsquo;t display the help lists at the bottom of the screen.
+</p>
+</dd>
+<dt><code>set nonewlines</code></dt>
+<dd><p>Don&rsquo;t add newlines to the ends of files.
+</p>
+</dd>
+<dt><code>set nowrap</code></dt>
+<dd><p>Don&rsquo;t hard-wrap text at all.
+</p>
+</dd>
+<dt><code>set operatingdir &quot;directory&quot;</code></dt>
+<dd><p><code>nano</code> will only read and write files inside &quot;directory&quot; and its
 subdirectories.  Also, the current directory is changed to here, so
 files are inserted from this directory.  By default, the operating
 directory feature is turned off.
-
-     <br><dt><code>set/unset preserve</code><dd>Preserve the XON and XOFF keys (^Q and ^S).
-
-     <br><dt><code>set punct "string"</code><dd>Set the characters treated as closing punctuation when justifying
-paragraphs.  They cannot contain blank characters.  Only closing
-punctuation, optionally followed by closing brackets, can end sentences. 
-The default value is <code>"!.?"</code>.
-
-     <br><dt><code>set/unset quickblank</code><dd>Do quick statusbar blanking.  Statusbar messages will disappear after 1
+</p>
+</dd>
+<dt><code>set poslog</code></dt>
+<dd><p>Save the cursor position of files between editing sessions.
+</p>
+</dd>
+<dt><code>set preserve</code></dt>
+<dd><p>Preserve the XON and XOFF keys (^Q and ^S).
+</p>
+</dd>
+<dt><code>set punct &quot;<var>string</var>&quot;</code></dt>
+<dd><p>Set the characters treated as closing punctuation when justifying
+paragraphs.  This may not include blank characters.  Only the
+specified closing punctuation, optionally followed by closing brackets
+(see &quot;brackets&quot;), can end sentences.  The default value is &quot;!.?&quot;.
+</p>
+</dd>
+<dt><code>set quickblank</code></dt>
+<dd><p>Do quick statusbar blanking.  Statusbar messages will disappear after 1
 keystroke instead of 25.
-
-     <br><dt><code>set quotestr "string"</code><dd>The email-quote string, used to justify email-quoted paragraphs.  This
+</p>
+</dd>
+<dt><code>set quiet</code></dt>
+<dd><p>When set, <code>nano</code> will not report errors in the nanorc file nor ask them
+to be acknowledged by pressing Enter at startup.  If this option is used, it
+should be placed at the top of the file to be fully effective.
+</p>
+</dd>
+<dt><code>set quotestr &quot;<var>string</var>&quot;</code></dt>
+<dd><p>The email-quote string, used to justify email-quoted paragraphs.  This
 is an extended regular expression if your system supports them,
 otherwise a literal string.  The default value is
-
-     <blockquote>
-<code>"^([ \\t]*[#:&gt;\\|}])+"</code>
-</blockquote>
-
-     <p>if you have extended regular expression support, or "&gt; " otherwise. 
-Note that '\\t' stands for a literal Tab character.
-
-     <br><dt><code>set/unset rebinddelete</code><dd>Interpret the Delete key differently so that both Backspace and Delete
+</p>
+<blockquote>
+<p>&quot;^([ \\t]*[#:&gt;\\|}])+&quot;
+</p></blockquote>
+
+<p>if you have extended regular expression support, and &quot;&gt; &quot; otherwise.
+Note that &rsquo;\\t&rsquo; stands for a literal Tab character.
+</p>
+</dd>
+<dt><code>set rebinddelete</code></dt>
+<dd><p>Interpret the Delete key differently so that both Backspace and Delete
 work properly.  You should only need to use this option if Backspace
 acts like Delete on your system.
-
-     <br><dt><code>set/unset rebindkeypad</code><dd>Interpret the numeric keypad keys so that they all work properly.  You
-should only need to use this option if they don't, as mouse support
-won't work properly with this option enabled.
-
-     <br><dt><code>set/unset regexp</code><dd>Do extended regular expression searches by default.
-
-     <br><dt><code>set/unset smarthome</code><dd>Make the Home key smarter.  When Home is pressed anywhere but at the
+</p>
+</dd>
+<dt><code>set rebindkeypad</code></dt>
+<dd><p>Interpret the numeric keypad keys so that they all work properly.  You
+should only need to use this option if they don&rsquo;t, as mouse support
+won&rsquo;t work properly with this option enabled.
+</p>
+</dd>
+<dt><code>set regexp</code></dt>
+<dd><p>Do extended regular expression searches by default.
+</p>
+</dd>
+<dt><code>set smarthome</code></dt>
+<dd><p>Make the Home key smarter.  When Home is pressed anywhere but at the
 very beginning of non-whitespace characters on a line, the cursor will
 jump to that beginning (either forwards or backwards).  If the cursor is
 already at that position, it will jump to the true beginning of the
 line.
-
-     <br><dt><code>set/unset smooth</code><dd>Use smooth scrolling by default.
-
-     <br><dt><code>set/unset softwrap</code><dd>Use soft wrapping by default.
-
-     <br><dt><code>set speller "spellprog"</code><dd>Use spelling checker "spellprog" instead of the built-in one, which
-calls "spell".
-
-     <br><dt><code>set/unset suspend</code><dd>Allow <code>nano</code> to be suspended.
-
-     <br><dt><code>set/unset suspendenable</code><dd>If <code>nano</code> is allowed to be suspended, allow the suspend key
-(usually ^Z) to actually suspend it.
-
-     <br><dt><code>set tabsize "n"</code><dd>Use a tab size of "n" columns.  The value of "n" must be greater than 0. 
-The default value is 8.
-
-     <br><dt><code>set/unset tabstospaces</code><dd>Convert typed tabs to spaces.
-
-     <br><dt><code>set/unset tempfile</code><dd>Save automatically on exit, don't prompt.
-
-     <br><dt><code>set/unset undo</code><dd>Enable experimental generic-purpose undo code.
-
-     <br><dt><code>set/unset view</code><dd>Disallow file modification.
-
-     <br><dt><code>set whitespace "string"</code><dd>Set the two characters used to display the first characters of tabs and
-spaces.  They must be single-column characters.
-
-     <br><dt><code>set/unset wordbounds</code><dd>Detect word boundaries more accurately by treating punctuation
+</p>
+</dd>
+<dt><code>set smooth</code></dt>
+<dd><p>Use smooth scrolling by default.
+</p>
+</dd>
+<dt><code>set softwrap</code></dt>
+<dd><p>Enable soft line wrapping for easier viewing of very long lines.
+</p>
+</dd>
+<dt><code>set speller &quot;spellprog&quot;</code></dt>
+<dd><p>Use spelling checker &quot;spellprog&quot; instead of the built-in one, which
+calls &quot;spell&quot;.
+</p>
+</dd>
+<dt><code>set statuscolor <var>fgcolor</var>,<var>bgcolor</var></code></dt>
+<dd><p>Specify the color combination to use for the statusbar.
+See <code>set titlecolor</code> for more details.
+</p>
+</dd>
+<dt><code>set suspend</code></dt>
+<dd><p>Allow <code>nano</code> to be suspended.
+</p>
+</dd>
+<dt><code>set tabsize <var>number</var></code></dt>
+<dd><p>Use a tab size of <var>number</var> columns.  The value of <var>number</var> must be
+greater than 0.  The default value is 8.
+</p>
+</dd>
+<dt><code>set tabstospaces</code></dt>
+<dd><p>Convert typed tabs to spaces.
+</p>
+</dd>
+<dt><code>set tempfile</code></dt>
+<dd><p>Save automatically on exit, don&rsquo;t prompt.
+</p>
+</dd>
+<dt><code>set titlecolor <var>fgcolor</var>,<var>bgcolor</var></code></dt>
+<dd><p>Specify the color combination to use for the titlebar.
+Valid color names for foreground and background are:
+white, black, red, blue, green, yellow, magenta, and cyan.
+And either <var>fgcolor</var> or <var>,bgcolor</var> may be left out.
+</p>
+</dd>
+<dt><code>set view</code></dt>
+<dd><p>Disallow file modification.
+</p>
+<a name="Whitespace"></a></dd>
+<dt><code>set whitespace &quot;<var>string</var>&quot;</code></dt>
+<dd><p>Set the two characters used to indicate the presence of tabs and
+spaces.  They must be single-column characters.  The default pair
+for a UTF-8 locale is &quot;»·&quot;, and for other locales &quot;&gt;.&quot;.
+</p>
+</dd>
+<dt><code>set wordbounds</code></dt>
+<dd><p>Detect word boundaries more accurately by treating punctuation
 characters as part of a word.
+</p>
+</dd>
+</dl>
 
-     <br><dt><code>syntax "str" ["fileregex" ... ]</code><dd>Defines a syntax named "str" which can be activated via the -Y/&ndash;syntax
-command line option, or will be automatically activated if the current
-filename matches the extended regular expression "fileregex".  All
-following "color" and "icolor" statements will apply to "syntax" until a
-new syntax is defined.
-
-     <p>The "none" syntax is reserved; specifying it on the command line is the
-same as not having a syntax at all.  The "default" syntax is special: it
-takes no "fileregex", and applies to files that don't match any other
-syntax's "fileregex".
-
-     <br><dt><code>color fgcolor,bgcolor "regex" ...</code><dd>For the currently defined syntax, display all expressions matching the
-extended regular expression "regex" with foreground color "fgcolor" and
-background color "bgcolor", at least one of which must be specified. 
-Legal colors for foreground and background color are: white, black, red,
-blue, green, yellow, magenta, and cyan.  You may use the prefix "bright"
-to force a stronger color highlight for the foreground.  If your
-terminal supports transparency, not specifying a "bgcolor" tells "nano"
+<hr>
+<a name="Syntax-Highlighting"></a>
+<div class="header">
+<p>
+Next: <a href="#Rebinding-Keys" accesskey="n" rel="next">Rebinding Keys</a>, Previous: <a href="#Settings" accesskey="p" rel="prev">Settings</a>, Up: <a href="#Nanorc-Files" accesskey="u" rel="up">Nanorc Files</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+</div>
+<a name="Syntax-Highlighting-1"></a>
+<h3 class="section">5.2 Syntax Highlighting</h3>
+
+<p>Coloring the different syntactic elements of a file
+is done via regular expressions (see the <code>color</code> command below).
+This is inherently imperfect, because regular expressions are not
+powerful enough to fully parse a file.  Nevertheless, regular
+expressions can do a lot and are easy to make, so they are a
+good fit for a small editor like <code>nano</code>.
+</p>
+<p>A separate syntax can be defined for each kind of file
+via the following commands in a nanorc file:
+</p>
+<dl compact="compact">
+<dt><code>syntax &quot;str&quot; [&quot;fileregex&quot; &hellip;]</code></dt>
+<dd><p>Defines a syntax named &quot;str&quot; which can be activated via the -Y/&ndash;syntax
+command-line option, or will be automatically activated if the current
+filename matches the extended regular expression &quot;fileregex&quot;.  All
+following &quot;color&quot; and &quot;icolor&quot; statements will apply to this &quot;str&quot;
+syntax until a new syntax is defined.
+</p>
+<p>The &quot;none&quot; syntax is reserved; specifying it on the command line is the
+same as not having a syntax at all.  The &quot;default&quot; syntax is special: it
+takes no &quot;fileregex&quot;, and applies to files that don&rsquo;t match any other
+syntax&rsquo;s &quot;fileregex&quot;.
+</p>
+</dd>
+<dt><code>linter program [arg &hellip;]</code></dt>
+<dd><p>For the currently defined syntax, use the given program to invoke the
+linter (this overrides the speller function when defined).
+</p>
+</dd>
+<dt><code>formatter program [arg &hellip;]</code></dt>
+<dd><p>For the currently defined syntax, use the given program to automatically
+reformat text.  Useful in certain programming languages (e.g. go).
+</p>
+</dd>
+<dt><code>header &quot;regex&quot; &hellip;</code></dt>
+<dd><p>For the currently defined syntax, add one or more regexes which will
+be compared against the very first line of the file to be edited,
+to determine whether this syntax should be used for that file.
+</p>
+</dd>
+<dt><code>magic &quot;regex&quot; &hellip;</code></dt>
+<dd><p>For the currently defined syntax, add one or more regexes which will be
+compared against the result of querying the magic database about the file
+to be edited, to determine whether this syntax should be used for that
+file.  This functionality only works when libmagic is installed on the
+system and will be silently ignored otherwise.
+</p>
+</dd>
+<dt><code>color fgcolor,bgcolor &quot;regex&quot; &hellip;</code></dt>
+<dd><p>For the currently defined syntax, display all expressions matching the
+extended regular expression &quot;regex&quot; with foreground color &quot;fgcolor&quot; and
+background color &quot;bgcolor&quot;, at least one of which must be specified.
+Valid colors for foreground and background are: white, black, red,
+blue, green, yellow, magenta, and cyan.  You may use the prefix &quot;bright&quot;
+to get a stronger color highlight for the foreground.  If your
+terminal supports transparency, not specifying a &quot;bgcolor&quot; tells <code>nano</code>
 to attempt to use a transparent background.
+</p>
+</dd>
+<dt><code>icolor fgcolor,bgcolor &quot;regex&quot; &hellip;</code></dt>
+<dd><p>Same as above, except that the expression matching is case insensitive.
+</p>
+</dd>
+<dt><code>color fgcolor,bgcolor start=&quot;sr&quot; end=&quot;er&quot;</code></dt>
+<dd><p>Display expressions which start with the extended regular expression
+&quot;sr&quot; and end with the extended regular expression &quot;er&quot; with foreground
+color &quot;fgcolor&quot; and background color &quot;bgcolor&quot;, at least one of which
+must be specified.  This allows syntax highlighting to span multiple
+lines.  Note that all subsequent instances of &quot;sr&quot; after an initial &quot;sr&quot;
+is found will be highlighted until the first instance of &quot;er&quot;.
+</p>
+</dd>
+<dt><code>icolor fgcolor,bgcolor start=&quot;sr&quot; end=&quot;er&quot;</code></dt>
+<dd><p>Same as above, except that the expression matching is case insensitive.
+</p>
+</dd>
+<dt><code>include &quot;syntaxfile&quot;</code></dt>
+<dd><p>Read in self-contained color syntaxes from &quot;syntaxfile&quot;.  Note that
+&quot;syntaxfile&quot; can only contain the above commands, from &quot;syntax&quot; to
+&quot;icolor&quot;.
+</p>
+</dd>
+<dt><code>extendsyntax str directive [arg &hellip;]</code></dt>
+<dd><p>Extend the syntax previously defined as str to include new information.
+Allows you to add a new color, icolor, magic, header, or linter directive
+to an already defined syntax.  Useful when you want to add to definitions
+from the system-installed syntax definitions (which are normally not writable).
+</p>
+</dd>
+</dl>
 
-     <br><dt><code>icolor fgcolor,bgcolor "regex" ...</code><dd>Same as above, except that the expression matching is case insensitive.
+<hr>
+<a name="Rebinding-Keys"></a>
+<div class="header">
+<p>
+Previous: <a href="#Syntax-Highlighting" accesskey="p" rel="prev">Syntax Highlighting</a>, Up: <a href="#Nanorc-Files" accesskey="u" rel="up">Nanorc Files</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
+</div>
+<a name="Rebinding-Keys-1"></a>
+<h3 class="section">5.3 Rebinding Keys</h3>
+
+<p>Key bindings may be reassigned via the following two commands in a
+nanorc file:
+</p>
+<dl compact="compact">
+<dt><code>bind key function menu</code></dt>
+<dd><p>Rebinds <code>key</code> to <code>function</code> in the context of <code>menu</code>
+(or in all menus where the function exists by using <code>all</code>).
+</p>
+</dd>
+<dt><code>unbind key menu</code></dt>
+<dd><p>Unbinds <code>key</code> from <code>menu</code>
+(or from all menus where it exists by using <code>all</code>).
+</p>
+</dd>
+</dl>
 
-     <br><dt><code>color fgcolor,bgcolor start="sr" end="er"</code><dd>Display expressions which start with the extended regular expression
-"sr" and end with the extended regular expression "er" with foreground
-color "fgcolor" and background color "bgcolor", at least one of which
-must be specified.  This allows syntax highlighting to span multiple
-lines.  Note that all subsequent instances of "sr" after an initial "sr"
-is found will be highlighted until the first instance of "er".
+<p>The format of <code>key</code> should be one of:
+</p>
+<dl compact="compact">
+<dt><code>^</code></dt>
+<dd><p>followed by an alpha character or the word &quot;Space&quot;.
+Example: <code>^C</code>
+</p>
+</dd>
+<dt><code>M-</code></dt>
+<dd><p>followed by a printable character or the word &quot;Space&quot;.
+Example: <code>M-C</code>
+</p>
+</dd>
+<dt><code>F</code></dt>
+<dd><p>followed by a numeric value from 1 to 16.
+Example: <code>F10</code>
+</p>
+</dd>
+</dl>
 
-     <br><dt><code>icolor fgcolor,bgcolor start="sr" end="er"</code><dd>Same as above, except that the expression matching is case insensitive.
+<p>Valid names for the <code>function</code> to be bound are:
+</p>
+<dl compact="compact">
+<dt><code>help</code></dt>
+<dd><p>Invokes the help viewer.
+</p>
+</dd>
+<dt><code>cancel</code></dt>
+<dd><p>Cancels the current command.
+</p>
+</dd>
+<dt><code>exit</code></dt>
+<dd><p>Exits from the program (or from the help viewer or the file browser).
+</p>
+</dd>
+<dt><code>writeout</code></dt>
+<dd><p>Writes the current buffer to disk.
+</p>
+</dd>
+<dt><code>insert</code></dt>
+<dd><p>Inserts a file into the current buffer (or into a new buffer when multibuffer
+is enabled).
+</p>
+</dd>
+<dt><code>whereis</code></dt>
+<dd><p>Searches for text in the current buffer &ndash; or for filenames matching
+a string in the current list in the file browser
+</p>
+</dd>
+<dt><code>searchagain</code></dt>
+<dd><p>Repeats the last search command.
+</p>
+</dd>
+<dt><code>replace</code></dt>
+<dd><p>Interactively replaces text within the current buffer.
+</p>
+</dd>
+<dt><code>cut</code></dt>
+<dd><p>Cuts and stores the current line (or the marked region).
+</p>
+</dd>
+<dt><code>copytext</code></dt>
+<dd><p>Copies the current line (or the marked region) without deleting it.
+</p>
+</dd>
+<dt><code>uncut</code></dt>
+<dd><p>Copies the currently stored text into the current buffer at the
+current cursor position.
+</p>
+</dd>
+<dt><code>mark</code></dt>
+<dd><p>Sets the mark at the current position, to start selecting text.
+</p>
+</dd>
+<dt><code>cutrestoffile</code></dt>
+<dd><p>Cuts all text from the cursor position till the end of the buffer.
+</p>
+</dd>
+<dt><code>curpos</code></dt>
+<dd><p>Shows the current cursor position: the line, column, and character positions.
+</p>
+</dd>
+<dt><code>wordcount</code></dt>
+<dd><p>Counts the number of words, lines and characters in the current buffer.
+</p>
+</dd>
+<dt><code>speller</code></dt>
+<dd><p>Invokes a spell-checking program (or a linting program, if the current
+syntax highlighting defines one).
+</p>
+</dd>
+<dt><code>justify</code></dt>
+<dd><p>Justifies the current paragraph.
+</p>
+</dd>
+<dt><code>fulljustify</code></dt>
+<dd><p>Justifies the entire current buffer.
+</p>
+</dd>
+<dt><code>indent</code></dt>
+<dd><p>Indents (shifts to the right) the currently marked text.
+</p>
+</dd>
+<dt><code>unindent</code></dt>
+<dd><p>Unindents (shifts to the left) the currently marked text.
+</p>
+</dd>
+<dt><code>left</code></dt>
+<dd><p>Goes left one position (in the editor or browser).
+</p>
+</dd>
+<dt><code>right</code></dt>
+<dd><p>Goes right one position (in the editor or browser).
+</p>
+</dd>
+<dt><code>up</code></dt>
+<dd><p>Goes one line up (in the editor or browser).
+</p>
+</dd>
+<dt><code>down</code></dt>
+<dd><p>Goes one line down (in the editor or browser).
+</p>
+</dd>
+<dt><code>scrollup</code></dt>
+<dd><p>Scrolls up one line of text from the current position.
+</p>
+</dd>
+<dt><code>scrolldown</code></dt>
+<dd><p>Scrolls down one line of text from the current position.
+</p>
+</dd>
+<dt><code>nextword</code></dt>
+<dd><p>Moves the cursor to the beginning of the next word.
+</p>
+</dd>
+<dt><code>prevword</code></dt>
+<dd><p>Moves the cursor to the beginning of the previous word.
+</p>
+</dd>
+<dt><code>home</code></dt>
+<dd><p>Moves the cursor to the beginning of the current line.
+</p>
+</dd>
+<dt><code>end</code></dt>
+<dd><p>Moves the cursor to the end of the current line.
+</p>
+</dd>
+<dt><code>beginpara</code></dt>
+<dd><p>Moves the cursor to the beginning of the current paragraph.
+</p>
+</dd>
+<dt><code>endpara</code></dt>
+<dd><p>Moves the cursor to the end of the current paragraph.
+</p>
+</dd>
+<dt><code>prevpage</code></dt>
+<dd><p>Goes up one screenful.
+</p>
+</dd>
+<dt><code>nextpage</code></dt>
+<dd><p>Goes down one screenful.
+</p>
+</dd>
+<dt><code>firstline</code></dt>
+<dd><p>Goes to the first line of the file.
+</p>
+</dd>
+<dt><code>lastline</code></dt>
+<dd><p>Goes to the last line of the file.
+</p>
+</dd>
+<dt><code>gotoline</code></dt>
+<dd><p>Goes to a specific line (and column if specified).
+</p>
+</dd>
+<dt><code>gototext</code></dt>
+<dd><p>Switches from targeting a line number to searching for text.
+</p>
+</dd>
+<dt><code>findbracket</code></dt>
+<dd><p>Moves the cursor to the bracket (brace, parenthesis, etc.) that matches
+(pairs) with the one under the cursor.
+</p>
+</dd>
+<dt><code>prevbuf</code></dt>
+<dd><p>Switches to editing/viewing the previous buffer when using multibuffer mode.
+</p>
+</dd>
+<dt><code>nextbuf</code></dt>
+<dd><p>Switches to editing/viewing the next buffer when using multibuffer mode.
+</p>
+</dd>
+<dt><code>verbatim</code></dt>
+<dd><p>Inserts the next character verbatim into the file.
+</p>
+</dd>
+<dt><code>tab</code></dt>
+<dd><p>Inserts a tab at the current cursor location.
+</p>
+</dd>
+<dt><code>enter</code></dt>
+<dd><p>Inserts a new line below the current one.
+</p>
+</dd>
+<dt><code>delete</code></dt>
+<dd><p>Deletes the character under the cursor.
+</p>
+</dd>
+<dt><code>backspace</code></dt>
+<dd><p>Deletes the character before the cursor.
+</p>
+</dd>
+<dt><code>undo</code></dt>
+<dd><p>Undoes the last performed text action (add text, delete text, etc).
+</p>
+</dd>
+<dt><code>redo</code></dt>
+<dd><p>Redoes the last undone action (i.e., it undoes an undo).
+</p>
+</dd>
+<dt><code>refresh</code></dt>
+<dd><p>Refreshes the screen.
+</p>
+</dd>
+<dt><code>suspend</code></dt>
+<dd><p>Suspends the editor (if the suspending function is enabled, see the
+&quot;suspendenable&quot; entry below).
+</p>
+</dd>
+<dt><code>casesens</code></dt>
+<dd><p>Toggles case sensitivity in searching (search/replace menus only).
+</p>
+</dd>
+<dt><code>regexp</code></dt>
+<dd><p>Toggles whether searching/replacing is based on literal strings or regular expressions.
+</p>
+</dd>
+<dt><code>backwards</code></dt>
+<dd><p>Toggles whether searching/replacing goes forward or backward.
+</p>
+</dd>
+<dt><code>prevhistory</code></dt>
+<dd><p>Shows the previous history entry in the prompt menus (e.g. search).
+</p>
+</dd>
+<dt><code>nexthistory</code></dt>
+<dd><p>Shows the next history entry in the prompt menus (e.g. search).
+</p>
+</dd>
+<dt><code>flipreplace</code></dt>
+<dd><p>Toggles between searching for something and replacing something.
+</p>
+</dd>
+<dt><code>flipexecute</code></dt>
+<dd><p>Toggles between inserting a file and executing a command.
+</p>
+</dd>
+<dt><code>flipnewbuffer</code></dt>
+<dd><p>Toggles between inserting into the current buffer and into a new
+empty buffer.
+</p>
+</dd>
+<dt><code>dosformat</code></dt>
+<dd><p>When writing a file, switches to writing a DOS format (CR/LF).
+</p>
+</dd>
+<dt><code>macformat</code></dt>
+<dd><p>When writing a file, switches to writing a Mac format.
+</p>
+</dd>
+<dt><code>append</code></dt>
+<dd><p>When writing a file, appends to the end instead of overwriting.
+</p>
+</dd>
+<dt><code>prepend</code></dt>
+<dd><p>When writing a file, &rsquo;prepends&rsquo; (writes at the beginning) instead of overwriting.
+</p>
+</dd>
+<dt><code>backup</code></dt>
+<dd><p>When writing a file, creates a backup of the current file.
+</p>
+</dd>
+<dt><code>tofiles</code></dt>
+<dd><p>Starts the file browser, allowing to select a file from a list.
+</p>
+</dd>
+<dt><code>gotodir</code></dt>
+<dd><p>Goes to a directory to be specified, allowing to browse anywhere
+in the filesystem.
+</p>
+</dd>
+<dt><code>firstfile</code></dt>
+<dd><p>Goes to the first file when using the file browser (reading or writing files).
+</p>
+</dd>
+<dt><code>lastfile</code></dt>
+<dd><p>Goes to the last file when using the file browser (reading or writing files).
+</p>
+</dd>
+<dt><code>nohelp</code></dt>
+<dd><p>Toggles the presence of the two-line list of key bindings at the bottom of the screen.
+</p>
+</dd>
+<dt><code>constupdate</code></dt>
+<dd><p>Toggles the constant display of the current line, column, and character positions.
+</p>
+</dd>
+<dt><code>morespace</code></dt>
+<dd><p>Toggles the presence of the blank line which &rsquo;separates&rsquo; the titlebar from the file text.
+</p>
+</dd>
+<dt><code>smoothscroll</code></dt>
+<dd><p>Toggles smooth scrolling (when moving around with the arrow keys).
+</p>
+</dd>
+<dt><code>softwrap</code></dt>
+<dd><p>Toggles the displaying of overlong lines on multiple screen lines.
+</p>
+</dd>
+<dt><code>whitespacedisplay</code></dt>
+<dd><p>Toggles the showing of whitespace.
+</p>
+</dd>
+<dt><code>nosyntax</code></dt>
+<dd><p>Toggles syntax highlighting.
+</p>
+</dd>
+<dt><code>smarthome</code></dt>
+<dd><p>Toggles the smartness of the Home key.
+</p>
+</dd>
+<dt><code>autoindent</code></dt>
+<dd><p>Toggles whether new lines will contain the same amount of whitespace as the preceding line.
+</p>
+</dd>
+<dt><code>cuttoend</code></dt>
+<dd><p>Toggles whether cutting text will cut the whole line or just from the current cursor
+position to the end of the line.
+</p>
+</dd>
+<dt><code>nowrap</code></dt>
+<dd><p>Toggles whether long lines will be hard-wrapped to the next line.
+</p>
+</dd>
+<dt><code>tabstospaces</code></dt>
+<dd><p>Toggles whether typed tabs will be converted to spaces.
+</p>
+</dd>
+<dt><code>backupfile</code></dt>
+<dd><p>Toggles whether a backup will be made of the file to be edited.
+</p>
+</dd>
+<dt><code>multibuffer</code></dt>
+<dd><p>Toggles the use of multiple file buffers (if available).
+</p>
+</dd>
+<dt><code>mouse</code></dt>
+<dd><p>Toggles mouse support.
+</p>
+</dd>
+<dt><code>noconvert</code></dt>
+<dd><p>Toggles automatic conversion of files from DOS/Mac format.
+</p>
+</dd>
+<dt><code>suspendenable</code></dt>
+<dd><p>Toggles whether the suspend sequence (normally ^Z) will suspend the editor window.
+</p>
+</dd>
+</dl>
 
-     <br><dt><code>include "syntaxfile"</code><dd>Read in self-contained color syntaxes from "syntaxfile".  Note that
-"syntaxfile" can only contain "syntax", "color", and "icolor" commands.
+<p>Valid names for <code>menu</code> are:
+</p>
+<dl compact="compact">
+<dt><code>main</code></dt>
+<dd><p>The main editor window where text is entered and edited.
+</p>
+</dd>
+<dt><code>search</code></dt>
+<dd><p>The search menu (AKA whereis).
+</p>
+</dd>
+<dt><code>replace</code></dt>
+<dd><p>The &rsquo;search to replace&rsquo; menu.
+</p>
+</dd>
+<dt><code>replacewith</code></dt>
+<dd><p>The &rsquo;replace with&rsquo; menu, which comes up after &rsquo;search to replace&rsquo;.
+</p>
+</dd>
+<dt><code>gotoline</code></dt>
+<dd><p>The &rsquo;goto line (and column)&rsquo; menu.
+</p>
+</dd>
+<dt><code>writeout</code></dt>
+<dd><p>The &rsquo;write file&rsquo; menu.
+</p>
+</dd>
+<dt><code>insert</code></dt>
+<dd><p>The &rsquo;insert file&rsquo; menu.
+</p>
+</dd>
+<dt><code>extcmd</code></dt>
+<dd><p>The menu for inserting output from an external command, reached from the insert menu.
+</p>
+</dd>
+<dt><code>help</code></dt>
+<dd><p>The help-viewer menu.
+</p>
+</dd>
+<dt><code>spell</code></dt>
+<dd><p>The interactive spell checker Yes/no menu.
+</p>
+</dd>
+<dt><code>linter</code></dt>
+<dd><p>The linter menu.
+</p>
+</dd>
+<dt><code>browser</code></dt>
+<dd><p>The file browser for inserting or writing a file.
+</p>
+</dd>
+<dt><code>whereisfile</code></dt>
+<dd><p>The &rsquo;search for a file&rsquo; menu in the file browser.
+</p>
+</dd>
+<dt><code>gotodir</code></dt>
+<dd><p>The &rsquo;go to directory&rsquo; menu in the file browser.
+</p>
+</dd>
+<dt><code>all</code></dt>
+<dd><p>A special name that encompasses all menus.  For <code>bind</code> it means
+all menus where the specified <code>function</code> exists; for <code>unbind</code>
+it means all menus where the specified <code>key</code> exists.
+</p></dd>
+</dl>
 
-   </dl>
 
-<div class="node">
+<hr>
 <a name="The-File-Browser"></a>
-<p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#Pico-Compatibility">Pico Compatibility</a>,
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#Nanorc-Files">Nanorc Files</a>,
-Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
-
+<div class="header">
+<p>
+Next: <a href="#Pico-Compatibility" accesskey="n" rel="next">Pico Compatibility</a>, Previous: <a href="#Nanorc-Files" accesskey="p" rel="prev">Nanorc Files</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-
+<a name="The-File-Browser-1"></a>
 <h2 class="chapter">6 The File Browser</h2>
 
-<p>When reading or writing files, pressing ^T will invoke the file browser. 
+<p>When reading or writing files, pressing ^T will invoke the file browser.
 Here, one can navigate directories in a graphical manner in order to
 find the desired file.
-
-   <p>Basic movement in the file browser is accomplished with the arrow keys,
+</p>
+<p>Basic movement in the file browser is accomplished with the arrow keys,
 page up, and page down.  More advanced movement is accomplished by
-searching via ^W (or 'w') and changing directories via ^_ (or 'g').  The
-behavior of the Enter (or 's') key varies by what is currently selected. 
+searching via ^W (or &rsquo;w&rsquo;) and changing directories via ^_ (or &rsquo;g&rsquo;).  The
+behavior of the Enter (or &rsquo;s&rsquo;) key varies by what is currently selected.
 If the currently selected object is a directory, the file browser will
 enter and display the contents of the directory.  If the object is a
 file, this filename and path are copied to the statusbar, and the file
 browser exits.
+</p>
 
-<div class="node">
+<hr>
 <a name="Pico-Compatibility"></a>
-<p><hr>
-Next:&nbsp;<a rel="next" accesskey="n" href="#Building-and-Configure-Options">Building and Configure Options</a>,
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#The-File-Browser">The File Browser</a>,
-Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
-
+<div class="header">
+<p>
+Next: <a href="#Building-and-Configure-Options" accesskey="n" rel="next">Building and Configure Options</a>, Previous: <a href="#The-File-Browser" accesskey="p" rel="prev">The File Browser</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-
+<a name="Pico-Compatibility-1"></a>
 <h2 class="chapter">7 Pico Compatibility</h2>
 
 <p><code>nano</code> attempts to emulate Pico as closely as possible, but there
 are certain differences between the editors:
-
-     <dl>
-<dt><code>Search and Replace History</code><dd>As of version 1.1.99pre1 of <code>nano</code>, text entered as search or
+</p>
+<dl compact="compact">
+<dt><code>Search and Replace History</code></dt>
+<dd><p>As of version 1.1.99pre1 of <code>nano</code>, text entered as search or
 replace strings will be stored and can be accessed with the up/down
 arrow keys.  Previously, <code>nano</code> offered a more consistent, but
-incompatible with Pico, method for entering search and replace strings. 
+incompatible with Pico, method for entering search and replace strings.
 In the old method, previous entries would be displayed by default as
 editable text in front of the cursor, as opposed to being bracketed and
 uneditable as it is in Pico.  The old behavior could be made compatible
@@ -725,143 +1639,225 @@ with Pico via the <code>-p</code> option, but recent versions of Pico use the
 editor.  Since, with the new method, search and replace strings can
 still be edited by simply hitting the up arrow key once, the old method
 was removed completely.
+</p>
 
-     <br><dt><code>Writing, Appending, or Prepending Selected Text to Files</code><dd>Text selected using the marking key (^^) can be written out, appended,
+</dd>
+<dt><code>Writing, Appending, or Prepending Selected Text to Files</code></dt>
+<dd><p>Text selected using the marking key (^^) can be written out, appended,
 or prepended to a new or existing file using the WriteOut key (^O).
-
-     <br><dt><code>Toggles</code><dd>Many options which alter the functionality of the program can be
-"toggled" on or off using Meta key sequences, meaning the program does
+</p>
+</dd>
+<dt><code>Toggles</code></dt>
+<dd><p>Many options which alter the functionality of the program can be
+&quot;toggled&quot; on or off using Meta key sequences, meaning the program does
 not have to be restarted to turn a particular feature of the editor on
 or off.  Please see the internal help function (^G) for a list of what
 functions can be toggled for a particular version of <code>nano</code>.  See
 See <a href="#Feature-Toggles">Feature Toggles</a>, for more info.
-
-     <br><dt><code>Cursor Position Display</code><dd>The output of the "Display Cursor Position" in <code>nano</code> displays
-the given column position, as well as the row and total character
-position of the cursor.
-
-     <br><dt><code>Interactive Replace and Spell Checker</code><dd>It is worth noting that <code>nano</code>'s replace function is interactive,
-i.e. it does not stop after one search string is found and automatically
-replace it.  The <code>nano</code> implementation will pause at each search
-string found and query whether to replace this instance or not.  The
+</p>
+</dd>
+<dt><code>Cursor Position Display</code></dt>
+<dd><p>The output of the &quot;Display Cursor Position&quot; in <code>nano</code> displays
+the current line position of the cursor, as well as the column and
+total character position.
+</p>
+</dd>
+<dt><code>Interactive Replace and Spell Checker</code></dt>
+<dd><p>It is worth noting that <code>nano</code>&rsquo;s replace function is interactive,
+i.e. it does not stop after one search string was found and automatically
+replaced.  The <code>nano</code> implementation will pause at each found
+search string and query whether to replace this instance or not.  The
 internal spell checker operates similarly.  Note that there is no way to
 force these functions to behave in the Pico fashion.  As of version
 1.1.99pre1, misspelled words are sorted and trimmed for uniqueness in
-the internal spell checker such that the words 'apple' and 'Apple' will
-be prompted for correction separately. 
+the internal spell checker such that the words &rsquo;apple&rsquo; and &rsquo;Apple&rsquo; will
+be prompted for correction separately.
+</p></dd>
 </dl>
 
-<div class="node">
-<a name="Building-and-Configure-Options"></a>
-<p><hr>
-Previous:&nbsp;<a rel="previous" accesskey="p" href="#Pico-Compatibility">Pico Compatibility</a>,
-Up:&nbsp;<a rel="up" accesskey="u" href="#Top">Top</a>
 
+<hr>
+<a name="Building-and-Configure-Options"></a>
+<div class="header">
+<p>
+Previous: <a href="#Pico-Compatibility" accesskey="p" rel="prev">Pico Compatibility</a>, Up: <a href="#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>]</p>
 </div>
-
+<a name="Building-and-Configure-Options-1"></a>
 <h2 class="chapter">8 Building and Configure Options</h2>
 
 <p>Building <code>nano</code> from source is fairly straightforward if you are
 familiar with compiling programs with autoconf support:
-
-     <ul>
-<li>tar xvfz nano-x.y.z.tar.gz (where x.y.z is the version of
+</p>
+<ul>
+<li> tar xvfz nano-x.y.z.tar.gz (where x.y.z is the version of
 <code>nano</code>)
-<li>cd nano-x.y.z/
-<li>./configure
-<li>make
-<li>make install
-</ul>
-
-   <p>The possible options to <code>./configure</code> are:
-
-     <dl>
-<dt><code>--disable-browser</code><dd>Disable the mini file browser when reading or writing files.
+</li><li> cd nano-x.y.z/
+</li><li> ./configure
+</li><li> make
+</li><li> make install
+</li></ul>
 
-     <br><dt><code>--disable-help</code><dd>Disable the help function.  Doing this makes the binary much smaller,
+<p>The possible options to <code>./configure</code> are:
+</p>
+<dl compact="compact">
+<dt><code>--disable-browser</code></dt>
+<dd><p>Disable the mini file browser when reading or writing files.
+</p>
+</dd>
+<dt><code>--disable-color</code></dt>
+<dd><p>Disable support for the syntax coloring of files.  This also eliminates
+the -Y command-line option, which chooses a specific syntax.
+</p>
+</dd>
+<dt><code>--disable-extra</code></dt>
+<dd><p>Disable extra features.  At the moment, this is just easter-egg-type
+stuff.
+</p>
+</dd>
+<dt><code>--disable-help</code></dt>
+<dd><p>Disable the help function.  Doing this makes the binary much smaller,
 but makes it difficult for new users to learn more than very basic
 things about using the editor.
-
-     <br><dt><code>--disable-justify</code><dd>Disable the justify and unjustify functions.
-
-     <br><dt><code>--disable-mouse</code><dd>Disable all mouse functionality.  This also disables the -m command line
-option, which enables the mouse functionality.
-
-     <br><dt><code>--disable-operatingdir</code><dd>Disable setting the operating directory.  This also disables the -o
-command line option, which sets the operating directory.
-
-     <br><dt><code>--disable-speller</code><dd>Disable use of the spell checker.  This also disables the -s command
-line option, which allows specifying an alternate spell checker.
-
-     <br><dt><code>--disable-tabcomp</code><dd>Disable the tab completion code when reading or writing files.
-
-     <br><dt><code>--disable-wrapping</code><dd>Disable all long line wrapping.  This also eliminates the -w command
-line option, which enables long line wrapping.
-
-     <br><dt><code>--enable-tiny</code><dd>This option disables all the above.  It also disables some of the larger
-internals of the editor, like the marking code and the cut to end of
-line code.  It also disables the function toggles.
-
-     <br><dt><code>--enable-debug</code><dd>Enable support for runtime debug output.  This can get pretty messy, so
-chances are you only want this feature to work on the nano source.
-
-     <br><dt><code>--enable-extra</code><dd>Enable extra features.  At the moment, this is just easter egg-type
-stuff.
-
-     <br><dt><code>--enable-color</code><dd>Enable support for syntax coloring of files using the nanorc file.  This
-enables nanorc support as well.
-
-     <br><dt><code>--enable-multibuffer</code><dd>Enable support for opening multiple files at a time and switching
-between them on the fly.
-
-     <br><dt><code>--enable-nanorc</code><dd>Enable support for reading the nanorc file at startup.  You can store
-custom settings in the nanorc file rather than having to pass command
-line options to get desired behavior.  See See <a href="#Nanorc-Files">Nanorc Files</a>, for
-more info.
-
-     <br><dt><code>--enable-all</code><dd>Shortcut for enabling the above four features (extra, color,
-multibuffer, and nanorc).
-
-     <br><dt><code>--disable-nls</code><dd>Disables Native Language support.  This will disable use of the
+</p>
+</dd>
+<dt><code>--disable-histories</code></dt>
+<dd><p>Disable the code for the handling of the history files: the search and
+replace strings that were used, and the cursor position at which each
+file was closed.  This also eliminates the -H and -P command-line
+options, which switch on the logging of search/replace strings and
+cursor positions.
+</p>
+</dd>
+<dt><code>--disable-justify</code></dt>
+<dd><p>Disable the justify and unjustify functions.
+</p>
+</dd>
+<dt><code>--disable-libmagic</code></dt>
+<dd><p>Disable the use of the library of magic-number tests (for determining
+the file type and thus which syntax to use for colouring &ndash; often the
+tests on filename extension and header line will be enough).
+</p>
+</dd>
+<dt><code>--disable-mouse</code></dt>
+<dd><p>Disable all mouse functionality.  This also eliminates the -m
+command-line option, which enables the mouse functionality.
+</p>
+</dd>
+<dt><code>--disable-multibuffer</code></dt>
+<dd><p>Disable support for opening multiple files at a time and switching
+between them on the fly.  This also eliminates the -F command-line
+option, which switches the use of multiple file buffers on.
+</p>
+</dd>
+<dt><code>--disable-nanorc</code></dt>
+<dd><p>Disable support for reading the nanorc files at startup.  With such
+support, you can store custom settings in a system-wide and a per-user
+nanorc file rather than having to pass command-line options to get
+the desired behavior.  See See <a href="#Nanorc-Files">Nanorc Files</a>, for more info.
+Disabling this also eliminates the -I and -q command-line options;
+the first inhibits the reading of nanorcfiles, and the second
+suppresses warnings about errors in those files.
+</p>
+</dd>
+<dt><code>--disable-operatingdir</code></dt>
+<dd><p>Disable setting the operating directory.  This also eliminates the -o
+command-line option, which sets the operating directory.
+</p>
+</dd>
+<dt><code>--disable-speller</code></dt>
+<dd><p>Disable use of the spell checker.  This also eliminates the -s
+command-line option, which allows specifying an alternate spell checker.
+</p>
+</dd>
+<dt><code>--disable-tabcomp</code></dt>
+<dd><p>Disable the tab completion code when reading or writing files.
+</p>
+</dd>
+<dt><code>--disable-wrapping</code></dt>
+<dd><p>Disable hard-wrapping of overlong lines.  This also eliminates the -w
+command-line option, which enables long-line wrapping.
+</p>
+</dd>
+<dt><code>--enable-tiny</code></dt>
+<dd><p>This option disables all the above.  It also disables some of the larger
+internals of the editor, like the marking code and the cut-to-end-of-line
+code.  It also disables the function toggles.  By using the enabling
+counterpart of the above options together with &ndash;enable-tiny, specific
+features can be switched back on.
+</p>
+</dd>
+<dt><code>--enable-debug</code></dt>
+<dd><p>Enable support for runtime debug output.  This can get pretty messy, so
+chances are you only want this feature when you&rsquo;re working on the nano source.
+</p>
+</dd>
+<dt><code>--disable-nls</code></dt>
+<dd><p>Disables Native Language support.  This will disable the use of any
 available GNU <code>nano</code> translations.
-
-     <br><dt><code>--disable-wrapping-as-root</code><dd>Disable long line wrapping by default when nano is run as root.
-
-     <br><dt><code>--enable-utf8</code><dd>Enable support for reading and writing Unicode files.  This will require
+</p>
+</dd>
+<dt><code>--disable-wrapping-as-root</code></dt>
+<dd><p>Disable hard-wrapping of overlong lines by default when <code>nano</code>
+is run as root.
+</p>
+</dd>
+<dt><code>--enable-utf8</code></dt>
+<dd><p>Enable support for reading and writing Unicode files.  This will require
 either a wide version of curses, or a UTF-8-enabled version of Slang.
+</p>
+</dd>
+<dt><code>--disable-utf8</code></dt>
+<dd><p>Disable support for reading and writing Unicode files.  Normally the
+configure script auto-detects whether to enable UTF-8 support or not.
+You can use this or the previous option to override that detection.
+</p>
+</dd>
+<dt><code>--with-slang</code></dt>
+<dd><p>Compile <code>nano</code> against Slang instead of against ncurses or other
+curses libraries.
+</p>
+</dd>
+</dl>
 
-     <br><dt><code>--disable-utf8</code><dd>Disable support for reading and writing Unicode files.
-
-     <br><dt><code>--with-slang</code><dd>Compiling <code>nano</code> with Slang is supported, and will make the binary
-notably smaller than if compiled with ncurses or other curses libraries.
+<a name="SEC_Contents"></a>
+<h2 class="contents-heading">Table of Contents</h2>
+
+<div class="contents">
+
+<ul class="no-bullet">
+  <li><a name="toc-Introduction-1" href="#Introduction">1 Introduction</a>
+  <ul class="no-bullet">
+    <li><a name="toc-Overview-1" href="#Overview">1.1 Overview</a></li>
+    <li><a name="toc-Command-Line-Options-1" href="#Command-Line-Options">1.2 Command Line Options</a></li>
+  </ul></li>
+  <li><a name="toc-Editor-Basics-1" href="#Editor-Basics">2 Editor Basics</a>
+  <ul class="no-bullet">
+    <li><a name="toc-Entering-Text-1" href="#Entering-Text">2.1 Entering Text</a></li>
+    <li><a name="toc-Special-Functions-1" href="#Special-Functions">2.2 Special Functions</a></li>
+    <li><a name="toc-The-Cutbuffer-1" href="#The-Cutbuffer">2.3 The Cutbuffer</a></li>
+    <li><a name="toc-The-Mark-1" href="#The-Mark">2.4 The Mark</a></li>
+    <li><a name="toc-The-Titlebar-1" href="#The-Titlebar">2.5 The Titlebar</a></li>
+    <li><a name="toc-The-Statusbar-1" href="#The-Statusbar">2.6 The Statusbar</a></li>
+    <li><a name="toc-Shortcut-Lists-1" href="#Shortcut-Lists">2.7 Shortcut Lists</a></li>
+    <li><a name="toc-Using-the-Mouse-1" href="#Using-the-Mouse">2.8 Using the Mouse</a></li>
+  </ul></li>
+  <li><a name="toc-Online-Help-1" href="#Online-Help">3 Online Help</a></li>
+  <li><a name="toc-Feature-Toggles-1" href="#Feature-Toggles">4 Feature Toggles</a></li>
+  <li><a name="toc-Nanorc-Files-1" href="#Nanorc-Files">5 Nanorc Files</a>
+  <ul class="no-bullet">
+    <li><a name="toc-Settings-1" href="#Settings">5.1 Settings</a></li>
+    <li><a name="toc-Syntax-Highlighting-1" href="#Syntax-Highlighting">5.2 Syntax Highlighting</a></li>
+    <li><a name="toc-Rebinding-Keys-1" href="#Rebinding-Keys">5.3 Rebinding Keys</a></li>
+  </ul></li>
+  <li><a name="toc-The-File-Browser-1" href="#The-File-Browser">6 The File Browser</a></li>
+  <li><a name="toc-Pico-Compatibility-1" href="#Pico-Compatibility">7 Pico Compatibility</a></li>
+  <li><a name="toc-Building-and-Configure-Options-1" href="#Building-and-Configure-Options">8 Building and Configure Options</a></li>
+</ul>
+</div>
 
-   </dl>
+<hr>
 
-   <div class="contents">
-<h2>Table of Contents</h2>
-<ul>
-<li><a name="toc_Introduction" href="#Introduction">1 Introduction</a>
-<ul>
-<li><a href="#Overview">1.1 Overview</a>
-<li><a href="#Command-Line-Options">1.2 Command Line Options</a>
-</li></ul>
-<li><a name="toc_Editor-Basics" href="#Editor-Basics">2 Editor Basics</a>
-<ul>
-<li><a href="#Entering-Text">2.1 Entering Text</a>
-<li><a href="#Special-Functions">2.2 Special Functions</a>
-<li><a href="#The-Titlebar">2.3 The Titlebar</a>
-<li><a href="#The-Statusbar">2.4 The Statusbar</a>
-<li><a href="#Shortcut-Lists">2.5 Shortcut Lists</a>
-<li><a href="#Using-the-Mouse">2.6 Using the Mouse</a>
-</li></ul>
-<li><a name="toc_Online-Help" href="#Online-Help">3 Online Help</a>
-<li><a name="toc_Feature-Toggles" href="#Feature-Toggles">4 Feature Toggles</a>
-<li><a name="toc_Nanorc-Files" href="#Nanorc-Files">5 Nanorc Files</a>
-<li><a name="toc_The-File-Browser" href="#The-File-Browser">6 The File Browser</a>
-<li><a name="toc_Pico-Compatibility" href="#Pico-Compatibility">7 Pico Compatibility</a>
-<li><a name="toc_Building-and-Configure-Options" href="#Building-and-Configure-Options">8 Building and Configure Options</a>
-</li></ul>
-</div>
 
-</body></html>
 
+</body>
+</html>
diff --git a/doc/texinfo/nano.info b/doc/texinfo/nano.info
index f4cd7ed..4597c8b 100644
--- a/doc/texinfo/nano.info
+++ b/doc/texinfo/nano.info
@@ -1,4 +1,4 @@
-This is nano.info, produced by makeinfo version 4.13 from nano.texi.
+This is nano.info, produced by makeinfo version 5.2 from nano.texi.
 
 INFO-DIR-SECTION Editors
 START-INFO-DIR-ENTRY
@@ -6,9 +6,12 @@ START-INFO-DIR-ENTRY
 END-INFO-DIR-ENTRY
 
 
-File: nano.info,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
+File: nano.info,  Node: Top,  Next: Introduction,  Up: (dir)
 
-   This manual documents GNU `nano', a small and friendly text editor.
+nano Command Manual
+*******************
+
+This manual documents GNU 'nano', a small and friendly text editor.
 
 * Menu:
 
@@ -27,10 +30,11 @@ File: nano.info,  Node: Introduction,  Next: Editor Basics,  Prev: Top,  Up: Top
 1 Introduction
 **************
 
-GNU `nano' is a small and friendly text editor.  Besides basic text
-editing, `nano' offers many extra features like an interactive search
-and replace, go to line and column number, auto-indentation, feature
-toggles, internationalization support, and filename tab completion.
+GNU 'nano' is a small and friendly text editor.  Besides basic text
+editing, 'nano' offers many extra features, like an interactive
+search-and-replace, go-to-line-and-column-number, auto-indentation,
+feature toggles, internationalization support, and filename tab
+completion.
 
 * Menu:
 
@@ -38,30 +42,30 @@ toggles, internationalization support, and filename tab completion.
 * Command Line Options::
 
 
-File: nano.info,  Node: Overview,  Next: Command Line Options,  Prev: Introduction,  Up: Introduction
+File: nano.info,  Node: Overview,  Next: Command Line Options,  Up: Introduction
 
 1.1 Overview
 ============
 
-The original goal for `nano' was a complete bug-for-bug compatible
-emulation of Pico, but `nano''s current goal is to be as compatible as
+The original goal for 'nano' was a complete bug-for-bug compatible
+emulation of Pico, but 'nano''s current goal is to be as compatible as
 possible while offering a superset of Pico's functionality.  See *Note
 Pico Compatibility::, for more info.
 
-   The usual way to invoke `nano' is:
+   The usual way to invoke 'nano' is:
 
-     `nano [OPTION]... [FILE]'
+     'nano [OPTION]... [FILE]'
 
    But it is also possible to edit several files in a row.
 Additionally, the cursor can be put on a desired line number by adding
 this number with a plus sign before any filename, and even in a desired
 column by adding it with a comma.  So the complete synopsis is:
 
-     `nano [OPTION]... [[+LINE] FILE]...'
+     'nano [OPTION]... [[+LINE] FILE]...'
 
-     `nano [OPTION]... [[+,COLUMN] FILE]...'
+     'nano [OPTION]... [[+,COLUMN] FILE]...'
 
-     `nano [OPTION]... [[+LINE,COLUMN] FILE]...'
+     'nano [OPTION]... [[+LINE,COLUMN] FILE]...'
 
    Email bug reports to <nano@nano-editor.org>.
 
@@ -71,194 +75,255 @@ File: nano.info,  Node: Command Line Options,  Prev: Overview,  Up: Introduction
 1.2 Command Line Options
 ========================
 
-`nano' takes the following options from the command line:
+'nano' takes the following options from the command line:
 
-`+LINE,COLUMN'
+'+LINE,COLUMN'
      Start at line number LINE and column number COLUMN (at least one of
      which must be specified) instead of the default of line 1, column
      1.
 
-`-?'
-     Same as `-h, --help'.
-
-`-A, --smarthome'
+'-A'
+'--smarthome'
      Make the Home key smarter.  When Home is pressed anywhere but at
      the very beginning of non-whitespace characters on a line, the
      cursor will jump to that beginning (either forwards or backwards).
-     If the cursor is already at that position, it will jump to the
-     true beginning of the line.
+     If the cursor is already at that position, it will jump to the true
+     beginning of the line.
 
-`-B, --backup'
+'-B'
+'--backup'
      When saving a file, back up the previous version of it to the
-     current filename suffixed with a ~.
+     current filename suffixed with a '~'.
 
-`-C <dir>, --backupdir=<dir>'
-     Set the directory where `nano' puts unique backup files if file
+'-C DIRECTORY'
+'--backupdir=DIRECTORY'
+     Set the directory where 'nano' puts unique backup files if file
      backups are enabled.
 
-`-D, --boldtext'
+'-D'
+'--boldtext'
      Use bold text instead of reverse video text.
 
-`-E, --tabstospaces'
+'-E'
+'--tabstospaces'
      Convert typed tabs to spaces.
 
-`-F, --multibuffer'
-     Enable multiple file buffers, if available.
+'-F'
+'--multibuffer'
+     Enable multiple file buffers (if support for them has been compiled
+     in).
+
+'-G'
+'--locking'
+     Enable vim-style file locking when editing files.
 
-`-H, --historylog'
-     Log search and replace strings to ~/.nano_history, so they can be
-     retrieved in later sessions, if nanorc support is available.
+'-H'
+'--historylog'
+     Log search and replace strings to '~/.nano/search_history', so they
+     can be retrieved in later sessions.
 
-`-I, --ignorercfiles'
-     Don't look at SYSCONFDIR/nanorc or ~/.nanorc, if nanorc support is
-     available.
+'-I'
+'--ignorercfiles'
+     Don't look at the system's nanorc file nor at the user's
+     '~/.nanorc'.
 
-`-K, --rebindkeypad'
+'-K'
+'--rebindkeypad'
      Interpret the numeric keypad keys so that they all work properly.
      You should only need to use this option if they don't, as mouse
      support won't work properly with this option enabled.
 
-`-L, --nonewlines'
+'-L'
+'--nonewlines'
      Don't add newlines to the ends of files.
 
-`-N, --noconvert'
-     Don't convert files from DOS/Mac format.
+'-N'
+'--noconvert'
+     Disable automatic conversion of files from DOS/Mac format.
 
-`-O, --morespace'
+'-O'
+'--morespace'
      Use the blank line below the titlebar as extra editing space.
 
-`-Q <str>, --quotestr=<str>'
+'-P'
+'--poslog'
+     Log for each file the last location of the cursor, and read it back
+     upon reopening the file and place it there again.
+
+'-Q "CHARACTERS"'
+'--quotestr="CHARACTERS"'
      Set the quoting string for justifying.  The default value is
 
-          `^([ \t]*[|>:}#])+'
+          "^([ \t]*[|>:}#])+"
 
-     if extended regular expression support is available, or "> "
-     otherwise.  Note that `\t' above stands for a literal Tab
+     if extended regular expression support is available, or '> '
+     otherwise.  Note that '\t' above stands for a literal Tab
      character.
 
-`-R, --restricted'
+'-R'
+'--restricted'
      Restricted mode: don't read or write to any file not specified on
-     the command line; read any nanorc files; allow suspending; allow a
-     file to be appended to, prepended to, or saved under a different
-     name if it already has one; or use backup files or spell checking.
-     Also accessible by invoking `nano' with any name beginning with
-     'r' (e.g. "rnano").
-
-`-S, --smooth'
-     Enable smooth scrolling.  Text will scroll line-by-line, instead
-     of the usual chunk-by-chunk behavior.
-
-`-T <#cols>, --tabsize=<#cols>'
-     Set the displayed tab length to #cols columns.  The value of #cols
-     must be greater than 0.  The default value is 8.
-
-`-U, --quickblank'
+     the command line; don't read any nanorc files nor history files;
+     don't allow suspending nor spell checking; don't allow a file to be
+     appended to, prepended to, or saved under a different name if it
+     already has one; and don't use backup files.  This restricted mode
+     is also accessible by invoking 'nano' with any name beginning with
+     'r' (e.g.  'rnano').
+
+'-S'
+'--smooth'
+     Enable smooth scrolling.  Text will scroll line-by-line, instead of
+     the usual chunk-by-chunk behavior.
+
+'-T NUMBER'
+'--tabsize=NUMBER'
+     Set the displayed tab length to NUMBER columns.  The value of
+     NUMBER must be greater than 0.  The default value is '8'.
+
+'-U'
+'--quickblank'
      Do quick statusbar blanking.  Statusbar messages will disappear
-     after 1 keystroke instead of 25.  Note that -c overrides this.
+     after 1 keystroke instead of 25.  Note that '-c' overrides this.
 
-`-V, --version'
+'-V'
+'--version'
      Show the current version number and exit.
 
-`-W, --wordbounds'
+'-W'
+'--wordbounds'
      Detect word boundaries more accurately by treating punctuation
      characters as parts of words.
 
-`-Y <str>, --syntax=<str>'
-     Specify a specific syntax highlighting from the nanorc to use, if
-     available.  See *Note Nanorc Files::, for more info.
+'-Y NAME'
+'--syntax=NAME'
+     Specify a specific syntax from the nanorc files to use for
+     highlighting.  See *Note Syntax Highlighting::, for more info.
 
-`-c, --const'
+'-c'
+'--const'
      Constantly display the cursor position and line number on the
-     statusbar.  Note that this overrides -U.
+     statusbar.  Note that this overrides '-U'.
 
-`-d, --rebinddelete'
+'-d'
+'--rebinddelete'
      Interpret the Delete key differently so that both Backspace and
      Delete work properly.  You should only need to use this option if
      Backspace acts like Delete on your system.
 
-`-h, --help'
-     Show a summary of command line options and exit.
+'-h'
+'--help'
+     Show a summary of command-line options and exit.
 
-`-i, --autoindent'
+'-i'
+'--autoindent'
      Automatically indent new lines to the same number of spaces and
      tabs as the previous line.
 
-`-k, --cut'
-     Cut from the current cursor position to the end of the current
-     line.
+'-k'
+'--cut'
+     Make the 'Cut Text' command (normally ^K) cut from the current
+     cursor position to the end of the line, instead of cutting the
+     entire line.
 
-`-l, --nofollow'
+'-l'
+'--nofollow'
      When writing files, if the given file is a symbolic link, it is
      removed and a new file is created.
 
-`-m, --mouse'
+'-m'
+'--mouse'
      Enable mouse support, if available for your system.  When enabled,
      mouse clicks can be used to place the cursor, set the mark (with a
-     double click), and execute shortcuts.  The mouse will work in the
-     X Window System, and on the console when gpm is running.
-
-`-o <dir>, --operatingdir=<dir>'
-     Set operating directory.  Makes `nano' set up something similar to
-     a chroot.
-
-`-p, --preserve'
-     Preserve the ^Q (XON) and ^S (XOFF) sequences so data being sent
-     to the editor can be can be stopped and started.
-
-`-q, --quiet'
-     Do not report errors in the nanorc file and ask them to be
+     double click), and execute shortcuts.  The mouse will work in the X
+     Window System, and on the console when gpm is running.  Text can
+     still be selected through dragging by holding down the Shift key.
+
+'-n'
+'--noread'
+     Treat any name given on the command line as a new file.  This
+     allows 'nano' to write to named pipes: it will start with a blank
+     buffer, and will write to the pipe when the user saves the "file".
+     This way 'nano' can be used as an editor in combination with for
+     instance 'gpg' without having to write sensitive data to disk
+     first.
+
+'-o DIRECTORY'
+'--operatingdir=DIRECTORY'
+     Set the operating directory.  This makes 'nano' set up something
+     similar to a chroot.
+
+'-p'
+'--preserve'
+     Preserve the ^Q (XON) and ^S (XOFF) sequences so data being sent to
+     the editor can be stopped and started.
+
+'-q'
+'--quiet'
+     Do not report errors in the nanorc file nor ask them to be
      acknowledged by pressing Enter at startup.
 
-`-r <#cols>, --fill=<#cols>'
-     Wrap lines at column #cols.  If this value is 0 or less, wrapping
-     will occur at the width of the screen less #cols, allowing it to
-     vary along with the width of the screen if the screen is resized.
-     The default value is -8.
-
-`-s <prog>, --speller=<prog>'
-     Invoke the given program as the spell checker.  By default, `nano'
-     uses the command specified in the SPELL environment variable, or,
-     if SPELL is not set, its own interactive spell checker that
-     requires the `spell' program to be installed on your system.
-
-`-t, --tempfile'
+'-r NUMBER'
+'--fill=NUMBER'
+     Hard-wrap lines at column NUMBER (by inserting a newline
+     character).  If the given value is 0 or less, wrapping will occur
+     at the width of the screen minus the given amount, allowing the
+     wrapping width to vary along with the width of the screen if and
+     when it is resized.  The default value is '-8'.  This option
+     conflicts with '-w' - the last one given takes effect.
+
+'-s PROGRAM'
+'--speller=PROGRAM'
+     Invoke the given program as the spell checker.  By default, 'nano'
+     uses the command specified in the 'SPELL' environment variable, or,
+     if 'SPELL' is not set, its own interactive spell checker that
+     requires the 'spell' program to be installed on your system.
+
+'-t'
+'--tempfile'
      Don't ask whether or not to save the current contents of the file
-     when exiting, assume yes.  This is most useful when using `nano'
-     as the composer of a mailer program.
-
-`-u, --undo'
-     Enable experimental generic-purpose undo code.  By default, the
-     undo and redo shortcuts are Meta-U and Meta-E, respectively.
+     when exiting, assume yes.  This is most useful when using 'nano' as
+     the composer of a mailer program.
 
-`-v, --view'
+'-v'
+'--view'
      Don't allow the contents of the file to be altered.  Note that this
      option should NOT be used in place of correct file permissions to
      implement a read-only file.
 
-`-w, --nowrap'
-     Don't wrap long lines at any length.  This option overrides any
-     value for -r.
+'-w'
+'--nowrap'
+     Don't hard-wrap long lines at any length.  This option conflicts
+     with '-r' - the last one given takes effect.
 
-`-x, --nohelp'
+'-x'
+'--nohelp'
      Expert Mode: don't show the Shortcut Lists at the bottom of the
      screen.  This affects the location of the statusbar as well, as in
      Expert Mode it is located at the very bottom of the editor.
 
      Note: When accessing the help system, Expert Mode is temporarily
-     disabled to display the help system navigation keys.
+     disabled to display the help-system navigation keys.
 
-`-z, --suspend'
-     Enable `nano''s suspend ability using the system's suspend
+'-z'
+'--suspend'
+     Enable the ability to suspend 'nano' using the system's suspend
      keystroke (usually ^Z).
 
-`-$, --softwrap'
-     Enable 'soft wrapping'.  `nano' will attempt to display the entire
-     contents of a line, even if it is longer than the screen width.
-     Since '$' normally refers to a variable in the Unix shell, you
-     should specify this option last when using other options (e.g.
-     'nano -wS$') or pass it separately (e.g. 'nano -wS -$').
-
-`-a, -b, -e, -f, -g, -j'
+'-$'
+'--softwrap'
+     Enable 'soft wrapping'.  This will make 'nano' attempt to display
+     the entire contents of any line, even if it is longer than the
+     screen width, by continuing it over multiple screen lines.  Since
+     '$' normally refers to a variable in the Unix shell, you should
+     specify this option last when using other options (e.g.  'nano
+     -wS$') or pass it separately (e.g.  'nano -wS -$').
+
+'-a'
+'-b'
+'-e'
+'-f'
+'-g'
+'-j'
      Ignored, for compatibility with Pico.
 
 
@@ -271,66 +336,103 @@ File: nano.info,  Node: Editor Basics,  Next: Online Help,  Prev: Introduction,
 
 * Entering Text::
 * Special Functions::
+* The Cutbuffer::
+* The Mark::
 * The Titlebar::
 * The Statusbar::
 * Shortcut Lists::
 * Using the Mouse::
 
 
-File: nano.info,  Node: Entering Text,  Next: Special Functions,  Prev: Editor Basics,  Up: Editor Basics
+File: nano.info,  Node: Entering Text,  Next: Special Functions,  Up: Editor Basics
 
 2.1 Entering Text
 =================
 
-All key sequences in `nano' are entered using the keyboard.  `nano' is
-a "modeless" editor.  All keys, with the exception of Control and Meta
-key sequences, will enter text into the file being edited.
+'nano' is a "modeless" editor.  All keystrokes, with the exception of
+Control and Meta key sequences, enter text into the file being edited.
+All key sequences in 'nano' are entered using the keyboard.
 
 
-File: nano.info,  Node: Special Functions,  Next: The Titlebar,  Prev: Entering Text,  Up: Editor Basics
+File: nano.info,  Node: Special Functions,  Next: The Cutbuffer,  Prev: Entering Text,  Up: Editor Basics
 
 2.2 Special Functions
 =====================
 
-Special functions use the Control (Ctrl) key, displayed in the help and
-shortcut lists as ^; the Meta key, displayed as M; or the Escape (Esc)
-key.
+Special functions use the Control key (Ctrl), displayed in the help and
+shortcut lists as ^; the Meta key (Alt or Cmd), displayed as M-; or the
+Escape key (Esc).
 
    * Control key sequences are entered by holding down the Ctrl key and
-     pressing the desired key, or by pressing the Esc key twice and
+     pressing the desired key, or by pressing the Esc key twice and then
      pressing the desired key.
-
-   * Pressing Esc twice and then typing a three-digit number from 000
-     to 255 will enter the character with the corresponding value.
-
+   * Pressing the Esc key twice and then typing a three-digit number
+     from 000 to 255 will enter the character with the corresponding
+     value.
    * Meta key sequences are entered by holding down the Meta key
-     (normally the Alt key) and pressing the desired key, or by
-     pressing the Esc key once and pressing the desired key.  Certain
+     (normally the Alt key) and pressing the desired key, or by pressing
+     the Esc key once and then pressing the desired key.  Certain
      operating systems "swallow" the Alt key so that it never reaches
-     the application; if your operating system does this, you should
-     use the Esc key to generate Meta key sequences.
+     the application; if your operating system does this, you should use
+     the Esc key to generate Meta key sequences.
 
 
-File: nano.info,  Node: The Titlebar,  Next: The Statusbar,  Prev: Special Functions,  Up: Editor Basics
+File: nano.info,  Node: The Cutbuffer,  Next: The Mark,  Prev: Special Functions,  Up: Editor Basics
+
+2.3 The Cutbuffer
+=================
+
+Text can be cut from a file, a whole line at a time, by using the 'Cut
+Text' command (default key binding: ^K). The cut line is stored in the
+cutbuffer.  Consecutive strokes of ^K will add each cut line to this
+buffer, but a ^K after any other keystroke will overwrite the entire
+cutbuffer.
+
+   The contents of the cutbuffer can be pasted back into the file with
+the 'Uncut Text' command (default key binding: ^U).
+
+   A line of text can be copied into the cutbuffer (without cutting it)
+with the 'Copy Text' command (default key binding: M-6).
 
-2.3 The Titlebar
+
+File: nano.info,  Node: The Mark,  Next: The Titlebar,  Prev: The Cutbuffer,  Up: Editor Basics
+
+2.4 The Mark
+============
+
+Text can be selected by first 'setting the Mark' (default key bindings:
+^6 and M-A) and then moving the cursor to the other end of the portion
+to be selected.  The selected portion of text will be highlighted in
+reverse video (or in bold if you set the boldtext option).  This
+selection can now be cut or copied in its entirety with a single ^K or
+M-6.  Or the selection can be used to limit the scope of a
+search-and-replace (^\) or spell-checking session (^T).
+
+   Cutting or copying selected text will toggle the mark off
+automatically.  If necessary, it can be toggled off manually with
+another ^6 or M-A.
+
+
+File: nano.info,  Node: The Titlebar,  Next: The Statusbar,  Prev: The Mark,  Up: Editor Basics
+
+2.5 The Titlebar
 ================
 
 The titlebar is the line displayed at the top of the editor.  There are
 three sections: left, center and right.  The section on the left
-displays the version of `nano' being used.  The center section displays
+displays the version of 'nano' being used.  The center section displays
 the current filename, or "New Buffer" if the file has not yet been
-named.  The section on the right will display "Modified" if the file
-has been modified since it was last saved or opened.
+named.  The section on the right will display "Modified" if the file has
+been modified since it was last saved or opened.
 
-   Special modes: When `nano' is in "File browser" mode, the center
+   Special modes: When 'nano' is in "File browser" mode, the center
 section will display the current directory instead of the filename.  See
 *Note The File Browser::, for more info.
 
 
 File: nano.info,  Node: The Statusbar,  Next: Shortcut Lists,  Prev: The Titlebar,  Up: Editor Basics
 
-2.4 The Statusbar
+2.6 The Statusbar
 =================
 
 The statusbar is the third line from the bottom of the screen, or the
@@ -338,12 +440,12 @@ bottom line in Expert Mode.  See *Note Expert Mode::, for more info.  It
 shows important and informational messages.  Any error messages that
 occur from using the editor will appear on the statusbar.  Any questions
 that are asked of the user will be asked on the statusbar, and any user
-input (search strings, filenames, etc.) will be input on the statusbar.
+input (search strings, filenames, etc.)  will be input on the statusbar.
 
 
 File: nano.info,  Node: Shortcut Lists,  Next: Using the Mouse,  Prev: The Statusbar,  Up: Editor Basics
 
-2.5 Shortcut Lists
+2.7 Shortcut Lists
 ==================
 
 The Shortcut Lists are the two lines at the bottom of the screen which
@@ -352,13 +454,15 @@ show some of the more commonly used functions in the editor.
 
 File: nano.info,  Node: Using the Mouse,  Prev: Shortcut Lists,  Up: Editor Basics
 
-2.6 Using the Mouse
+2.8 Using the Mouse
 ===================
 
 When mouse support has been configured and enabled, a single mouse click
 places the cursor at the indicated position.  Clicking a second time in
 the same position toggles the mark.  Clicking in the shortcut list
-executes the selected shortcut.
+executes the selected shortcut.  To be able to select text with the left
+button, or paste text with the middle button, hold down the Shift key
+during those actions.
 
    The mouse will work in the X Window System, and on the console when
 gpm is running.
@@ -369,10 +473,10 @@ File: nano.info,  Node: Online Help,  Next: Feature Toggles,  Prev: Editor Basic
 3 Online Help
 *************
 
-The online help system in `nano' is available by pressing ^G.  It is
-fairly self explanatory, documenting the various parts of the editor
-and available keystrokes.  Navigation is via the ^Y (Page Up) and ^V
-(Page Down) keys.  ^X exits the help system.
+The online help system in 'nano' is available by pressing ^G. It is
+fairly self-explanatory, documenting the various parts of the editor and
+available keystrokes.  Navigation is via the ^Y (Page Up) and ^V (Page
+Down) keys.  ^X exits the help system.
 
 
 File: nano.info,  Node: Feature Toggles,  Next: Nanorc Files,  Prev: Online Help,  Up: Top
@@ -381,63 +485,62 @@ File: nano.info,  Node: Feature Toggles,  Next: Nanorc Files,  Prev: Online Help
 *****************
 
 Toggles allow you to change certain aspects of the editor that would
-normally be done via command line options.  They are invoked via Meta
+normally be done via command-line options.  They are invoked via Meta
 key sequences.  See *Note Special Functions::, for more info.  The
 following global toggles are available:
 
-`Backup Files Toggle (Meta-B)'
-     toggles the -B (`--backup') command line option.
+'Backup Files Toggle (Meta-B)'
+     toggles the -B ('--backup') command line option.
 
-`Constant Cursor Position Display Toggle (Meta-C)'
-     toggles the -c (`--const') command line option.
+'Constant Cursor Position Display Toggle (Meta-C)'
+     toggles the -c ('--const') command line option.
 
-`Multiple File Buffers Toggle (Meta-F)'
-     toggles the -F (`--multibuffer') command line option.
+'Multiple File Buffers Toggle (Meta-F)'
+     toggles the -F ('--multibuffer') command line option.
 
-`Smart Home Key Toggle (Meta-H)'
-     toggles the -A (`--smarthome') command line option.
+'Smart Home Key Toggle (Meta-H)'
+     toggles the -A ('--smarthome') command line option.
 
-`Auto Indent Toggle (Meta-I)'
-     toggles the -i (`--autoindent') command line option.
+'Auto Indent Toggle (Meta-I)'
+     toggles the -i ('--autoindent') command line option.
 
-`Cut To End Toggle (Meta-K)'
-     toggles the -k (`--cut') command line option.
+'Cut To End Toggle (Meta-K)'
+     toggles the -k ('--cut') command line option.
 
-`Long Line Wrapping Toggle (Meta-L)'
-     toggles the -w (`--nowrap') command line option.
+'Long Line Wrapping Toggle (Meta-L)'
+     toggles the -w ('--nowrap') command line option.
 
-`Mouse Support Toggle (Meta-M)'
-     toggles the -m (`--mouse') command line option.
+'Mouse Support Toggle (Meta-M)'
+     toggles the -m ('--mouse') command line option.
 
-`No Conversion From DOS/Mac Format Toggle (Meta-N)'
-     toggles the -N (`--noconvert') command line option.
+'No Conversion From DOS/Mac Format Toggle (Meta-N)'
+     toggles the -N ('--noconvert') command line option.
 
-`More Space For Editing Toggle (Meta-O)'
-     toggles the -O (`--morespace') command line option.
+'More Space For Editing Toggle (Meta-O)'
+     toggles the -O ('--morespace') command line option.
 
-`Whitespace Display Toggle (Meta-P)'
-     toggles whitespace display mode if you have a "whitespace" option
-     in your nanorc.  See *Note Nanorc Files::, for more info.
+'Whitespace Display Toggle (Meta-P)'
+     toggles whitespace-display mode.  See *Note Whitespace::, for more
+     info.
 
-`Tabs to Spaces Toggle (Meta-Q)'
-     toggles the -E (`--tabstospaces') command line option.
+'Tabs to Spaces Toggle (Meta-Q)'
+     toggles the -E ('--tabstospaces') command line option.
 
-`Smooth Scrolling Toggle (Meta-S)'
-     toggles the -S (`--smooth') command line option.
+'Smooth Scrolling Toggle (Meta-S)'
+     toggles the -S ('--smooth') command line option.
 
-`Expert/No Help Toggle (Meta-X)'
-     toggles the -x (`--nohelp') command line option.
+'Expert/No Help Toggle (Meta-X)'
+     toggles the -x ('--nohelp') command line option.
 
-`Color Syntax Highlighting Toggle (Meta-Y)'
+'Color Syntax Highlighting Toggle (Meta-Y)'
      toggles color syntax highlighting if you have color syntaxes in
-     your nanorc.  See *Note Nanorc Files::, for more info.
-
-`Suspend Toggle (Meta-Z)'
-     toggles the -z (`--suspend') command line option.
+     your nanorc.  See *Note Syntax Highlighting::, for more info.
 
-`Soft Wrapping Toggle (Meta-$)'
-     toggles the -$ (`--softwrap') command line option.
+'Suspend Toggle (Meta-Z)'
+     toggles the -z ('--suspend') command line option.
 
+'Soft Wrapping Toggle (Meta-$)'
+     toggles the -$ ('--softwrap') command line option.
 
 
 File: nano.info,  Node: Nanorc Files,  Next: The File Browser,  Prev: Feature Toggles,  Up: Top
@@ -445,225 +548,312 @@ File: nano.info,  Node: Nanorc Files,  Next: The File Browser,  Prev: Feature To
 5 Nanorc Files
 **************
 
-The nanorc files contain the default settings for `nano'.  They should
-not be in DOS or Mac format.  During startup, `nano' will first read
-its system-wide settings from SYSCONFDIR/nanorc, and then user-specific
-settings from ~/.nanorc.
+The nanorc files contain the default settings for 'nano'.  They should
+be in Unix format, not in DOS or Mac format.  During startup, 'nano'
+will first read the system-wide settings, from /etc/nanorc (the exact
+path might be different), and then the user-specific settings, from
+~/.nanorc.
 
    A nanorc file accepts a series of "set" and "unset" commands, which
-can be used to configure `nano' on startup without using the command
-line options.  Additionally, the "syntax", "color", and "icolor"
-keywords are used to define syntax highlighting rules for different text
-patterns.  `nano' will read one command per line.
-
-   Options in nanorc files take precedence over `nano''s defaults, and
-command line options override nanorc settings.  Options are also unset
-by default, except for those that take arguments.
+can be used to configure 'nano' on startup without using command-line
+options.  Additionally, there are some commands to define syntax
+highlighting and to rebind keys - *Note Syntax Highlighting::, and *Note
+Rebinding Keys::.  'nano' will read one command per line.
+
+   Options in nanorc files take precedence over 'nano''s defaults, and
+command-line options override nanorc settings.  Also, options that do
+not take an argument are unset by default.  So using the 'unset' command
+is only needed when wanting to override a setting of the system's nanorc
+file in your own '~/.nanorc'.  Options that take an argument cannot be
+unset.
 
    Quotes inside string parameters don't have to be escaped with
 backslashes.  The last double quote in the string will be treated as its
-end.  For example, for the "brackets" option,
+end.  For example, for the "brackets" option, '""')>]}"' will match '"',
+''', ')', '>', ']', and '}'.
+
+* Menu:
+
+* Settings::
+* Syntax Highlighting::
+* Rebinding Keys::
+
+
+File: nano.info,  Node: Settings,  Next: Syntax Highlighting,  Up: Nanorc Files
 
-     `""')>]}"'
+5.1 Settings
+============
 
-   will match `"', `'', `)', `>', `]', and `}'.
+The supported settings in a nanorc file are:
 
-   The supported commands and arguments are:
+'set allow_insecure_backup'
+     When backing up files, allow the backup to succeed even if its
+     permissions can't be (re)set due to special OS considerations.  You
+     should NOT enable this option unless you are sure you need it.
 
-`set/unset autoindent'
+'set autoindent'
      Use auto-indentation.
 
-`set/unset backup'
-     Create backup files in "filename~".
+'set backup'
+     When saving a file, back up the previous version of it to the
+     current filename suffixed with a tilde ('~').
 
-`set backupdir "directory"'
-     Set the directory where `nano' puts unique backup files if file
+'set backupdir "directory"'
+     Set the directory where 'nano' puts unique backup files, if file
      backups are enabled.
 
-`set/unset backwards'
+'set backwards'
      Do backwards searches by default.
 
-`set/unset boldtext'
-     Use bold text instead of reverse video text.
+'set boldtext'
+     Use bold instead of reverse video for the titlebar, statusbar, key
+     combos, and selected text.  This can be overridden for the first
+     three by setting the options "titlecolor", "statuscolor", and
+     "keycolor".
 
-`set brackets "string"'
+'set brackets "STRING"'
      Set the characters treated as closing brackets when justifying
-     paragraphs.  They cannot contain blank characters.  Only closing
-     punctuation, optionally followed by closing brackets, can end
-     sentences.  The default value is
+     paragraphs.  This may not include blank characters.  Only closing
+     punctuation (see "punct"), optionally followed by the specified
+     closing brackets, can end sentences.  The default value is
 
-          `""')>]}"'
+          ""')>]}"
 
-`set/unset casesensitive'
-     Do case sensitive searches by default.
+'set casesensitive'
+     Do case-sensitive searches by default.
 
-`set/unset const'
+'set const'
      Constantly display the cursor position in the status bar.
 
-`set/unset cut'
-     Use cut to end of line by default, instead of cutting the whole
+'set cut'
+     Use cut-to-end-of-line by default, instead of cutting the whole
      line.
 
-`set fill "n"'
-     Wrap lines at column number "n".  If "n" is 0 or less, the maximum
-     line length will be the screen width less "n" columns.  The
-     default value is -8.
+'set fill NUMBER'
+     Hard-wrap lines at column number NUMBER.  If NUMBER is 0 or less,
+     the maximum line length will be the screen width less NUMBER
+     columns.  The default value is -8.
+
+'set functioncolor FGCOLOR,BGCOLOR'
+     Specify the color combination to use for the function descriptions
+     in the two help lines at the bottom of the screen.  See 'set
+     titlecolor' for more details.
+
+'set historylog'
+     Enable the use of '~/.nano/search_history' for saving and reading
+     search/replace strings.
 
-`set/unset historylog'
-     Enable ~/.nano_history for saving and reading search/replace
-     strings.
+'set keycolor FGCOLOR,BGCOLOR'
+     Specify the color combination to use for the shortcut key combos in
+     the two help lines at the bottom of the screen.  See 'set
+     titlecolor' for more details.
 
-`set matchbrackets "string"'
+'set locking'
+     Enable vim-style lock-files for when editing files.
+
+'set matchbrackets "STRING"'
      Set the opening and closing brackets that can be found by bracket
-     searches.  They cannot contain blank characters.  The former set
-     must come before the latter set, and both must be in the same
-     order.  The default value is
+     searches.  This may not include blank characters.  The opening set
+     must come before the closing set, and the two sets must be in the
+     same order.  The default value is
 
-          `"(<[{)>]}"'
+          "(<[{)>]}"
 
-`set/unset morespace'
+'set morespace'
      Use the blank line below the titlebar as extra editing space.
 
-`set/unset mouse'
+'set mouse'
      Enable mouse support, so that mouse clicks can be used to place the
      cursor, set the mark (with a double click), or execute shortcuts.
 
-`set/unset multibuffer'
+'set multibuffer'
      Allow inserting files into their own buffers.
 
-`set/unset noconvert'
+'set noconvert'
      Don't convert files from DOS/Mac format.
 
-`set/unset nofollow'
+'set nofollow'
      Don't follow symlinks when writing files.
 
-`set/unset nohelp'
+'set nohelp'
      Don't display the help lists at the bottom of the screen.
 
-`set/unset nonewlines'
+'set nonewlines'
      Don't add newlines to the ends of files.
 
-`set/unset nowrap'
-     Don't wrap text at all.
+'set nowrap'
+     Don't hard-wrap text at all.
 
-`set operatingdir "directory"'
-     `nano' will only read and write files inside "directory" and its
+'set operatingdir "directory"'
+     'nano' will only read and write files inside "directory" and its
      subdirectories.  Also, the current directory is changed to here, so
      files are inserted from this directory.  By default, the operating
      directory feature is turned off.
 
-`set/unset preserve'
+'set poslog'
+     Save the cursor position of files between editing sessions.
+
+'set preserve'
      Preserve the XON and XOFF keys (^Q and ^S).
 
-`set punct "string"'
+'set punct "STRING"'
      Set the characters treated as closing punctuation when justifying
-     paragraphs.  They cannot contain blank characters.  Only closing
-     punctuation, optionally followed by closing brackets, can end
-     sentences.  The default value is `"!.?"'.
+     paragraphs.  This may not include blank characters.  Only the
+     specified closing punctuation, optionally followed by closing
+     brackets (see "brackets"), can end sentences.  The default value is
+     "!.?".
 
-`set/unset quickblank'
+'set quickblank'
      Do quick statusbar blanking.  Statusbar messages will disappear
      after 1 keystroke instead of 25.
 
-`set quotestr "string"'
+'set quiet'
+     When set, 'nano' will not report errors in the nanorc file nor ask
+     them to be acknowledged by pressing Enter at startup.  If this
+     option is used, it should be placed at the top of the file to be
+     fully effective.
+
+'set quotestr "STRING"'
      The email-quote string, used to justify email-quoted paragraphs.
      This is an extended regular expression if your system supports
      them, otherwise a literal string.  The default value is
 
-          `"^([ \\t]*[#:>\\|}])+"'
+          "^([ \\t]*[#:>\\|}])+"
 
-     if you have extended regular expression support, or "> " otherwise.
-     Note that '\\t' stands for a literal Tab character.
+     if you have extended regular expression support, and "> "
+     otherwise.  Note that '\\t' stands for a literal Tab character.
 
-`set/unset rebinddelete'
+'set rebinddelete'
      Interpret the Delete key differently so that both Backspace and
      Delete work properly.  You should only need to use this option if
      Backspace acts like Delete on your system.
 
-`set/unset rebindkeypad'
+'set rebindkeypad'
      Interpret the numeric keypad keys so that they all work properly.
      You should only need to use this option if they don't, as mouse
      support won't work properly with this option enabled.
 
-`set/unset regexp'
+'set regexp'
      Do extended regular expression searches by default.
 
-`set/unset smarthome'
+'set smarthome'
      Make the Home key smarter.  When Home is pressed anywhere but at
      the very beginning of non-whitespace characters on a line, the
      cursor will jump to that beginning (either forwards or backwards).
-     If the cursor is already at that position, it will jump to the
-     true beginning of the line.
+     If the cursor is already at that position, it will jump to the true
+     beginning of the line.
 
-`set/unset smooth'
+'set smooth'
      Use smooth scrolling by default.
 
-`set/unset softwrap'
-     Use soft wrapping by default.
+'set softwrap'
+     Enable soft line wrapping for easier viewing of very long lines.
 
-`set speller "spellprog"'
+'set speller "spellprog"'
      Use spelling checker "spellprog" instead of the built-in one, which
      calls "spell".
 
-`set/unset suspend'
-     Allow `nano' to be suspended.
+'set statuscolor FGCOLOR,BGCOLOR'
+     Specify the color combination to use for the statusbar.  See 'set
+     titlecolor' for more details.
 
-`set/unset suspendenable'
-     If `nano' is allowed to be suspended, allow the suspend key
-     (usually ^Z) to actually suspend it.
+'set suspend'
+     Allow 'nano' to be suspended.
 
-`set tabsize "n"'
-     Use a tab size of "n" columns.  The value of "n" must be greater
-     than 0.  The default value is 8.
+'set tabsize NUMBER'
+     Use a tab size of NUMBER columns.  The value of NUMBER must be
+     greater than 0.  The default value is 8.
 
-`set/unset tabstospaces'
+'set tabstospaces'
      Convert typed tabs to spaces.
 
-`set/unset tempfile'
+'set tempfile'
      Save automatically on exit, don't prompt.
 
-`set/unset undo'
-     Enable experimental generic-purpose undo code.
+'set titlecolor FGCOLOR,BGCOLOR'
+     Specify the color combination to use for the titlebar.  Valid color
+     names for foreground and background are: white, black, red, blue,
+     green, yellow, magenta, and cyan.  And either FGCOLOR or ,BGCOLOR
+     may be left out.
 
-`set/unset view'
+'set view'
      Disallow file modification.
 
-`set whitespace "string"'
-     Set the two characters used to display the first characters of
-     tabs and spaces.  They must be single-column characters.
+'set whitespace "STRING"'
+     Set the two characters used to indicate the presence of tabs and
+     spaces.  They must be single-column characters.  The default pair
+     for a UTF-8 locale is "»·", and for other locales ">.".
 
-`set/unset wordbounds'
+'set wordbounds'
      Detect word boundaries more accurately by treating punctuation
      characters as part of a word.
 
-`syntax "str" ["fileregex" ... ]'
+
+File: nano.info,  Node: Syntax Highlighting,  Next: Rebinding Keys,  Prev: Settings,  Up: Nanorc Files
+
+5.2 Syntax Highlighting
+=======================
+
+Coloring the different syntactic elements of a file is done via regular
+expressions (see the 'color' command below).  This is inherently
+imperfect, because regular expressions are not powerful enough to fully
+parse a file.  Nevertheless, regular expressions can do a lot and are
+easy to make, so they are a good fit for a small editor like 'nano'.
+
+   A separate syntax can be defined for each kind of file via the
+following commands in a nanorc file:
+
+'syntax "str" ["fileregex" ...]'
      Defines a syntax named "str" which can be activated via the
-     -Y/-syntax command line option, or will be automatically activated
+     -Y/-syntax command-line option, or will be automatically activated
      if the current filename matches the extended regular expression
      "fileregex".  All following "color" and "icolor" statements will
-     apply to "syntax" until a new syntax is defined.
-
-     The "none" syntax is reserved; specifying it on the command line
-     is the same as not having a syntax at all.  The "default" syntax
-     is special: it takes no "fileregex", and applies to files that
-     don't match any other syntax's "fileregex".
-
-`color fgcolor,bgcolor "regex" ...'
+     apply to this "str" syntax until a new syntax is defined.
+
+     The "none" syntax is reserved; specifying it on the command line is
+     the same as not having a syntax at all.  The "default" syntax is
+     special: it takes no "fileregex", and applies to files that don't
+     match any other syntax's "fileregex".
+
+'linter program [arg ...]'
+     For the currently defined syntax, use the given program to invoke
+     the linter (this overrides the speller function when defined).
+
+'formatter program [arg ...]'
+     For the currently defined syntax, use the given program to
+     automatically reformat text.  Useful in certain programming
+     languages (e.g.  go).
+
+'header "regex" ...'
+     For the currently defined syntax, add one or more regexes which
+     will be compared against the very first line of the file to be
+     edited, to determine whether this syntax should be used for that
+     file.
+
+'magic "regex" ...'
+     For the currently defined syntax, add one or more regexes which
+     will be compared against the result of querying the magic database
+     about the file to be edited, to determine whether this syntax
+     should be used for that file.  This functionality only works when
+     libmagic is installed on the system and will be silently ignored
+     otherwise.
+
+'color fgcolor,bgcolor "regex" ...'
      For the currently defined syntax, display all expressions matching
      the extended regular expression "regex" with foreground color
      "fgcolor" and background color "bgcolor", at least one of which
-     must be specified.  Legal colors for foreground and background
-     color are: white, black, red, blue, green, yellow, magenta, and
-     cyan.  You may use the prefix "bright" to force a stronger color
-     highlight for the foreground.  If your terminal supports
-     transparency, not specifying a "bgcolor" tells "nano" to attempt
-     to use a transparent background.
-
-`icolor fgcolor,bgcolor "regex" ...'
+     must be specified.  Valid colors for foreground and background are:
+     white, black, red, blue, green, yellow, magenta, and cyan.  You may
+     use the prefix "bright" to get a stronger color highlight for the
+     foreground.  If your terminal supports transparency, not specifying
+     a "bgcolor" tells 'nano' to attempt to use a transparent
+     background.
+
+'icolor fgcolor,bgcolor "regex" ...'
      Same as above, except that the expression matching is case
      insensitive.
 
-`color fgcolor,bgcolor start="sr" end="er"'
+'color fgcolor,bgcolor start="sr" end="er"'
      Display expressions which start with the extended regular
      expression "sr" and end with the extended regular expression "er"
      with foreground color "fgcolor" and background color "bgcolor", at
@@ -672,15 +862,378 @@ end.  For example, for the "brackets" option,
      instances of "sr" after an initial "sr" is found will be
      highlighted until the first instance of "er".
 
-`icolor fgcolor,bgcolor start="sr" end="er"'
+'icolor fgcolor,bgcolor start="sr" end="er"'
      Same as above, except that the expression matching is case
      insensitive.
 
-`include "syntaxfile"'
+'include "syntaxfile"'
      Read in self-contained color syntaxes from "syntaxfile".  Note that
-     "syntaxfile" can only contain "syntax", "color", and "icolor"
-     commands.
+     "syntaxfile" can only contain the above commands, from "syntax" to
+     "icolor".
+
+'extendsyntax str directive [arg ...]'
+     Extend the syntax previously defined as str to include new
+     information.  Allows you to add a new color, icolor, magic, header,
+     or linter directive to an already defined syntax.  Useful when you
+     want to add to definitions from the system-installed syntax
+     definitions (which are normally not writable).
+
+
+File: nano.info,  Node: Rebinding Keys,  Prev: Syntax Highlighting,  Up: Nanorc Files
+
+5.3 Rebinding Keys
+==================
+
+Key bindings may be reassigned via the following two commands in a
+nanorc file:
+
+'bind key function menu'
+     Rebinds 'key' to 'function' in the context of 'menu' (or in all
+     menus where the function exists by using 'all').
+
+'unbind key menu'
+     Unbinds 'key' from 'menu' (or from all menus where it exists by
+     using 'all').
+
+   The format of 'key' should be one of:
+
+'^'
+     followed by an alpha character or the word "Space".  Example: '^C'
+
+'M-'
+     followed by a printable character or the word "Space".  Example:
+     'M-C'
+
+'F'
+     followed by a numeric value from 1 to 16.  Example: 'F10'
+
+   Valid names for the 'function' to be bound are:
+
+'help'
+     Invokes the help viewer.
+
+'cancel'
+     Cancels the current command.
+
+'exit'
+     Exits from the program (or from the help viewer or the file
+     browser).
+
+'writeout'
+     Writes the current buffer to disk.
+
+'insert'
+     Inserts a file into the current buffer (or into a new buffer when
+     multibuffer is enabled).
+
+'whereis'
+     Searches for text in the current buffer - or for filenames matching
+     a string in the current list in the file browser
+
+'searchagain'
+     Repeats the last search command.
+
+'replace'
+     Interactively replaces text within the current buffer.
+
+'cut'
+     Cuts and stores the current line (or the marked region).
+
+'copytext'
+     Copies the current line (or the marked region) without deleting it.
+
+'uncut'
+     Copies the currently stored text into the current buffer at the
+     current cursor position.
+
+'mark'
+     Sets the mark at the current position, to start selecting text.
+
+'cutrestoffile'
+     Cuts all text from the cursor position till the end of the buffer.
+
+'curpos'
+     Shows the current cursor position: the line, column, and character
+     positions.
+
+'wordcount'
+     Counts the number of words, lines and characters in the current
+     buffer.
+
+'speller'
+     Invokes a spell-checking program (or a linting program, if the
+     current syntax highlighting defines one).
+
+'justify'
+     Justifies the current paragraph.
+
+'fulljustify'
+     Justifies the entire current buffer.
+
+'indent'
+     Indents (shifts to the right) the currently marked text.
+
+'unindent'
+     Unindents (shifts to the left) the currently marked text.
+
+'left'
+     Goes left one position (in the editor or browser).
+
+'right'
+     Goes right one position (in the editor or browser).
+
+'up'
+     Goes one line up (in the editor or browser).
+
+'down'
+     Goes one line down (in the editor or browser).
 
+'scrollup'
+     Scrolls up one line of text from the current position.
+
+'scrolldown'
+     Scrolls down one line of text from the current position.
+
+'nextword'
+     Moves the cursor to the beginning of the next word.
+
+'prevword'
+     Moves the cursor to the beginning of the previous word.
+
+'home'
+     Moves the cursor to the beginning of the current line.
+
+'end'
+     Moves the cursor to the end of the current line.
+
+'beginpara'
+     Moves the cursor to the beginning of the current paragraph.
+
+'endpara'
+     Moves the cursor to the end of the current paragraph.
+
+'prevpage'
+     Goes up one screenful.
+
+'nextpage'
+     Goes down one screenful.
+
+'firstline'
+     Goes to the first line of the file.
+
+'lastline'
+     Goes to the last line of the file.
+
+'gotoline'
+     Goes to a specific line (and column if specified).
+
+'gototext'
+     Switches from targeting a line number to searching for text.
+
+'findbracket'
+     Moves the cursor to the bracket (brace, parenthesis, etc.)  that
+     matches (pairs) with the one under the cursor.
+
+'prevbuf'
+     Switches to editing/viewing the previous buffer when using
+     multibuffer mode.
+
+'nextbuf'
+     Switches to editing/viewing the next buffer when using multibuffer
+     mode.
+
+'verbatim'
+     Inserts the next character verbatim into the file.
+
+'tab'
+     Inserts a tab at the current cursor location.
+
+'enter'
+     Inserts a new line below the current one.
+
+'delete'
+     Deletes the character under the cursor.
+
+'backspace'
+     Deletes the character before the cursor.
+
+'undo'
+     Undoes the last performed text action (add text, delete text, etc).
+
+'redo'
+     Redoes the last undone action (i.e., it undoes an undo).
+
+'refresh'
+     Refreshes the screen.
+
+'suspend'
+     Suspends the editor (if the suspending function is enabled, see the
+     "suspendenable" entry below).
+
+'casesens'
+     Toggles case sensitivity in searching (search/replace menus only).
+
+'regexp'
+     Toggles whether searching/replacing is based on literal strings or
+     regular expressions.
+
+'backwards'
+     Toggles whether searching/replacing goes forward or backward.
+
+'prevhistory'
+     Shows the previous history entry in the prompt menus (e.g.
+     search).
+
+'nexthistory'
+     Shows the next history entry in the prompt menus (e.g.  search).
+
+'flipreplace'
+     Toggles between searching for something and replacing something.
+
+'flipexecute'
+     Toggles between inserting a file and executing a command.
+
+'flipnewbuffer'
+     Toggles between inserting into the current buffer and into a new
+     empty buffer.
+
+'dosformat'
+     When writing a file, switches to writing a DOS format (CR/LF).
+
+'macformat'
+     When writing a file, switches to writing a Mac format.
+
+'append'
+     When writing a file, appends to the end instead of overwriting.
+
+'prepend'
+     When writing a file, 'prepends' (writes at the beginning) instead
+     of overwriting.
+
+'backup'
+     When writing a file, creates a backup of the current file.
+
+'tofiles'
+     Starts the file browser, allowing to select a file from a list.
+
+'gotodir'
+     Goes to a directory to be specified, allowing to browse anywhere in
+     the filesystem.
+
+'firstfile'
+     Goes to the first file when using the file browser (reading or
+     writing files).
+
+'lastfile'
+     Goes to the last file when using the file browser (reading or
+     writing files).
+
+'nohelp'
+     Toggles the presence of the two-line list of key bindings at the
+     bottom of the screen.
+
+'constupdate'
+     Toggles the constant display of the current line, column, and
+     character positions.
+
+'morespace'
+     Toggles the presence of the blank line which 'separates' the
+     titlebar from the file text.
+
+'smoothscroll'
+     Toggles smooth scrolling (when moving around with the arrow keys).
+
+'softwrap'
+     Toggles the displaying of overlong lines on multiple screen lines.
+
+'whitespacedisplay'
+     Toggles the showing of whitespace.
+
+'nosyntax'
+     Toggles syntax highlighting.
+
+'smarthome'
+     Toggles the smartness of the Home key.
+
+'autoindent'
+     Toggles whether new lines will contain the same amount of
+     whitespace as the preceding line.
+
+'cuttoend'
+     Toggles whether cutting text will cut the whole line or just from
+     the current cursor position to the end of the line.
+
+'nowrap'
+     Toggles whether long lines will be hard-wrapped to the next line.
+
+'tabstospaces'
+     Toggles whether typed tabs will be converted to spaces.
+
+'backupfile'
+     Toggles whether a backup will be made of the file to be edited.
+
+'multibuffer'
+     Toggles the use of multiple file buffers (if available).
+
+'mouse'
+     Toggles mouse support.
+
+'noconvert'
+     Toggles automatic conversion of files from DOS/Mac format.
+
+'suspendenable'
+     Toggles whether the suspend sequence (normally ^Z) will suspend the
+     editor window.
+
+   Valid names for 'menu' are:
+
+'main'
+     The main editor window where text is entered and edited.
+
+'search'
+     The search menu (AKA whereis).
+
+'replace'
+     The 'search to replace' menu.
+
+'replacewith'
+     The 'replace with' menu, which comes up after 'search to replace'.
+
+'gotoline'
+     The 'goto line (and column)' menu.
+
+'writeout'
+     The 'write file' menu.
+
+'insert'
+     The 'insert file' menu.
+
+'extcmd'
+     The menu for inserting output from an external command, reached
+     from the insert menu.
+
+'help'
+     The help-viewer menu.
+
+'spell'
+     The interactive spell checker Yes/no menu.
+
+'linter'
+     The linter menu.
+
+'browser'
+     The file browser for inserting or writing a file.
+
+'whereisfile'
+     The 'search for a file' menu in the file browser.
+
+'gotodir'
+     The 'go to directory' menu in the file browser.
+
+'all'
+     A special name that encompasses all menus.  For 'bind' it means all
+     menus where the specified 'function' exists; for 'unbind' it means
+     all menus where the specified 'key' exists.
 
 
 File: nano.info,  Node: The File Browser,  Next: Pico Compatibility,  Prev: Nanorc Files,  Up: Top
@@ -707,52 +1260,52 @@ File: nano.info,  Node: Pico Compatibility,  Next: Building and Configure Option
 7 Pico Compatibility
 ********************
 
-`nano' attempts to emulate Pico as closely as possible, but there are
+'nano' attempts to emulate Pico as closely as possible, but there are
 certain differences between the editors:
 
-`Search and Replace History'
-     As of version 1.1.99pre1 of `nano', text entered as search or
+'Search and Replace History'
+     As of version 1.1.99pre1 of 'nano', text entered as search or
      replace strings will be stored and can be accessed with the up/down
-     arrow keys.  Previously, `nano' offered a more consistent, but
+     arrow keys.  Previously, 'nano' offered a more consistent, but
      incompatible with Pico, method for entering search and replace
-     strings.  In the old method, previous entries would be displayed
-     by default as editable text in front of the cursor, as opposed to
+     strings.  In the old method, previous entries would be displayed by
+     default as editable text in front of the cursor, as opposed to
      being bracketed and uneditable as it is in Pico.  The old behavior
-     could be made compatible with Pico via the `-p' option, but recent
-     versions of Pico use the `-p' option to preserve the XON and XOFF
+     could be made compatible with Pico via the '-p' option, but recent
+     versions of Pico use the '-p' option to preserve the XON and XOFF
      sequences within the editor.  Since, with the new method, search
      and replace strings can still be edited by simply hitting the up
      arrow key once, the old method was removed completely.
 
-`Writing, Appending, or Prepending Selected Text to Files'
+'Writing, Appending, or Prepending Selected Text to Files'
      Text selected using the marking key (^^) can be written out,
-     appended, or prepended to a new or existing file using the
-     WriteOut key (^O).
+     appended, or prepended to a new or existing file using the WriteOut
+     key (^O).
 
-`Toggles'
+'Toggles'
      Many options which alter the functionality of the program can be
      "toggled" on or off using Meta key sequences, meaning the program
      does not have to be restarted to turn a particular feature of the
-     editor on or off.  Please see the internal help function (^G) for
-     a list of what functions can be toggled for a particular version
-     of `nano'.  See *Note Feature Toggles::, for more info.
-
-`Cursor Position Display'
-     The output of the "Display Cursor Position" in `nano' displays the
-     given column position, as well as the row and total character
-     position of the cursor.
-
-`Interactive Replace and Spell Checker'
-     It is worth noting that `nano''s replace function is interactive,
-     i.e. it does not stop after one search string is found and
-     automatically replace it.  The `nano' implementation will pause at
-     each search string found and query whether to replace this
-     instance or not.  The internal spell checker operates similarly.
-     Note that there is no way to force these functions to behave in
-     the Pico fashion.  As of version 1.1.99pre1, misspelled words are
-     sorted and trimmed for uniqueness in the internal spell checker
-     such that the words 'apple' and 'Apple' will be prompted for
-     correction separately.
+     editor on or off.  Please see the internal help function (^G) for a
+     list of what functions can be toggled for a particular version of
+     'nano'.  See *Note Feature Toggles::, for more info.
+
+'Cursor Position Display'
+     The output of the "Display Cursor Position" in 'nano' displays the
+     current line position of the cursor, as well as the column and
+     total character position.
+
+'Interactive Replace and Spell Checker'
+     It is worth noting that 'nano''s replace function is interactive,
+     i.e.  it does not stop after one search string was found and
+     automatically replaced.  The 'nano' implementation will pause at
+     each found search string and query whether to replace this instance
+     or not.  The internal spell checker operates similarly.  Note that
+     there is no way to force these functions to behave in the Pico
+     fashion.  As of version 1.1.99pre1, misspelled words are sorted and
+     trimmed for uniqueness in the internal spell checker such that the
+     words 'apple' and 'Apple' will be prompted for correction
+     separately.
 
 
 File: nano.info,  Node: Building and Configure Options,  Prev: Pico Compatibility,  Up: Top
@@ -760,125 +1313,146 @@ File: nano.info,  Node: Building and Configure Options,  Prev: Pico Compatibilit
 8 Building and Configure Options
 ********************************
 
-Building `nano' from source is fairly straightforward if you are
+Building 'nano' from source is fairly straightforward if you are
 familiar with compiling programs with autoconf support:
 
-   * tar xvfz nano-x.y.z.tar.gz (where x.y.z is the version of `nano')
-
+   * tar xvfz nano-x.y.z.tar.gz (where x.y.z is the version of 'nano')
    * cd nano-x.y.z/
-
    * ./configure
-
    * make
-
    * make install
 
-   The possible options to `./configure' are:
+   The possible options to './configure' are:
 
-`--disable-browser'
+'--disable-browser'
      Disable the mini file browser when reading or writing files.
 
-`--disable-help'
+'--disable-color'
+     Disable support for the syntax coloring of files.  This also
+     eliminates the -Y command-line option, which chooses a specific
+     syntax.
+
+'--disable-extra'
+     Disable extra features.  At the moment, this is just
+     easter-egg-type stuff.
+
+'--disable-help'
      Disable the help function.  Doing this makes the binary much
      smaller, but makes it difficult for new users to learn more than
      very basic things about using the editor.
 
-`--disable-justify'
-     Disable the justify and unjustify functions.
-
-`--disable-mouse'
-     Disable all mouse functionality.  This also disables the -m
-     command line option, which enables the mouse functionality.
+'--disable-histories'
+     Disable the code for the handling of the history files: the search
+     and replace strings that were used, and the cursor position at
+     which each file was closed.  This also eliminates the -H and -P
+     command-line options, which switch on the logging of search/replace
+     strings and cursor positions.
 
-`--disable-operatingdir'
-     Disable setting the operating directory.  This also disables the -o
-     command line option, which sets the operating directory.
+'--disable-justify'
+     Disable the justify and unjustify functions.
 
-`--disable-speller'
-     Disable use of the spell checker.  This also disables the -s
-     command line option, which allows specifying an alternate spell
+'--disable-libmagic'
+     Disable the use of the library of magic-number tests (for
+     determining the file type and thus which syntax to use for
+     colouring - often the tests on filename extension and header line
+     will be enough).
+
+'--disable-mouse'
+     Disable all mouse functionality.  This also eliminates the -m
+     command-line option, which enables the mouse functionality.
+
+'--disable-multibuffer'
+     Disable support for opening multiple files at a time and switching
+     between them on the fly.  This also eliminates the -F command-line
+     option, which switches the use of multiple file buffers on.
+
+'--disable-nanorc'
+     Disable support for reading the nanorc files at startup.  With such
+     support, you can store custom settings in a system-wide and a
+     per-user nanorc file rather than having to pass command-line
+     options to get the desired behavior.  See *Note Nanorc Files::, for
+     more info.  Disabling this also eliminates the -I and -q
+     command-line options; the first inhibits the reading of
+     nanorcfiles, and the second suppresses warnings about errors in
+     those files.
+
+'--disable-operatingdir'
+     Disable setting the operating directory.  This also eliminates the
+     -o command-line option, which sets the operating directory.
+
+'--disable-speller'
+     Disable use of the spell checker.  This also eliminates the -s
+     command-line option, which allows specifying an alternate spell
      checker.
 
-`--disable-tabcomp'
+'--disable-tabcomp'
      Disable the tab completion code when reading or writing files.
 
-`--disable-wrapping'
-     Disable all long line wrapping.  This also eliminates the -w
-     command line option, which enables long line wrapping.
+'--disable-wrapping'
+     Disable hard-wrapping of overlong lines.  This also eliminates the
+     -w command-line option, which enables long-line wrapping.
 
-`--enable-tiny'
+'--enable-tiny'
      This option disables all the above.  It also disables some of the
-     larger internals of the editor, like the marking code and the cut
-     to end of line code.  It also disables the function toggles.
+     larger internals of the editor, like the marking code and the
+     cut-to-end-of-line code.  It also disables the function toggles.
+     By using the enabling counterpart of the above options together
+     with -enable-tiny, specific features can be switched back on.
 
-`--enable-debug'
+'--enable-debug'
      Enable support for runtime debug output.  This can get pretty
-     messy, so chances are you only want this feature to work on the
-     nano source.
-
-`--enable-extra'
-     Enable extra features.  At the moment, this is just easter egg-type
-     stuff.
+     messy, so chances are you only want this feature when you're
+     working on the nano source.
 
-`--enable-color'
-     Enable support for syntax coloring of files using the nanorc file.
-     This enables nanorc support as well.
+'--disable-nls'
+     Disables Native Language support.  This will disable the use of any
+     available GNU 'nano' translations.
 
-`--enable-multibuffer'
-     Enable support for opening multiple files at a time and switching
-     between them on the fly.
+'--disable-wrapping-as-root'
+     Disable hard-wrapping of overlong lines by default when 'nano' is
+     run as root.
 
-`--enable-nanorc'
-     Enable support for reading the nanorc file at startup.  You can
-     store custom settings in the nanorc file rather than having to
-     pass command line options to get desired behavior.  See *Note
-     Nanorc Files::, for more info.
-
-`--enable-all'
-     Shortcut for enabling the above four features (extra, color,
-     multibuffer, and nanorc).
-
-`--disable-nls'
-     Disables Native Language support.  This will disable use of the
-     available GNU `nano' translations.
-
-`--disable-wrapping-as-root'
-     Disable long line wrapping by default when nano is run as root.
-
-`--enable-utf8'
+'--enable-utf8'
      Enable support for reading and writing Unicode files.  This will
-     require either a wide version of curses, or a UTF-8-enabled
-     version of Slang.
-
-`--disable-utf8'
-     Disable support for reading and writing Unicode files.
+     require either a wide version of curses, or a UTF-8-enabled version
+     of Slang.
 
-`--with-slang'
-     Compiling `nano' with Slang is supported, and will make the binary
-     notably smaller than if compiled with ncurses or other curses
-     libraries.
+'--disable-utf8'
+     Disable support for reading and writing Unicode files.  Normally
+     the configure script auto-detects whether to enable UTF-8 support
+     or not.  You can use this or the previous option to override that
+     detection.
 
+'--with-slang'
+     Compile 'nano' against Slang instead of against ncurses or other
+     curses libraries.
 
 
 
 Tag Table:
-Node: Top200
-Node: Introduction527
-Node: Overview966
-Node: Command Line Options1871
-Ref: Expert Mode7858
-Node: Editor Basics8745
-Node: Entering Text8994
-Node: Special Functions9342
-Node: The Titlebar10346
-Node: The Statusbar11071
-Node: Shortcut Lists11643
-Node: Using the Mouse11923
-Node: Online Help12383
-Node: Feature Toggles12760
-Node: Nanorc Files14867
-Node: The File Browser23472
-Node: Pico Compatibility24294
-Node: Building and Configure Options26950
+Node: Top199
+Node: Introduction550
+Node: Overview990
+Node: Command Line Options1874
+Ref: Expert Mode8793
+Node: Editor Basics9758
+Node: Entering Text10038
+Node: Special Functions10364
+Node: The Cutbuffer11404
+Node: The Mark12091
+Node: The Titlebar12828
+Node: The Statusbar13544
+Node: Shortcut Lists14117
+Node: Using the Mouse14397
+Node: Online Help14990
+Node: Feature Toggles15366
+Node: Nanorc Files17428
+Node: Settings18859
+Ref: Whitespace25479
+Node: Syntax Highlighting25831
+Node: Rebinding Keys29957
+Node: The File Browser38444
+Node: Pico Compatibility39266
+Node: Building and Configure Options41926
 
 End Tag Table
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index fe12428..b77feb1 100644
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -7,9 +7,9 @@
 @c This file has the new style title page commands.
 @c Run 'makeinfo' rather than 'texinfo-format-buffer'.
 @smallbook
-@set EDITION 0.1
-@set VERSION 2.2.0
-@set UPDATED 30 Nov 2009
+@set EDITION 0.3
+@set VERSION 2.4.0
+@set UPDATED March 2015
 
 @dircategory Editors
 @direntry
@@ -23,7 +23,7 @@
 @titlepage
 @title GNU @code{nano}
 @subtitle a small and friendly text editor.
-@subtitle version 2.2.0
+@subtitle version 2.4.0
 
 @author Chris Allegretta
 @page
@@ -32,9 +32,9 @@ This manual documents GNU @code{nano}, a small and friendly text
 editor.
 
 This manual is part of the GNU @code{nano} distribution.@*
-@sp4
+@sp 4
 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-2008, 2009 Free Software Foundation, Inc.
+2009, 2014, 2015 Free Software Foundation, Inc.
 
 This document is dual-licensed.  You may distribute and/or modify it
 under the terms of either of the following licenses:
@@ -54,7 +54,9 @@ You may contact the author by
 e-mail: @email{chrisa@@asty.org}@*
 @end titlepage
 
-@node Top, Introduction, (dir), (dir)
+
+@node Top
+@top
 
 This manual documents GNU @code{nano}, a small and friendly text
 editor.
@@ -70,12 +72,13 @@ editor.
 * Building and Configure Options::
 @end menu
 
-@node Introduction, Editor Basics, Top, Top
+
+@node Introduction
 @chapter Introduction
 
 GNU @code{nano} is a small and friendly text editor.  Besides basic text
-editing, @code{nano} offers many extra features like an interactive
-search and replace, go to line and column number, auto-indentation,
+editing, @code{nano} offers many extra features, like an interactive
+search-and-replace, go-to-line-and-column-number, auto-indentation,
 feature toggles, internationalization support, and filename tab
 completion.
 
@@ -84,7 +87,7 @@ completion.
 * Command Line Options::
 @end menu
 
-@node Overview, Command Line Options, Introduction, Introduction
+@node Overview
 @section Overview
 
 The original goal for @code{nano} was a complete bug-for-bug compatible
@@ -113,245 +116,334 @@ adding it with a comma.  So the complete synopsis is:
 
 Email bug reports to @email{nano@@nano-editor.org}.
 
-@node Command Line Options, , Overview, Introduction
+@node Command Line Options
 @section Command Line Options
 
-@code{nano} takes the following options from the command line:
+@command{nano} takes the following options from the command line:
 
-@table @code
-@item +LINE,COLUMN
-Start at line number LINE and column number COLUMN (at least one of
+@table @option
+@item +@var{line},@var{column}
+Start at line number @var{line} and column number @var{column} (at least one of
 which must be specified) instead of the default of line 1, column 1.
 
-@item -?
-Same as @code{-h, --help}.
-
-@item -A, --smarthome
+@item -A
+@itemx --smarthome
 Make the Home key smarter.  When Home is pressed anywhere but at the
 very beginning of non-whitespace characters on a line, the cursor will
 jump to that beginning (either forwards or backwards).  If the cursor is
 already at that position, it will jump to the true beginning of the
 line.
 
-@item -B, --backup
+@item -B
+@itemx --backup
 When saving a file, back up the previous version of it to the current
-filename suffixed with a ~.
+filename suffixed with a @samp{~}.
 
-@item -C <dir>, --backupdir=<dir>
-Set the directory where @code{nano} puts unique backup files if file
+@item -C @var{directory}
+@itemx --backupdir=@var{directory}
+Set the directory where @command{nano} puts unique backup files if file
 backups are enabled.
 
-@item -D, --boldtext
+@item -D
+@itemx --boldtext
 Use bold text instead of reverse video text.
 
-@item -E, --tabstospaces
+@item -E
+@itemx --tabstospaces
 Convert typed tabs to spaces.
 
-@item -F, --multibuffer
-Enable multiple file buffers, if available.
+@item -F
+@itemx --multibuffer
+Enable multiple file buffers (if support for them has been compiled in).
+
+@item -G
+@itemx --locking
+Enable vim-style file locking when editing files.
 
-@item -H, --historylog
-Log search and replace strings to ~/.nano_history, so they can be
-retrieved in later sessions, if nanorc support is available.
+@item -H
+@itemx --historylog
+Log search and replace strings to @file{~/.nano/search_history},
+so they can be retrieved in later sessions.
 
-@item -I, --ignorercfiles
-Don't look at SYSCONFDIR/nanorc or ~/.nanorc, if nanorc support is
-available.
+@item -I
+@itemx --ignorercfiles
+Don't look at the system's nanorc file nor at the user's @file{~/.nanorc}.
 
-@item -K, --rebindkeypad
+@item -K
+@itemx --rebindkeypad
 Interpret the numeric keypad keys so that they all work properly.  You
 should only need to use this option if they don't, as mouse support
 won't work properly with this option enabled.
 
-@item -L, --nonewlines
+@item -L
+@itemx --nonewlines
 Don't add newlines to the ends of files.
 
-@item -N, --noconvert
-Don't convert files from DOS/Mac format.
+@item -N
+@itemx --noconvert
+Disable automatic conversion of files from DOS/Mac format.
 
-@item -O, --morespace
+@item -O
+@itemx --morespace
 Use the blank line below the titlebar as extra editing space.
 
-@item -Q <str>, --quotestr=<str>
+@item -P
+@itemx --poslog
+Log for each file the last location of the cursor, and read it
+back upon reopening the file and place it there again.
+
+@item -Q "@var{characters}"
+@itemx --quotestr="@var{characters}"
 Set the quoting string for justifying.  The default value is
 
 @quotation
-@code{^([ \t]*[|>:@}#])+}
+"^([ \t]*[|>:@}#])+"
 @end quotation
 
-if extended regular expression support is available, or "> " otherwise.
+if extended regular expression support is available, or @code{> } otherwise.
 Note that @code{\t} above stands for a literal Tab character.
 
-@item -R, --restricted
+@item -R
+@itemx --restricted
 Restricted mode: don't read or write to any file not specified on the
-command line; read any nanorc files; allow suspending; allow a file to
-be appended to, prepended to, or saved under a different name if it
-already has one; or use backup files or spell checking.  Also accessible
-by invoking @code{nano} with any name beginning with 'r' (e.g. "rnano").
-
-@item -S, --smooth
+command line; don't read any nanorc files nor history files; don't allow
+suspending nor spell checking; don't
+allow a file to be appended to, prepended to, or saved under a different
+name if it already has one; and don't use backup files.
+This restricted mode is also accessible by invoking @command{nano} with
+any name beginning with @samp{r} (e.g. @command{rnano}).
+
+@item -S
+@itemx --smooth
 Enable smooth scrolling.  Text will scroll line-by-line, instead of the
 usual chunk-by-chunk behavior.
 
-@item -T <#cols>, --tabsize=<#cols>
-Set the displayed tab length to #cols columns.  The value of #cols must
-be greater than 0.  The default value is 8.
+@item -T @var{number}
+@itemx --tabsize=@var{number}
+Set the displayed tab length to @var{number} columns.  The value of
+@var{number} must be greater than 0.  The default value is @samp{8}.
 
-@item -U, --quickblank
+@item -U
+@itemx --quickblank
 Do quick statusbar blanking.  Statusbar messages will disappear after 1
-keystroke instead of 25.  Note that -c overrides this.
+keystroke instead of 25.  Note that @option{-c} overrides this.
 
-@item -V, --version
+@item -V
+@itemx --version
 Show the current version number and exit.
 
-@item -W, --wordbounds
+@item -W
+@itemx --wordbounds
 Detect word boundaries more accurately by treating punctuation
 characters as parts of words.
 
-@item -Y <str>, --syntax=<str>
-Specify a specific syntax highlighting from the nanorc to use, if
-available.  See @xref{Nanorc Files}, for more info.
+@item -Y @var{name}
+@itemx --syntax=@var{name}
+Specify a specific syntax from the nanorc files to use for highlighting.
+See @xref{Syntax Highlighting}, for more info.
 
-@item -c, --const
+@item -c
+@itemx --const
 Constantly display the cursor position and line number on the statusbar.
-Note that this overrides -U.
+Note that this overrides @option{-U}.
 
-@item -d, --rebinddelete
+@item -d
+@itemx --rebinddelete
 Interpret the Delete key differently so that both Backspace and Delete
 work properly.  You should only need to use this option if Backspace
 acts like Delete on your system.
 
-@item -h, --help
-Show a summary of command line options and exit.
+@item -h
+@itemx --help
+Show a summary of command-line options and exit.
 
-@item -i, --autoindent
+@item -i
+@itemx --autoindent
 Automatically indent new lines to the same number of spaces and tabs as
 the previous line.
 
-@item -k, --cut
-Cut from the current cursor position to the end of the current line.
+@item -k
+@itemx --cut
+Make the 'Cut Text' command (normally ^K) cut from the current cursor
+position to the end of the line, instead of cutting the entire line.
 
-@item -l, --nofollow
+@item -l
+@itemx --nofollow
 When writing files, if the given file is a symbolic link, it is removed
 and a new file is created.
 
-@item -m, --mouse
+@item -m
+@itemx --mouse
 Enable mouse support, if available for your system.  When enabled, mouse
 clicks can be used to place the cursor, set the mark (with a double
 click), and execute shortcuts.  The mouse will work in the X Window
-System, and on the console when gpm is running.
-
-@item -o <dir>, --operatingdir=<dir>
-Set operating directory.  Makes @code{nano} set up something similar to
-a chroot.
-
-@item -p, --preserve
+System, and on the console when gpm is running.  Text can still be
+selected through dragging by holding down the Shift key.
+
+@item -n
+@itemx --noread
+Treat any name given on the command line as a new file.  This allows
+@command{nano} to write to named pipes: it will start with a blank buffer,
+and will write to the pipe when the user saves the "file".  This way
+@command{nano} can be used as an editor in combination with for instance
+@command{gpg} without having to write sensitive data to disk first.
+
+@item -o @var{directory}
+@itemx --operatingdir=@var{directory}
+Set the operating directory.  This makes @command{nano} set up something
+similar to a chroot.
+
+@item -p
+@itemx --preserve
 Preserve the ^Q (XON) and ^S (XOFF) sequences so data being sent to the
-editor can be can be stopped and started.
+editor can be stopped and started.
 
-@item -q, --quiet
-Do not report errors in the nanorc file and ask them to be acknowledged
+@item -q
+@itemx --quiet
+Do not report errors in the nanorc file nor ask them to be acknowledged
 by pressing Enter at startup.
 
-@item -r <#cols>, --fill=<#cols>
-Wrap lines at column #cols.  If this value is 0 or less, wrapping will
-occur at the width of the screen less #cols, allowing it to vary along
-with the width of the screen if the screen is resized.  The default
-value is -8.
-
-@item -s <prog>, --speller=<prog>
-Invoke the given program as the spell checker.  By default, @code{nano}
-uses the command specified in the SPELL environment variable, or, if
-SPELL is not set, its own interactive spell checker that requires the
-@code{spell} program to be installed on your system.
-
-@item -t, --tempfile
+@item -r @var{number}
+@itemx --fill=@var{number}
+Hard-wrap lines at column @var{number} (by inserting a newline character).
+If the given value is 0 or less, wrapping will occur at the width of
+the screen minus the given amount, allowing the wrapping width to
+vary along with the width of the screen if and when it is resized.
+The default value is @samp{-8}.  This option conflicts with @option{-w}
+-- the last one given takes effect.
+
+@item -s @var{program}
+@itemx --speller=@var{program}
+Invoke the given program as the spell checker.  By default, @command{nano}
+uses the command specified in the @env{SPELL} environment variable, or,
+if @env{SPELL} is not set, its own interactive spell checker that requires
+the @command{spell} program to be installed on your system.
+
+@item -t
+@itemx --tempfile
 Don't ask whether or not to save the current contents of the file when
-exiting, assume yes.  This is most useful when using @code{nano} as the
+exiting, assume yes.  This is most useful when using @command{nano} as the
 composer of a mailer program.
 
-@item -u, --undo
-Enable experimental generic-purpose undo code.  By default, the undo and
-redo shortcuts are Meta-U and Meta-E, respectively.
-
-@item -v, --view
+@item -v
+@itemx --view
 Don't allow the contents of the file to be altered.  Note that this
 option should NOT be used in place of correct file permissions to
 implement a read-only file.
 
-@item -w, --nowrap
-Don't wrap long lines at any length.  This option overrides any value
-for -r.
+@item -w
+@itemx --nowrap
+Don't hard-wrap long lines at any length.  This option conflicts with
+@option{-r} -- the last one given takes effect.
 
 @anchor{Expert Mode}
-@item -x, --nohelp
+@item -x
+@itemx --nohelp
 Expert Mode: don't show the Shortcut Lists at the bottom of the screen.
 This affects the location of the statusbar as well, as in Expert Mode it
 is located at the very bottom of the editor.
 
 Note: When accessing the help system, Expert Mode is temporarily
-disabled to display the help system navigation keys.
+disabled to display the help-system navigation keys.
 
-@item -z, --suspend
-Enable @code{nano}'s suspend ability using the system's suspend
+@item -z
+@itemx --suspend
+Enable the ability to suspend @command{nano} using the system's suspend
 keystroke (usually ^Z).
 
-@item -$, --softwrap
-Enable 'soft wrapping'.  @code{nano} will attempt to display the entire
-contents of a line, even if it is longer than the screen width.  Since
-'$' normally refers to a variable in the Unix shell, you should specify
-this option last when using other options (e.g. 'nano -wS$') or pass it
-separately (e.g. 'nano -wS -$').
-
-@item -a, -b, -e, -f, -g, -j
+@item -$
+@itemx --softwrap
+Enable 'soft wrapping'.  This will make @command{nano} attempt to display the
+entire contents of any line, even if it is longer than the screen width, by
+continuing it over multiple screen lines.  Since
+@samp{$} normally refers to a variable in the Unix shell, you should specify
+this option last when using other options (e.g. @code{nano -wS$}) or pass it
+separately (e.g. @code{nano -wS -$}).
+
+@item -a
+@itemx -b
+@itemx -e
+@itemx -f
+@itemx -g
+@itemx -j
 Ignored, for compatibility with Pico.
 @end table
 
 
-@node Editor Basics, Online Help, Introduction, Top
+@node Editor Basics
 @chapter Editor Basics
+
 @menu
 * Entering Text::
 * Special Functions::
+* The Cutbuffer::
+* The Mark::
 * The Titlebar::
 * The Statusbar::
 * Shortcut Lists::
 * Using the Mouse::
 @end menu
 
-@node Entering Text, Special Functions, Editor Basics, Editor Basics
+@node Entering Text
 @section Entering Text
 
+@code{nano} is a "modeless" editor.  All keystrokes, with the exception
+of Control and Meta key sequences, enter text into the file being edited.
 All key sequences in @code{nano} are entered using the keyboard.
-@code{nano} is a "modeless" editor.  All keys, with the exception of
-Control and Meta key sequences, will enter text into the file being
-edited.
 
-@node Special Functions, The Titlebar, Entering Text, Editor Basics
+@node Special Functions
 @section Special Functions
 
-Special functions use the Control (Ctrl) key, displayed in the help and
-shortcut lists as ^; the Meta key, displayed as M; or the Escape (Esc)
-key.
+Special functions use the Control key (Ctrl), displayed in the help and
+shortcut lists as ^; the Meta key (Alt or Cmd), displayed as M-; or the
+Escape key (Esc).
 
 @itemize @bullet
 @item
 Control key sequences are entered by holding down the Ctrl key and
-pressing the desired key, or by pressing the Esc key twice and pressing
-the desired key.
+pressing the desired key, or by pressing the Esc key twice and then
+pressing the desired key.
 @item
-Pressing Esc twice and then typing a three-digit number from 000 to 255
-will enter the character with the corresponding value.
+Pressing the Esc key twice and then typing a three-digit number from
+000 to 255 will enter the character with the corresponding value.
 @item
 Meta key sequences are entered by holding down the Meta key (normally
 the Alt key) and pressing the desired key, or by pressing the Esc key
-once and pressing the desired key.  Certain operating systems "swallow"
+once and then pressing the desired key.  Certain operating systems "swallow"
 the Alt key so that it never reaches the application; if your operating
 system does this, you should use the Esc key to generate Meta key
 sequences.
 @end itemize
 
-@node The Titlebar, The Statusbar, Special Functions, Editor Basics
+@node The Cutbuffer
+@section The Cutbuffer
+
+Text can be cut from a file, a whole line at a time, by using the 'Cut Text'
+command (default key binding: ^K).  The cut line is stored in the cutbuffer.
+Consecutive strokes of ^K will add each cut line to this buffer, but a ^K
+after any other keystroke will overwrite the entire cutbuffer.
+
+The contents of the cutbuffer can be pasted back into the file with the
+'Uncut Text' command (default key binding: ^U).
+
+A line of text can be copied into the cutbuffer (without cutting it) with
+the 'Copy Text' command (default key binding: M-6).
+
+@node The Mark
+@section The Mark
+
+Text can be selected by first 'setting the Mark' (default key bindings:
+^6 and M-A) and then moving the cursor to the other end of the portion
+to be selected.  The selected portion of text will be highlighted in
+reverse video (or in bold if you set the boldtext option).
+This selection can now be cut or copied in its entirety with a single
+^K or M-6.  Or the selection can be used to limit the scope of a
+search-and-replace (^\) or spell-checking session (^T).
+
+Cutting or copying selected text will toggle the mark off automatically.
+If necessary, it can be toggled off manually with another ^6 or M-A.
+
+@node The Titlebar
 @section The Titlebar
 
 The titlebar is the line displayed at the top of the editor.  There are
@@ -365,7 +457,7 @@ Special modes: When @code{nano} is in "File browser" mode, the center
 section will display the current directory instead of the filename.  See
 @xref{The File Browser}, for more info.
 
-@node The Statusbar, Shortcut Lists, The Titlebar, Editor Basics
+@node The Statusbar
 @section The Statusbar
 
 The statusbar is the third line from the bottom of the screen, or the
@@ -375,38 +467,40 @@ occur from using the editor will appear on the statusbar.  Any questions
 that are asked of the user will be asked on the statusbar, and any user
 input (search strings, filenames, etc.) will be input on the statusbar.
 
-@node Shortcut Lists, Using the Mouse, The Statusbar, Editor Basics
+@node Shortcut Lists
 @section Shortcut Lists
 
 The Shortcut Lists are the two lines at the bottom of the screen which
 show some of the more commonly used functions in the editor.
 
-@node Using the Mouse, , Shortcut Lists, Editor Basics
+@node Using the Mouse
 @section Using the Mouse
 
 When mouse support has been configured and enabled, a single mouse click
 places the cursor at the indicated position.  Clicking a second time in
 the same position toggles the mark.  Clicking in the shortcut list
-executes the selected shortcut.
+executes the selected shortcut.  To be able to select text with the
+left button, or paste text with the middle button, hold down the
+Shift key during those actions.
 
 The mouse will work in the X Window System, and on the console when gpm
 is running.
 
 
-@node Online Help, Feature Toggles, Editor Basics, Top
+@node Online Help
 @chapter Online Help
 
 The online help system in @code{nano} is available by pressing ^G.
-It is fairly self explanatory, documenting the various parts of the
+It is fairly self-explanatory, documenting the various parts of the
 editor and available keystrokes.  Navigation is via the ^Y (Page Up)
 and ^V (Page Down) keys.  ^X exits the help system.
 
 
-@node Feature Toggles, Nanorc Files, Online Help, Top
+@node Feature Toggles
 @chapter Feature Toggles
 
 Toggles allow you to change certain aspects of the editor that would
-normally be done via command line options.  They are invoked via Meta
+normally be done via command-line options.  They are invoked via Meta
 key sequences.  See @xref{Special Functions}, for more info.  The
 following global toggles are available:
 
@@ -443,8 +537,8 @@ toggles the -N (@code{--noconvert}) command line option.
 toggles the -O (@code{--morespace}) command line option.
 
 @item Whitespace Display Toggle (Meta-P)
-toggles whitespace display mode if you have a "whitespace" option in
-your nanorc.  See @xref{Nanorc Files}, for more info.
+toggles whitespace-display mode.
+See @xref{Whitespace}, for more info.
 
 @item Tabs to Spaces Toggle (Meta-Q)
 toggles the -E (@code{--tabstospaces}) command line option.
@@ -457,7 +551,7 @@ toggles the -x (@code{--nohelp}) command line option.
 
 @item Color Syntax Highlighting Toggle (Meta-Y)
 toggles color syntax highlighting if you have color syntaxes in your
-nanorc.  See @xref{Nanorc Files}, for more info.
+nanorc.  See @xref{Syntax Highlighting}, for more info.
 
 @item Suspend Toggle (Meta-Z)
 toggles the -z (@code{--suspend}) command line option.
@@ -468,116 +562,145 @@ toggles the -$ (@code{--softwrap}) command line option.
 @end table
 
 
-@node Nanorc Files, The File Browser, Feature Toggles, Top
+@node Nanorc Files
 @chapter Nanorc Files
 
 The nanorc files contain the default settings for @code{nano}.  They
-should not be in DOS or Mac format.  During startup, @code{nano} will
-first read its system-wide settings from SYSCONFDIR/nanorc, and then
-user-specific settings from ~/.nanorc.
+should be in Unix format, not in DOS or Mac format.  During startup,
+@code{nano} will first read the system-wide settings, from /etc/nanorc
+(the exact path might be different), and then the user-specific settings,
+from ~/.nanorc.
 
 A nanorc file accepts a series of "set" and "unset" commands, which can
-be used to configure @code{nano} on startup without using the command
-line options.  Additionally, the "syntax", "color", and "icolor"
-keywords are used to define syntax highlighting rules for different text
-patterns.  @code{nano} will read one command per line.
+be used to configure @code{nano} on startup without using command-line
+options.  Additionally, there are some commands to define syntax highlighting
+and to rebind keys -- @xref{Syntax Highlighting}, and @xref{Rebinding Keys}.
+@code{nano} will read one command per line.
 
 Options in nanorc files take precedence over @code{nano}'s defaults, and
-command line options override nanorc settings.  Options are also unset
-by default, except for those that take arguments.
+command-line options override nanorc settings.  Also, options that do not
+take an argument are unset by default.  So using the @code{unset} command
+is only needed when wanting to override a setting of the system's nanorc
+file in your own @file{~/.nanorc}.  Options that take an argument cannot
+be unset.
 
 Quotes inside string parameters don't have to be escaped with
 backslashes.  The last double quote in the string will be treated as its
-end.  For example, for the "brackets" option,
+end.  For example, for the "brackets" option, @code{""')>]@}"} will match
+@code{"}, @code{'}, @code{)}, @code{>}, @code{]}, and @code{@}}.
 
-@quotation
-@code{""')>]@}"}
-@end quotation
+@menu
+* Settings::
+* Syntax Highlighting::
+* Rebinding Keys::
+@end menu
 
-will match @code{"}, @code{'}, @code{)}, @code{>}, @code{]}, and
-@code{@}}.
+@node Settings
+@section Settings
 
-The supported commands and arguments are:
+The supported settings in a nanorc file are:
 
 @table @code
 
-@item set/unset autoindent
+@item set allow_insecure_backup
+When backing up files, allow the backup to succeed even if its
+permissions can't be (re)set due to special OS considerations.
+You should NOT enable this option unless you are sure you need it.
+
+@item set autoindent
 Use auto-indentation.
 
-@item set/unset backup
-Create backup files in "filename~".
+@item set backup
+When saving a file, back up the previous version of it to the current
+filename suffixed with a tilde (@code{~}).
 
 @item set backupdir "directory"
-Set the directory where @code{nano} puts unique backup files if file
+Set the directory where @code{nano} puts unique backup files, if file
 backups are enabled.
 
-@item set/unset backwards
+@item set backwards
 Do backwards searches by default.
 
-@item set/unset boldtext
-Use bold text instead of reverse video text.
+@item set boldtext
+Use bold instead of reverse video for the titlebar, statusbar, key combos,
+and selected text.  This can be overridden for the first three by setting
+the options "titlecolor", "statuscolor", and "keycolor".
 
-@item set brackets "string"
+@item set brackets "@var{string}"
 Set the characters treated as closing brackets when justifying
-paragraphs.  They cannot contain blank characters.  Only closing
-punctuation, optionally followed by closing brackets, can end sentences.
-The default value is
+paragraphs.  This may not include blank characters.  Only closing
+punctuation (see "punct"), optionally followed by the specified
+closing brackets, can end sentences.  The default value is
 
 @quotation
-@code{""')>]@}"}
+""')>]@}"
 @end quotation
 
-@item set/unset casesensitive
-Do case sensitive searches by default.
+@item set casesensitive
+Do case-sensitive searches by default.
 
-@item set/unset const
+@item set const
 Constantly display the cursor position in the status bar.
 
-@item set/unset cut
-Use cut to end of line by default, instead of cutting the whole line.
+@item set cut
+Use cut-to-end-of-line by default, instead of cutting the whole line.
 
-@item set fill "n"
-Wrap lines at column number "n".  If "n" is 0 or less, the maximum line
-length will be the screen width less "n" columns.  The default value is
--8.
+@item set fill @var{number}
+Hard-wrap lines at column number @var{number}.  If @var{number} is 0 or less,
+the maximum line length will be the screen width less @var{number} columns.
+The default value is -8.
 
-@item set/unset historylog
-Enable ~/.nano_history for saving and reading search/replace strings.
+@item set functioncolor @var{fgcolor},@var{bgcolor}
+Specify the color combination to use for the function descriptions
+in the two help lines at the bottom of the screen.
+See @code{set titlecolor} for more details.
 
-@item set matchbrackets "string"
+@item set historylog
+Enable the use of @file{~/.nano/search_history} for saving and reading
+search/replace strings.
+
+@item set keycolor @var{fgcolor},@var{bgcolor}
+Specify the color combination to use for the shortcut key combos
+in the two help lines at the bottom of the screen.
+See @code{set titlecolor} for more details.
+
+@item set locking
+Enable vim-style lock-files for when editing files.
+
+@item set matchbrackets "@var{string}"
 Set the opening and closing brackets that can be found by bracket
-searches.  They cannot contain blank characters.  The former set must
-come before the latter set, and both must be in the same order.  The
-default value is
+searches.  This may not include blank characters.  The opening set must
+come before the closing set, and the two sets must be in the same order.
+The default value is
 
 @quotation
-@code{"(<[@{)>]@}"}
+"(<[@{)>]@}"
 @end quotation
 
-@item set/unset morespace
+@item set morespace
 Use the blank line below the titlebar as extra editing space.
 
-@item set/unset mouse
+@item set mouse
 Enable mouse support, so that mouse clicks can be used to place the
 cursor, set the mark (with a double click), or execute shortcuts.
 
-@item set/unset multibuffer
+@item set multibuffer
 Allow inserting files into their own buffers.
 
-@item set/unset noconvert
+@item set noconvert
 Don't convert files from DOS/Mac format.
 
-@item set/unset nofollow
+@item set nofollow
 Don't follow symlinks when writing files.
 
-@item set/unset nohelp
+@item set nohelp
 Don't display the help lists at the bottom of the screen.
 
-@item set/unset nonewlines
+@item set nonewlines
 Don't add newlines to the ends of files.
 
-@item set/unset nowrap
-Don't wrap text at all.
+@item set nowrap
+Don't hard-wrap text at all.
 
 @item set operatingdir "directory"
 @code{nano} will only read and write files inside "directory" and its
@@ -585,112 +708,162 @@ subdirectories.  Also, the current directory is changed to here, so
 files are inserted from this directory.  By default, the operating
 directory feature is turned off.
 
-@item set/unset preserve
+@item set poslog
+Save the cursor position of files between editing sessions.
+
+@item set preserve
 Preserve the XON and XOFF keys (^Q and ^S).
 
-@item set punct "string"
+@item set punct "@var{string}"
 Set the characters treated as closing punctuation when justifying
-paragraphs.  They cannot contain blank characters.  Only closing
-punctuation, optionally followed by closing brackets, can end sentences.
-The default value is @code{"!.?"}.
+paragraphs.  This may not include blank characters.  Only the
+specified closing punctuation, optionally followed by closing brackets
+(see "brackets"), can end sentences.  The default value is "!.?".
 
-@item set/unset quickblank
+@item set quickblank
 Do quick statusbar blanking.  Statusbar messages will disappear after 1
 keystroke instead of 25.
 
-@item set quotestr "string"
+@item set quiet
+When set, @code{nano} will not report errors in the nanorc file nor ask them
+to be acknowledged by pressing Enter at startup.  If this option is used, it
+should be placed at the top of the file to be fully effective.
+
+@item set quotestr "@var{string}"
 The email-quote string, used to justify email-quoted paragraphs.  This
 is an extended regular expression if your system supports them,
 otherwise a literal string.  The default value is
 
 @quotation
-@code{"^([ \\t]*[#:>\\|@}])+"}
+"^([ \\t]*[#:>\\|@}])+"
 @end quotation
 
-if you have extended regular expression support, or "> " otherwise.
+if you have extended regular expression support, and "> " otherwise.
 Note that '\\t' stands for a literal Tab character.
 
-@item set/unset rebinddelete
+@item set rebinddelete
 Interpret the Delete key differently so that both Backspace and Delete
 work properly.  You should only need to use this option if Backspace
 acts like Delete on your system.
 
-@item set/unset rebindkeypad
+@item set rebindkeypad
 Interpret the numeric keypad keys so that they all work properly.  You
 should only need to use this option if they don't, as mouse support
 won't work properly with this option enabled.
 
-@item set/unset regexp
+@item set regexp
 Do extended regular expression searches by default.
 
-@item set/unset smarthome
+@item set smarthome
 Make the Home key smarter.  When Home is pressed anywhere but at the
 very beginning of non-whitespace characters on a line, the cursor will
 jump to that beginning (either forwards or backwards).  If the cursor is
 already at that position, it will jump to the true beginning of the
 line.
 
-@item set/unset smooth
+@item set smooth
 Use smooth scrolling by default.
 
-@item set/unset softwrap
-Use soft wrapping by default.
+@item set softwrap
+Enable soft line wrapping for easier viewing of very long lines.
 
 @item set speller "spellprog"
 Use spelling checker "spellprog" instead of the built-in one, which
 calls "spell".
 
-@item set/unset suspend
-Allow @code{nano} to be suspended.
+@item set statuscolor @var{fgcolor},@var{bgcolor}
+Specify the color combination to use for the statusbar.
+See @code{set titlecolor} for more details.
 
-@item set/unset suspendenable
-If @code{nano} is allowed to be suspended, allow the suspend key
-(usually ^Z) to actually suspend it.
+@item set suspend
+Allow @code{nano} to be suspended.
 
-@item set tabsize "n"
-Use a tab size of "n" columns.  The value of "n" must be greater than 0.
-The default value is 8.
+@item set tabsize @var{number}
+Use a tab size of @var{number} columns.  The value of @var{number} must be
+greater than 0.  The default value is 8.
 
-@item set/unset tabstospaces
+@item set tabstospaces
 Convert typed tabs to spaces.
 
-@item set/unset tempfile
+@item set tempfile
 Save automatically on exit, don't prompt.
 
-@item set/unset undo
-Enable experimental generic-purpose undo code.
+@item set titlecolor @var{fgcolor},@var{bgcolor}
+Specify the color combination to use for the titlebar.
+Valid color names for foreground and background are:
+white, black, red, blue, green, yellow, magenta, and cyan.
+And either @var{fgcolor} or @var{,bgcolor} may be left out.
 
-@item set/unset view
+@item set view
 Disallow file modification.
 
-@item set whitespace "string"
-Set the two characters used to display the first characters of tabs and
-spaces.  They must be single-column characters.
+@anchor{Whitespace}
+@item set whitespace "@var{string}"
+Set the two characters used to indicate the presence of tabs and
+spaces.  They must be single-column characters.  The default pair
+for a UTF-8 locale is "»·", and for other locales ">.".
 
-@item set/unset wordbounds
+@item set wordbounds
 Detect word boundaries more accurately by treating punctuation
 characters as part of a word.
 
-@item syntax "str" ["fileregex" @dots{} ]
+@end table
+
+@node Syntax Highlighting
+@section Syntax Highlighting
+
+Coloring the different syntactic elements of a file
+is done via regular expressions (see the @code{color} command below).
+This is inherently imperfect, because regular expressions are not
+powerful enough to fully parse a file.  Nevertheless, regular
+expressions can do a lot and are easy to make, so they are a
+good fit for a small editor like @code{nano}.
+
+A separate syntax can be defined for each kind of file
+via the following commands in a nanorc file:
+
+@table @code
+
+@item syntax "str" ["fileregex" @dots{}]
 Defines a syntax named "str" which can be activated via the -Y/--syntax
-command line option, or will be automatically activated if the current
+command-line option, or will be automatically activated if the current
 filename matches the extended regular expression "fileregex".  All
-following "color" and "icolor" statements will apply to "syntax" until a
-new syntax is defined.
+following "color" and "icolor" statements will apply to this "str"
+syntax until a new syntax is defined.
 
 The "none" syntax is reserved; specifying it on the command line is the
 same as not having a syntax at all.  The "default" syntax is special: it
 takes no "fileregex", and applies to files that don't match any other
 syntax's "fileregex".
 
+@item linter program [arg @dots{}]
+For the currently defined syntax, use the given program to invoke the
+linter (this overrides the speller function when defined).
+
+@item formatter program [arg @dots{}]
+For the currently defined syntax, use the given program to automatically
+reformat text.  Useful in certain programming languages (e.g. go).
+
+@item header "regex" @dots{}
+For the currently defined syntax, add one or more regexes which will
+be compared against the very first line of the file to be edited,
+to determine whether this syntax should be used for that file.
+
+@item magic "regex" @dots{}
+For the currently defined syntax, add one or more regexes which will be
+compared against the result of querying the magic database about the file
+to be edited, to determine whether this syntax should be used for that
+file.  This functionality only works when libmagic is installed on the
+system and will be silently ignored otherwise.
+
 @item color fgcolor,bgcolor "regex" @dots{}
 For the currently defined syntax, display all expressions matching the
 extended regular expression "regex" with foreground color "fgcolor" and
 background color "bgcolor", at least one of which must be specified.
-Legal colors for foreground and background color are: white, black, red,
+Valid colors for foreground and background are: white, black, red,
 blue, green, yellow, magenta, and cyan.  You may use the prefix "bright"
-to force a stronger color highlight for the foreground.  If your
-terminal supports transparency, not specifying a "bgcolor" tells "nano"
+to get a stronger color highlight for the foreground.  If your
+terminal supports transparency, not specifying a "bgcolor" tells @code{nano}
 to attempt to use a transparent background.
 
 @item icolor fgcolor,bgcolor "regex" @dots{}
@@ -709,12 +882,374 @@ Same as above, except that the expression matching is case insensitive.
 
 @item include "syntaxfile"
 Read in self-contained color syntaxes from "syntaxfile".  Note that
-"syntaxfile" can only contain "syntax", "color", and "icolor" commands.
+"syntaxfile" can only contain the above commands, from "syntax" to
+"icolor".
+
+@item extendsyntax str directive [arg @dots{}]
+Extend the syntax previously defined as str to include new information.
+Allows you to add a new color, icolor, magic, header, or linter directive
+to an already defined syntax.  Useful when you want to add to definitions
+from the system-installed syntax definitions (which are normally not writable).
+
+@end table
+
+@node Rebinding Keys
+@section Rebinding Keys
+
+Key bindings may be reassigned via the following two commands in a
+nanorc file:
+
+@table @code
+
+@item bind key function menu
+Rebinds @code{key} to @code{function} in the context of @code{menu}
+(or in all menus where the function exists by using @code{all}).
+
+@item unbind key menu
+Unbinds @code{key} from @code{menu}
+(or from all menus where it exists by using @code{all}).
+
+@end table
+
+The format of @code{key} should be one of:
+
+@table @code
+
+@item ^
+followed by an alpha character or the word "Space".
+Example: @code{^C}
+
+@item M-
+followed by a printable character or the word "Space".
+Example: @code{M-C}
+
+@item F
+followed by a numeric value from 1 to 16.
+Example: @code{F10}
 
 @end table
 
+Valid names for the @code{function} to be bound are:
+
+@table @code
+
+@item help
+Invokes the help viewer.
+
+@item cancel
+Cancels the current command.
+
+@item exit
+Exits from the program (or from the help viewer or the file browser).
+
+@item writeout
+Writes the current buffer to disk.
+
+@item insert
+Inserts a file into the current buffer (or into a new buffer when multibuffer
+is enabled).
+
+@item whereis
+Searches for text in the current buffer -- or for filenames matching
+a string in the current list in the file browser
+
+@item searchagain
+Repeats the last search command.
+
+@item replace
+Interactively replaces text within the current buffer.
+
+@item cut
+Cuts and stores the current line (or the marked region).
+
+@item copytext
+Copies the current line (or the marked region) without deleting it.
+
+@item uncut
+Copies the currently stored text into the current buffer at the
+current cursor position.
+
+@item mark
+Sets the mark at the current position, to start selecting text.
+
+@item cutrestoffile
+Cuts all text from the cursor position till the end of the buffer.
+
+@item curpos
+Shows the current cursor position: the line, column, and character positions.
+
+@item wordcount
+Counts the number of words, lines and characters in the current buffer.
+
+@item speller
+Invokes a spell-checking program (or a linting program, if the current
+syntax highlighting defines one).
+
+@item justify
+Justifies the current paragraph.
+
+@item fulljustify
+Justifies the entire current buffer.
+
+@item indent
+Indents (shifts to the right) the currently marked text.
+
+@item unindent
+Unindents (shifts to the left) the currently marked text.
+
+@item left
+Goes left one position (in the editor or browser).
+
+@item right
+Goes right one position (in the editor or browser).
+
+@item up
+Goes one line up (in the editor or browser).
+
+@item down
+Goes one line down (in the editor or browser).
+
+@item scrollup
+Scrolls up one line of text from the current position.
+
+@item scrolldown
+Scrolls down one line of text from the current position.
 
-@node The File Browser, Pico Compatibility, Nanorc Files, Top
+@item nextword
+Moves the cursor to the beginning of the next word.
+
+@item prevword
+Moves the cursor to the beginning of the previous word.
+
+@item home
+Moves the cursor to the beginning of the current line.
+
+@item end
+Moves the cursor to the end of the current line.
+
+@item beginpara
+Moves the cursor to the beginning of the current paragraph.
+
+@item endpara
+Moves the cursor to the end of the current paragraph.
+
+@item prevpage
+Goes up one screenful.
+
+@item nextpage
+Goes down one screenful.
+
+@item firstline
+Goes to the first line of the file.
+
+@item lastline
+Goes to the last line of the file.
+
+@item gotoline
+Goes to a specific line (and column if specified).
+
+@item gototext
+Switches from targeting a line number to searching for text.
+
+@item findbracket
+Moves the cursor to the bracket (brace, parenthesis, etc.) that matches
+(pairs) with the one under the cursor.
+
+@item prevbuf
+Switches to editing/viewing the previous buffer when using multibuffer mode.
+
+@item nextbuf
+Switches to editing/viewing the next buffer when using multibuffer mode.
+
+@item verbatim
+Inserts the next character verbatim into the file.
+
+@item tab
+Inserts a tab at the current cursor location.
+
+@item enter
+Inserts a new line below the current one.
+
+@item delete
+Deletes the character under the cursor.
+
+@item backspace
+Deletes the character before the cursor.
+
+@item undo
+Undoes the last performed text action (add text, delete text, etc).
+
+@item redo
+Redoes the last undone action (i.e., it undoes an undo).
+
+@item refresh
+Refreshes the screen.
+
+@item suspend
+Suspends the editor (if the suspending function is enabled, see the
+"suspendenable" entry below).
+
+@item casesens
+Toggles case sensitivity in searching (search/replace menus only).
+
+@item regexp
+Toggles whether searching/replacing is based on literal strings or regular expressions.
+
+@item backwards
+Toggles whether searching/replacing goes forward or backward.
+
+@item prevhistory
+Shows the previous history entry in the prompt menus (e.g. search).
+
+@item nexthistory
+Shows the next history entry in the prompt menus (e.g. search).
+
+@item flipreplace
+Toggles between searching for something and replacing something.
+
+@item flipexecute
+Toggles between inserting a file and executing a command.
+
+@item flipnewbuffer
+Toggles between inserting into the current buffer and into a new
+empty buffer.
+
+@item dosformat
+When writing a file, switches to writing a DOS format (CR/LF).
+
+@item macformat
+When writing a file, switches to writing a Mac format.
+
+@item append
+When writing a file, appends to the end instead of overwriting.
+
+@item prepend
+When writing a file, 'prepends' (writes at the beginning) instead of overwriting.
+
+@item backup
+When writing a file, creates a backup of the current file.
+
+@item tofiles
+Starts the file browser, allowing to select a file from a list.
+
+@item gotodir
+Goes to a directory to be specified, allowing to browse anywhere
+in the filesystem.
+
+@item firstfile
+Goes to the first file when using the file browser (reading or writing files).
+
+@item lastfile
+Goes to the last file when using the file browser (reading or writing files).
+
+@item nohelp
+Toggles the presence of the two-line list of key bindings at the bottom of the screen.
+
+@item constupdate
+Toggles the constant display of the current line, column, and character positions.
+
+@item morespace
+Toggles the presence of the blank line which 'separates' the titlebar from the file text.
+
+@item smoothscroll
+Toggles smooth scrolling (when moving around with the arrow keys).
+
+@item softwrap
+Toggles the displaying of overlong lines on multiple screen lines.
+
+@item whitespacedisplay
+Toggles the showing of whitespace.
+
+@item nosyntax
+Toggles syntax highlighting.
+
+@item smarthome
+Toggles the smartness of the Home key.
+
+@item autoindent
+Toggles whether new lines will contain the same amount of whitespace as the preceding line.
+
+@item cuttoend
+Toggles whether cutting text will cut the whole line or just from the current cursor
+position to the end of the line.
+
+@item nowrap
+Toggles whether long lines will be hard-wrapped to the next line.
+
+@item tabstospaces
+Toggles whether typed tabs will be converted to spaces.
+
+@item backupfile
+Toggles whether a backup will be made of the file to be edited.
+
+@item multibuffer
+Toggles the use of multiple file buffers (if available).
+
+@item mouse
+Toggles mouse support.
+
+@item noconvert
+Toggles automatic conversion of files from DOS/Mac format.
+
+@item suspendenable
+Toggles whether the suspend sequence (normally ^Z) will suspend the editor window.
+
+@end table
+
+Valid names for @code{menu} are:
+
+@table @code
+
+@item main
+The main editor window where text is entered and edited.
+
+@item search
+The search menu (AKA whereis).
+
+@item replace
+The 'search to replace' menu.
+
+@item replacewith
+The 'replace with' menu, which comes up after 'search to replace'.
+
+@item gotoline
+The 'goto line (and column)' menu.
+
+@item writeout
+The 'write file' menu.
+
+@item insert
+The 'insert file' menu.
+
+@item extcmd
+The menu for inserting output from an external command, reached from the insert menu.
+
+@item help
+The help-viewer menu.
+
+@item spell
+The interactive spell checker Yes/no menu.
+
+@item linter
+The linter menu.
+
+@item browser
+The file browser for inserting or writing a file.
+
+@item whereisfile
+The 'search for a file' menu in the file browser.
+
+@item gotodir
+The 'go to directory' menu in the file browser.
+
+@item all
+A special name that encompasses all menus.  For @code{bind} it means
+all menus where the specified @code{function} exists; for @code{unbind}
+it means all menus where the specified @code{key} exists.
+@end table
+
+
+@node The File Browser
 @chapter The File Browser
 
 When reading or writing files, pressing ^T will invoke the file browser.
@@ -730,7 +1265,8 @@ enter and display the contents of the directory.  If the object is a
 file, this filename and path are copied to the statusbar, and the file
 browser exits.
 
-@node Pico Compatibility, Building and Configure Options, The File Browser, Top
+
+@node Pico Compatibility
 @chapter Pico Compatibility
 
 @code{nano} attempts to emulate Pico as closely as possible, but there
@@ -766,14 +1302,14 @@ functions can be toggled for a particular version of @code{nano}.  See
 
 @item Cursor Position Display
 The output of the "Display Cursor Position" in @code{nano} displays
-the given column position, as well as the row and total character
-position of the cursor.
+the current line position of the cursor, as well as the column and
+total character position.
 
 @item Interactive Replace and Spell Checker
 It is worth noting that @code{nano}'s replace function is interactive,
-i.e. it does not stop after one search string is found and automatically
-replace it.  The @code{nano} implementation will pause at each search
-string found and query whether to replace this instance or not.  The
+i.e. it does not stop after one search string was found and automatically
+replaced.  The @code{nano} implementation will pause at each found
+search string and query whether to replace this instance or not.  The
 internal spell checker operates similarly.  Note that there is no way to
 force these functions to behave in the Pico fashion.  As of version
 1.1.99pre1, misspelled words are sorted and trimmed for uniqueness in
@@ -781,7 +1317,8 @@ the internal spell checker such that the words 'apple' and 'Apple' will
 be prompted for correction separately.
 @end table
 
-@node Building and Configure Options, , Pico Compatibility, Top
+
+@node Building and Configure Options
 @chapter Building and Configure Options
 
 Building @code{nano} from source is fairly straightforward if you are
@@ -803,81 +1340,98 @@ The possible options to @code{./configure} are:
 @item --disable-browser
 Disable the mini file browser when reading or writing files.
 
+@item --disable-color
+Disable support for the syntax coloring of files.  This also eliminates
+the -Y command-line option, which chooses a specific syntax.
+
+@item --disable-extra
+Disable extra features.  At the moment, this is just easter-egg-type
+stuff.
+
 @item --disable-help
 Disable the help function.  Doing this makes the binary much smaller,
 but makes it difficult for new users to learn more than very basic
 things about using the editor.
 
+@item --disable-histories
+Disable the code for the handling of the history files: the search and
+replace strings that were used, and the cursor position at which each
+file was closed.  This also eliminates the -H and -P command-line
+options, which switch on the logging of search/replace strings and
+cursor positions.
+
 @item --disable-justify
 Disable the justify and unjustify functions.
 
+@item --disable-libmagic
+Disable the use of the library of magic-number tests (for determining
+the file type and thus which syntax to use for colouring -- often the
+tests on filename extension and header line will be enough).
+
 @item --disable-mouse
-Disable all mouse functionality.  This also disables the -m command line
-option, which enables the mouse functionality.
+Disable all mouse functionality.  This also eliminates the -m
+command-line option, which enables the mouse functionality.
+
+@item --disable-multibuffer
+Disable support for opening multiple files at a time and switching
+between them on the fly.  This also eliminates the -F command-line
+option, which switches the use of multiple file buffers on.
+
+@item --disable-nanorc
+Disable support for reading the nanorc files at startup.  With such
+support, you can store custom settings in a system-wide and a per-user
+nanorc file rather than having to pass command-line options to get
+the desired behavior.  See @xref{Nanorc Files}, for more info.
+Disabling this also eliminates the -I and -q command-line options;
+the first inhibits the reading of nanorcfiles, and the second
+suppresses warnings about errors in those files.
 
 @item --disable-operatingdir
-Disable setting the operating directory.  This also disables the -o
-command line option, which sets the operating directory.
+Disable setting the operating directory.  This also eliminates the -o
+command-line option, which sets the operating directory.
 
 @item --disable-speller
-Disable use of the spell checker.  This also disables the -s command
-line option, which allows specifying an alternate spell checker.
+Disable use of the spell checker.  This also eliminates the -s
+command-line option, which allows specifying an alternate spell checker.
 
 @item --disable-tabcomp
 Disable the tab completion code when reading or writing files.
 
 @item --disable-wrapping
-Disable all long line wrapping.  This also eliminates the -w command
-line option, which enables long line wrapping.
+Disable hard-wrapping of overlong lines.  This also eliminates the -w
+command-line option, which enables long-line wrapping.
 
 @item --enable-tiny
 This option disables all the above.  It also disables some of the larger
-internals of the editor, like the marking code and the cut to end of
-line code.  It also disables the function toggles.
+internals of the editor, like the marking code and the cut-to-end-of-line
+code.  It also disables the function toggles.  By using the enabling
+counterpart of the above options together with --enable-tiny, specific
+features can be switched back on.
 
 @item --enable-debug
 Enable support for runtime debug output.  This can get pretty messy, so
-chances are you only want this feature to work on the nano source.
-
-@item --enable-extra
-Enable extra features.  At the moment, this is just easter egg-type
-stuff.
-
-@item --enable-color
-Enable support for syntax coloring of files using the nanorc file.  This
-enables nanorc support as well.
-
-@item --enable-multibuffer
-Enable support for opening multiple files at a time and switching
-between them on the fly.
-
-@item --enable-nanorc
-Enable support for reading the nanorc file at startup.  You can store
-custom settings in the nanorc file rather than having to pass command
-line options to get desired behavior.  See @xref{Nanorc Files}, for
-more info.
-
-@item --enable-all
-Shortcut for enabling the above four features (extra, color,
-multibuffer, and nanorc).
+chances are you only want this feature when you're working on the nano source.
 
 @item --disable-nls
-Disables Native Language support.  This will disable use of the
+Disables Native Language support.  This will disable the use of any
 available GNU @code{nano} translations.
 
 @item --disable-wrapping-as-root
-Disable long line wrapping by default when nano is run as root.
+Disable hard-wrapping of overlong lines by default when @code{nano}
+is run as root.
 
 @item --enable-utf8
 Enable support for reading and writing Unicode files.  This will require
 either a wide version of curses, or a UTF-8-enabled version of Slang.
 
 @item --disable-utf8
-Disable support for reading and writing Unicode files.
+Disable support for reading and writing Unicode files.  Normally the
+configure script auto-detects whether to enable UTF-8 support or not.
+You can use this or the previous option to override that detection.
 
 @item --with-slang
-Compiling @code{nano} with Slang is supported, and will make the binary
-notably smaller than if compiled with ncurses or other curses libraries.
+Compile @code{nano} against Slang instead of against ncurses or other
+curses libraries.
 
 @end table
 
diff --git a/doc/texinfo/texinfo.tex b/doc/texinfo/texinfo.tex
index 9140826..85f184c 100644
--- a/doc/texinfo/texinfo.tex
+++ b/doc/texinfo/texinfo.tex
@@ -3,11 +3,11 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2009-08-14.15}
+\def\texinfoversion{2013-02-01.11}
 %
 % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
 % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-% 2007, 2008, 2009 Free Software Foundation, Inc.
+% 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software: you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
@@ -24,13 +24,14 @@
 %
 % As a special exception, when this file is read by TeX when processing
 % a Texinfo source document, you may use the result without
-% restriction.  (This has been our intent since Texinfo was invented.)
+% restriction. This Exception is an additional permission under section 7
+% of the GNU General Public License, version 3 ("GPLv3").
 %
 % Please try the latest version of texinfo.tex before submitting bug
 % reports; you can get the latest version from:
-%   http://www.gnu.org/software/texinfo/ (the Texinfo home page), or
-%   ftp://tug.org/tex/texinfo.tex
-%     (and all CTAN mirrors, see http://www.ctan.org).
+%   http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or
+%   http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or
+%   http://www.gnu.org/software/texinfo/ (the Texinfo home page)
 % The texinfo.tex in any given distribution could well be out
 % of date, so if that's what you're using, please check.
 %
@@ -65,7 +66,6 @@
 \everyjob{\message{[Texinfo version \texinfoversion]}%
   \catcode`+=\active \catcode`\_=\active}
 
-
 \chardef\other=12
 
 % We never want plain's \outer definition of \+ in Texinfo.
@@ -93,14 +93,13 @@
 \let\ptexnewwrite\newwrite
 \let\ptexnoindent=\noindent
 \let\ptexplus=+
+\let\ptexraggedright=\raggedright
 \let\ptexrbrace=\}
 \let\ptexslash=\/
 \let\ptexstar=\*
 \let\ptext=\t
 \let\ptextop=\top
-{\catcode`\'=\active
-\global\let\ptexquoteright'}% Math-mode def from plain.tex.
-\let\ptexraggedright=\raggedright
+{\catcode`\'=\active \global\let\ptexquoteright'}% active in plain's math mode
 
 % If this character appears in an error message or help string, it
 % starts a new line in the output.
@@ -118,10 +117,11 @@
 % Set up fixed words for English if not already set.
 \ifx\putwordAppendix\undefined  \gdef\putwordAppendix{Appendix}\fi
 \ifx\putwordChapter\undefined   \gdef\putwordChapter{Chapter}\fi
+\ifx\putworderror\undefined     \gdef\putworderror{error}\fi
 \ifx\putwordfile\undefined      \gdef\putwordfile{file}\fi
 \ifx\putwordin\undefined        \gdef\putwordin{in}\fi
-\ifx\putwordIndexIsEmpty\undefined     \gdef\putwordIndexIsEmpty{(Index is empty)}\fi
-\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi
+\ifx\putwordIndexIsEmpty\undefined       \gdef\putwordIndexIsEmpty{(Index is empty)}\fi
+\ifx\putwordIndexNonexistent\undefined   \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi
 \ifx\putwordInfo\undefined      \gdef\putwordInfo{Info}\fi
 \ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi
 \ifx\putwordMethodon\undefined  \gdef\putwordMethodon{Method on}\fi
@@ -160,15 +160,18 @@
 \def\spaceisspace{\catcode`\ =\spacecat}
 
 % sometimes characters are active, so we need control sequences.
+\chardef\ampChar   = `\&
 \chardef\colonChar = `\:
 \chardef\commaChar = `\,
 \chardef\dashChar  = `\-
 \chardef\dotChar   = `\.
 \chardef\exclamChar= `\!
+\chardef\hashChar  = `\#
 \chardef\lquoteChar= `\`
 \chardef\questChar = `\?
 \chardef\rquoteChar= `\'
 \chardef\semiChar  = `\;
+\chardef\slashChar = `\/
 \chardef\underChar = `\_
 
 % Ignore a token.
@@ -199,36 +202,7 @@
 % that mark overfull boxes (in case you have decided
 % that the text looks ok even though it passes the margin).
 %
-\def\finalout{\overfullrule=0pt}
-
-% @| inserts a changebar to the left of the current line.  It should
-% surround any changed text.  This approach does *not* work if the
-% change spans more than two lines of output.  To handle that, we would
-% have adopt a much more difficult approach (putting marks into the main
-% vertical list for the beginning and end of each change).
-%
-\def\|{%
-  % \vadjust can only be used in horizontal mode.
-  \leavevmode
-  %
-  % Append this vertical mode material after the current line in the output.
-  \vadjust{%
-    % We want to insert a rule with the height and depth of the current
-    % leading; that is exactly what \strutbox is supposed to record.
-    \vskip-\baselineskip
-    %
-    % \vadjust-items are inserted at the left edge of the type.  So
-    % the \llap here moves out into the left-hand margin.
-    \llap{%
-      %
-      % For a thicker or thinner bar, change the `1pt'.
-      \vrule height\baselineskip width1pt
-      %
-      % This is the space between the bar and the text.
-      \hskip 12pt
-    }%
-  }%
-}
+\def\finalout{\overfullrule=0pt }
 
 % Sometimes it is convenient to have everything in the transcript file
 % and nothing on the terminal.  We don't just call \tracingall here,
@@ -246,7 +220,7 @@
   \tracingmacros2
   \tracingrestores1
   \showboxbreadth\maxdimen \showboxdepth\maxdimen
-  \ifx\eTeXversion\undefined\else % etex gives us more logging
+  \ifx\eTeXversion\thisisundefined\else % etex gives us more logging
     \tracingscantokens1
     \tracingifs1
     \tracinggroups1
@@ -257,6 +231,13 @@
   \errorcontextlines16
 }%
 
+% @errormsg{MSG}.  Do the index-like expansions on MSG, but if things
+% aren't perfect, it's not the end of the world, being an error message,
+% after all.
+% 
+\def\errormsg{\begingroup \indexnofonts \doerrormsg}
+\def\doerrormsg#1{\errmessage{#1}}
+
 % add check for \lastpenalty to plain's definitions.  If the last thing
 % we did was a \nobreak, we don't want to insert more space.
 %
@@ -267,7 +248,6 @@
 \def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount
   \removelastskip\penalty-200\bigskip\fi\fi}
 
-% For @cropmarks command.
 % Do @cropmarks to get crop marks.
 %
 \newif\ifcropmarks
@@ -577,7 +557,7 @@
 }
 \def\inenvironment#1{%
   \ifx#1\empty
-    out of any environment%
+    outside of any environment%
   \else
     in environment \expandafter\string#1%
   \fi
@@ -589,7 +569,7 @@
 \parseargdef\end{%
   \if 1\csname iscond.#1\endcsname
   \else
-    % The general wording of \badenverr may not be ideal, but... --kasal, 06nov03
+    % The general wording of \badenverr may not be ideal.
     \expandafter\checkenv\csname#1\endcsname
     \csname E#1\endcsname
     \endgroup
@@ -599,85 +579,6 @@
 \newhelp\EMsimple{Press RETURN to continue.}
 
 
-%% Simple single-character @ commands
-
-% @@ prints an @
-% Kludge this until the fonts are right (grr).
-\def\@{{\tt\char64}}
-
-% This is turned off because it was never documented
-% and you can use @w{...} around a quote to suppress ligatures.
-%% Define @` and @' to be the same as ` and '
-%% but suppressing ligatures.
-%\def\`{{`}}
-%\def\'{{'}}
-
-% Used to generate quoted braces.
-\def\mylbrace {{\tt\char123}}
-\def\myrbrace {{\tt\char125}}
-\let\{=\mylbrace
-\let\}=\myrbrace
-\begingroup
-  % Definitions to produce \{ and \} commands for indices,
-  % and @{ and @} for the aux/toc files.
-  \catcode`\{ = \other \catcode`\} = \other
-  \catcode`\[ = 1 \catcode`\] = 2
-  \catcode`\! = 0 \catcode`\\ = \other
-  !gdef!lbracecmd[\{]%
-  !gdef!rbracecmd[\}]%
-  !gdef!lbraceatcmd[@{]%
-  !gdef!rbraceatcmd[@}]%
-!endgroup
-
-% @comma{} to avoid , parsing problems.
-\let\comma = ,
-
-% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
-% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H.
-\let\, = \c
-\let\dotaccent = \.
-\def\ringaccent#1{{\accent23 #1}}
-\let\tieaccent = \t
-\let\ubaraccent = \b
-\let\udotaccent = \d
-
-% Other special characters: @questiondown @exclamdown @ordf @ordm
-% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
-\def\questiondown{?`}
-\def\exclamdown{!`}
-\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}}
-\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}}
-
-% Dotless i and dotless j, used for accents.
-\def\imacro{i}
-\def\jmacro{j}
-\def\dotless#1{%
-  \def\temp{#1}%
-  \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi
-  \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi
-  \else \errmessage{@dotless can be used only with i or j}%
-  \fi\fi
-}
-
-% The \TeX{} logo, as in plain, but resetting the spacing so that a
-% period following counts as ending a sentence.  (Idea found in latex.)
-%
-\edef\TeX{\TeX \spacefactor=1000 }
-
-% @LaTeX{} logo.  Not quite the same results as the definition in
-% latex.ltx, since we use a different font for the raised A; it's most
-% convenient for us to use an explicitly smaller font, rather than using
-% the \scriptstyle font (since we don't reset \scriptstyle and
-% \scriptscriptstyle).
-%
-\def\LaTeX{%
-  L\kern-.36em
-  {\setbox0=\hbox{T}%
-   \vbox to \ht0{\hbox{\selectfonts\lllsize A}\vss}}%
-  \kern-.15em
-  \TeX
-}
-
 % Be sure we're in horizontal mode when doing a tie, since we make space
 % equivalent to this in @example-like environments. Otherwise, a space
 % at the beginning of a line will start with \penalty -- and
@@ -694,7 +595,7 @@
 \def\:{\spacefactor=1000 }
 
 % @* forces a line break.
-\def\*{\hfil\break\hbox{}\ignorespaces}
+\def\*{\unskip\hfil\break\hbox{}\ignorespaces}
 
 % @/ allows a line break.
 \let\/=\allowbreak
@@ -719,7 +620,7 @@
   \else\ifx\temp\offword \plainnonfrenchspacing
   \else
     \errhelp = \EMsimple
-    \errmessage{Unknown @frenchspacing option `\temp', must be on/off}%
+    \errmessage{Unknown @frenchspacing option `\temp', must be on|off}%
   \fi\fi
 }
 
@@ -801,15 +702,6 @@ where each line of input produces a line of output.}
 
 \newdimen\mil  \mil=0.001in
 
-% Old definition--didn't work.
-%\parseargdef\need{\par %
-%% This method tries to make TeX break the page naturally
-%% if the depth of the box does not fit.
-%{\baselineskip=0pt%
-%\vtop to #1\mil{\vfil}\kern -#1\mil\nobreak
-%\prevdepth=-1000pt
-%}}
-
 \parseargdef\need{%
   % Ensure vertical mode, so we don't make a big box in the middle of a
   % paragraph.
@@ -873,7 +765,7 @@ where each line of input produces a line of output.}
 
 % @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current
 % paragraph.  For more general purposes, use the \margin insertion
-% class.  WHICH is `l' or `r'.
+% class.  WHICH is `l' or `r'.  Not documented, written for gawk manual.
 %
 \newskip\inmarginspacing \inmarginspacing=1cm
 \def\strutdepth{\dp\strutbox}
@@ -920,6 +812,36 @@ where each line of input produces a line of output.}
   \temp
 }
 
+% @| inserts a changebar to the left of the current line.  It should
+% surround any changed text.  This approach does *not* work if the
+% change spans more than two lines of output.  To handle that, we would
+% have adopt a much more difficult approach (putting marks into the main
+% vertical list for the beginning and end of each change).  This command
+% is not documented, not supported, and doesn't work.
+%
+\def\|{%
+  % \vadjust can only be used in horizontal mode.
+  \leavevmode
+  %
+  % Append this vertical mode material after the current line in the output.
+  \vadjust{%
+    % We want to insert a rule with the height and depth of the current
+    % leading; that is exactly what \strutbox is supposed to record.
+    \vskip-\baselineskip
+    %
+    % \vadjust-items are inserted at the left edge of the type.  So
+    % the \llap here moves out into the left-hand margin.
+    \llap{%
+      %
+      % For a thicker or thinner bar, change the `1pt'.
+      \vrule height\baselineskip width1pt
+      %
+      % This is the space between the bar and the text.
+      \hskip 12pt
+    }%
+  }%
+}
+
 % @include FILE -- \input text of FILE.
 %
 \def\include{\parseargusing\filenamecatcodes\includezzz}
@@ -930,6 +852,7 @@ where each line of input produces a line of output.}
     \makevalueexpandable  % we want to expand any @value in FILE.
     \turnoffactive        % and allow special characters in the expansion
     \indexnofonts         % Allow `@@' and other weird things in file names.
+    \wlog{texinfo.tex: doing @include of #1^^J}%
     \edef\temp{\noexpand\input #1 }%
     %
     % This trickery is to read FILE outside of a group, in case it makes
@@ -965,7 +888,7 @@ where each line of input produces a line of output.}
 \def\popthisfilestack{\errthisfilestackempty}
 \def\errthisfilestackempty{\errmessage{Internal error:
   the stack of filenames is empty.}}
-
+%
 \def\thisfile{}
 
 % @center line
@@ -973,36 +896,46 @@ where each line of input produces a line of output.}
 %
 \parseargdef\center{%
   \ifhmode
-    \let\next\centerH
+    \let\centersub\centerH
   \else
-    \let\next\centerV
+    \let\centersub\centerV
   \fi
-  \next{\hfil \ignorespaces#1\unskip \hfil}%
+  \centersub{\hfil \ignorespaces#1\unskip \hfil}%
+  \let\centersub\relax % don't let the definition persist, just in case
 }
-\def\centerH#1{%
-  {%
-    \hfil\break
-    \advance\hsize by -\leftskip
-    \advance\hsize by -\rightskip
-    \line{#1}%
-    \break
-  }%
+\def\centerH#1{{%
+  \hfil\break
+  \advance\hsize by -\leftskip
+  \advance\hsize by -\rightskip
+  \line{#1}%
+  \break
+}}
+%
+\newcount\centerpenalty
+\def\centerV#1{%
+  % The idea here is the same as in \startdefun, \cartouche, etc.: if
+  % @center is the first thing after a section heading, we need to wipe
+  % out the negative parskip inserted by \sectionheading, but still
+  % prevent a page break here.
+  \centerpenalty = \lastpenalty
+  \ifnum\centerpenalty>10000 \vskip\parskip \fi
+  \ifnum\centerpenalty>9999 \penalty\centerpenalty \fi
+  \line{\kern\leftskip #1\kern\rightskip}%
 }
-\def\centerV#1{\line{\kern\leftskip #1\kern\rightskip}}
 
 % @sp n   outputs n lines of vertical space
-
+%
 \parseargdef\sp{\vskip #1\baselineskip}
 
 % @comment ...line which is ignored...
 % @c is the same as @comment
 % @ignore ... @end ignore  is another way to write a comment
-
+%
 \def\comment{\begingroup \catcode`\^^M=\other%
 \catcode`\@=\other \catcode`\{=\other \catcode`\}=\other%
 \commentxxx}
 {\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}}
-
+%
 \let\c=\comment
 
 % @paragraphindent NCHARS
@@ -1095,109 +1028,6 @@ where each line of input produces a line of output.}
 }
 
 
-% @asis just yields its argument.  Used with @table, for example.
-%
-\def\asis#1{#1}
-
-% @math outputs its argument in math mode.
-%
-% One complication: _ usually means subscripts, but it could also mean
-% an actual _ character, as in @math{@var{some_variable} + 1}.  So make
-% _ active, and distinguish by seeing if the current family is \slfam,
-% which is what @var uses.
-{
-  \catcode`\_ = \active
-  \gdef\mathunderscore{%
-    \catcode`\_=\active
-    \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
-  }
-}
-% Another complication: we want \\ (and @\) to output a \ character.
-% FYI, plain.tex uses \\ as a temporary control sequence (why?), but
-% this is not advertised and we don't care.  Texinfo does not
-% otherwise define @\.
-%
-% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\.
-\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi}
-%
-\def\math{%
-  \tex
-  \mathunderscore
-  \let\\ = \mathbackslash
-  \mathactive
-  % make the texinfo accent commands work in math mode
-  \let\"=\ddot
-  \let\'=\acute
-  \let\==\bar
-  \let\^=\hat
-  \let\`=\grave
-  \let\u=\breve
-  \let\v=\check
-  \let\~=\tilde
-  \let\dotaccent=\dot
-  $\finishmath
-}
-\def\finishmath#1{#1$\endgroup}  % Close the group opened by \tex.
-
-% Some active characters (such as <) are spaced differently in math.
-% We have to reset their definitions in case the @math was an argument
-% to a command which sets the catcodes (such as @item or @section).
-%
-{
-  \catcode`^ = \active
-  \catcode`< = \active
-  \catcode`> = \active
-  \catcode`+ = \active
-  \catcode`' = \active
-  \gdef\mathactive{%
-    \let^ = \ptexhat
-    \let< = \ptexless
-    \let> = \ptexgtr
-    \let+ = \ptexplus
-    \let' = \ptexquoteright
-  }
-}
-
-% Some math mode symbols.
-\def\bullet{$\ptexbullet$}
-\def\geq{\ifmmode \ge\else $\ge$\fi}
-\def\leq{\ifmmode \le\else $\le$\fi}
-\def\minus{\ifmmode -\else $-$\fi}
-
-% @dots{} outputs an ellipsis using the current font.
-% We do .5em per period so that it has the same spacing in the cm
-% typewriter fonts as three actual period characters; on the other hand,
-% in other typewriter fonts three periods are wider than 1.5em.  So do
-% whichever is larger.
-%
-\def\dots{%
-  \leavevmode
-  \setbox0=\hbox{...}% get width of three periods
-  \ifdim\wd0 > 1.5em
-    \dimen0 = \wd0
-  \else
-    \dimen0 = 1.5em
-  \fi
-  \hbox to \dimen0{%
-    \hskip 0pt plus.25fil
-    .\hskip 0pt plus1fil
-    .\hskip 0pt plus1fil
-    .\hskip 0pt plus.5fil
-  }%
-}
-
-% @enddots{} is an end-of-sentence ellipsis.
-%
-\def\enddots{%
-  \dots
-  \spacefactor=\endofsentencespacefactor
-}
-
-% @comma{} is so commas can be inserted into text without messing up
-% Texinfo's parsing.
-%
-\let\comma = ,
-
 % @refill is a no-op.
 \let\refill=\relax
 
@@ -1262,9 +1092,8 @@ where each line of input produces a line of output.}
 \newif\ifpdfmakepagedest
 
 % when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1
-% can be set).  So we test for \relax and 0 as well as \undefined,
-% borrowed from ifpdf.sty.
-\ifx\pdfoutput\undefined
+% can be set).  So we test for \relax and 0 as well as being undefined.
+\ifx\pdfoutput\thisisundefined
 \else
   \ifx\pdfoutput\relax
   \else
@@ -1279,50 +1108,24 @@ where each line of input produces a line of output.}
 % for display in the outlines, and in other places.  Thus, we have to
 % double any backslashes.  Otherwise, a name like "\node" will be
 % interpreted as a newline (\n), followed by o, d, e.  Not good.
-% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
-% (and related messages, the final outcome is that it is up to the TeX
-% user to double the backslashes and otherwise make the string valid, so
-% that's what we do).
-
-% double active backslashes.
-%
-{\catcode`\@=0 \catcode`\\=\active
- @gdef@activebackslashdouble{%
-   @catcode`@\=@active
-   @let\=@doublebackslash}
-}
-
-% To handle parens, we must adopt a different approach, since parens are
-% not active characters.  hyperref.dtx (which has the same problem as
-% us) handles it with this amazing macro to replace tokens, with minor
-% changes for Texinfo.  It is included here under the GPL by permission
-% from the author, Heiko Oberdiek.
-%
-% #1 is the tokens to replace.
-% #2 is the replacement.
-% #3 is the control sequence with the string.
-%
-\def\HyPsdSubst#1#2#3{%
-  \def\HyPsdReplace##1#1##2\END{%
-    ##1%
-    \ifx\\##2\\%
-    \else
-      #2%
-      \HyReturnAfterFi{%
-        \HyPsdReplace##2\END
-      }%
-    \fi
-  }%
-  \xdef#3{\expandafter\HyPsdReplace#3#1\END}%
-}
-\long\def\HyReturnAfterFi#1\fi{\fi#1}
-
-% #1 is a control sequence in which to do the replacements.
-\def\backslashparens#1{%
-  \xdef#1{#1}% redefine it as its expansion; the definition is simply
-             % \lastnode when called from \setref -> \pdfmkdest.
-  \HyPsdSubst{(}{\realbackslash(}{#1}%
-  \HyPsdSubst{)}{\realbackslash)}{#1}%
+% 
+% See http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html and
+% related messages.  The final outcome is that it is up to the TeX user
+% to double the backslashes and otherwise make the string valid, so
+% that's what we do.  pdftex 1.30.0 (ca.2005) introduced a primitive to
+% do this reliably, so we use it.
+
+% #1 is a control sequence in which to do the replacements,
+% which we \xdef.
+\def\txiescapepdf#1{%
+  \ifx\pdfescapestring\thisisundefined
+    % No primitive available; should we give a warning or log?
+    % Many times it won't matter.
+  \else
+    % The expandable \pdfescapestring primitive escapes parentheses,
+    % backslashes, and other special chars.
+    \xdef#1{\pdfescapestring{#1}}%
+  \fi
 }
 
 \newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
@@ -1381,32 +1184,34 @@ output) for that.)}
   %
   % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
   \def\dopdfimage#1#2#3{%
-    \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
-    \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
+    \def\pdfimagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
+    \def\pdfimageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
     %
-    % pdftex (and the PDF format) support .png, .jpg, .pdf (among
-    % others).  Let's try in that order.
+    % pdftex (and the PDF format) support .pdf, .png, .jpg (among
+    % others).  Let's try in that order, PDF first since if
+    % someone has a scalable image, presumably better to use that than a
+    % bitmap.
     \let\pdfimgext=\empty
     \begingroup
-      \openin 1 #1.png \ifeof 1
-        \openin 1 #1.jpg \ifeof 1
-          \openin 1 #1.jpeg \ifeof 1
-            \openin 1 #1.JPG \ifeof 1
-              \openin 1 #1.pdf \ifeof 1
-                \openin 1 #1.PDF \ifeof 1
+      \openin 1 #1.pdf \ifeof 1
+        \openin 1 #1.PDF \ifeof 1
+          \openin 1 #1.png \ifeof 1
+            \openin 1 #1.jpg \ifeof 1
+              \openin 1 #1.jpeg \ifeof 1
+                \openin 1 #1.JPG \ifeof 1
                   \errhelp = \nopdfimagehelp
                   \errmessage{Could not find image file #1 for pdf}%
-                \else \gdef\pdfimgext{PDF}%
+                \else \gdef\pdfimgext{JPG}%
                 \fi
-              \else \gdef\pdfimgext{pdf}%
+              \else \gdef\pdfimgext{jpeg}%
               \fi
-            \else \gdef\pdfimgext{JPG}%
+            \else \gdef\pdfimgext{jpg}%
             \fi
-          \else \gdef\pdfimgext{jpeg}%
+          \else \gdef\pdfimgext{png}%
           \fi
-        \else \gdef\pdfimgext{jpg}%
+        \else \gdef\pdfimgext{PDF}%
         \fi
-      \else \gdef\pdfimgext{png}%
+      \else \gdef\pdfimgext{pdf}%
       \fi
       \closein 1
     \endgroup
@@ -1418,8 +1223,8 @@ output) for that.)}
     \else
       \immediate\pdfximage
     \fi
-      \ifdim \wd0 >0pt width \imagewidth \fi
-      \ifdim \wd2 >0pt height \imageheight \fi
+      \ifdim \wd0 >0pt width \pdfimagewidth \fi
+      \ifdim \wd2 >0pt height \pdfimageheight \fi
       \ifnum\pdftexversion<13
          #1.\pdfimgext
        \else
@@ -1434,10 +1239,9 @@ output) for that.)}
     % such as \, aren't expanded when present in a section title.
     \indexnofonts
     \turnoffactive
-    \activebackslashdouble
     \makevalueexpandable
     \def\pdfdestname{#1}%
-    \backslashparens\pdfdestname
+    \txiescapepdf\pdfdestname
     \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
   }}
   %
@@ -1469,29 +1273,24 @@ output) for that.)}
     % page number.  We could generate a destination for the section
     % text in the case where a section has no node, but it doesn't
     % seem worth the trouble, since most documents are normally structured.
-    \def\pdfoutlinedest{#3}%
+    \edef\pdfoutlinedest{#3}%
     \ifx\pdfoutlinedest\empty
       \def\pdfoutlinedest{#4}%
     \else
-      % Doubled backslashes in the name.
-      {\activebackslashdouble \xdef\pdfoutlinedest{#3}%
-       \backslashparens\pdfoutlinedest}%
+      \txiescapepdf\pdfoutlinedest
     \fi
     %
-    % Also double the backslashes in the display string.
-    {\activebackslashdouble \xdef\pdfoutlinetext{#1}%
-     \backslashparens\pdfoutlinetext}%
+    % Also escape PDF chars in the display string.
+    \edef\pdfoutlinetext{#1}%
+    \txiescapepdf\pdfoutlinetext
     %
     \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
   }
   %
   \def\pdfmakeoutlines{%
     \begingroup
-      % Thanh's hack / proper braces in bookmarks
-      \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace
-      \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
-      %
       % Read toc silently, to get counts of subentries for \pdfoutline.
+      \def\partentry##1##2##3##4{}% ignore parts in the outlines
       \def\numchapentry##1##2##3##4{%
 	\def\thischapnum{##2}%
 	\def\thissecnum{0}%
@@ -1545,25 +1344,41 @@ output) for that.)}
       % Latin 2 (0xea) gets translated to a | character.  Info from
       % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100.
       %
-      % xx to do this right, we have to translate 8-bit characters to
-      % their "best" equivalent, based on the @documentencoding.  Right
-      % now, I guess we'll just let the pdf reader have its way.
+      % TODO this right, we have to translate 8-bit characters to
+      % their "best" equivalent, based on the @documentencoding.  Too
+      % much work for too little return.  Just use the ASCII equivalents
+      % we use for the index sort strings.
+      % 
       \indexnofonts
       \setupdatafile
+      % We can have normal brace characters in the PDF outlines, unlike
+      % Texinfo index files.  So set that up.
+      \def\{{\lbracecharliteral}%
+      \def\}{\rbracecharliteral}%
       \catcode`\\=\active \otherbackslash
       \input \tocreadfilename
     \endgroup
   }
+  {\catcode`[=1 \catcode`]=2
+   \catcode`{=\other \catcode`}=\other
+   \gdef\lbracecharliteral[{]%
+   \gdef\rbracecharliteral[}]%
+  ]
   %
   \def\skipspaces#1{\def\PP{#1}\def\D{|}%
     \ifx\PP\D\let\nextsp\relax
     \else\let\nextsp\skipspaces
-      \ifx\p\space\else\addtokens{\filename}{\PP}%
-        \advance\filenamelength by 1
-      \fi
+      \addtokens{\filename}{\PP}%
+      \advance\filenamelength by 1
     \fi
     \nextsp}
-  \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax}
+  \def\getfilename#1{%
+    \filenamelength=0
+    % If we don't expand the argument now, \skipspaces will get
+    % snagged on things like "@value{foo}".
+    \edef\temp{#1}%
+    \expandafter\skipspaces\temp|\relax
+  }
   \ifnum\pdftexversion < 14
     \let \startlink \pdfannotlink
   \else
@@ -1660,9 +1475,6 @@ output) for that.)}
 \def\ttsl{\setfontstyle{ttsl}}
 
 
-% Default leading.
-\newdimen\textleading  \textleading = 13.2pt
-
 % Set the baselineskip to #1, and the lineskip and strut size
 % correspondingly.  There is no deep meaning behind these magic numbers
 % used as factors; they just match (closely enough) what Knuth defined.
@@ -1674,6 +1486,7 @@ output) for that.)}
 % can get a sort of poor man's double spacing by redefining this.
 \def\baselinefactor{1}
 %
+\newdimen\textleading
 \def\setleading#1{%
   \dimen0 = #1\relax
   \normalbaselineskip = \baselinefactor\dimen0
@@ -1695,7 +1508,7 @@ output) for that.)}
 % if we are producing pdf, and we have \pdffontattr, then define cmaps.
 % (\pdffontattr was introduced many years ago, but people still run
 % older pdftex's; it's easy to conditionalize, so we do.)
-\ifpdf \ifx\pdffontattr\undefined \else
+\ifpdf \ifx\pdffontattr\thisisundefined \else
   \begingroup
     \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
     \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
@@ -1946,28 +1759,34 @@ end
 \fi\fi
 
 
-% Set the font macro #1 to the font named #2, adding on the
-% specified font prefix (normally `cm').
+% Set the font macro #1 to the font named \fontprefix#2.
 % #3 is the font's design size, #4 is a scale factor, #5 is the CMap
-% encoding (currently only OT1, OT1IT and OT1TT are allowed, pass
-% empty to omit).
+% encoding (only OT1, OT1IT and OT1TT are allowed, or empty to omit).
+% Example:
+% #1 = \textrm
+% #2 = \rmshape
+% #3 = 10
+% #4 = \mainmagstep
+% #5 = OT1
+%
 \def\setfont#1#2#3#4#5{%
   \font#1=\fontprefix#2#3 scaled #4
   \csname cmap#5\endcsname#1%
 }
 % This is what gets called when #5 of \setfont is empty.
 \let\cmap\gobble
-% emacs-page end of cmaps
+%
+% (end of cmaps)
 
 % Use cm as the default font prefix.
 % To specify the font prefix, you must define \fontprefix
 % before you read in texinfo.tex.
-\ifx\fontprefix\undefined
+\ifx\fontprefix\thisisundefined
 \def\fontprefix{cm}
 \fi
 % Support font families that don't use the same naming scheme as CM.
 \def\rmshape{r}
-\def\rmbshape{bx}               %where the normal face is bold
+\def\rmbshape{bx}               % where the normal face is bold
 \def\bfshape{b}
 \def\bxshape{bx}
 \def\ttshape{tt}
@@ -1982,8 +1801,7 @@ end
 \def\scshape{csc}
 \def\scbshape{csc}
 
-% Definitions for a main text size of 11pt.  This is the default in
-% Texinfo.
+% Definitions for a main text size of 11pt.  (The default in Texinfo.)
 %
 \def\definetextfontsizexi{%
 % Text fonts (11.2pt, magstep1).
@@ -2105,10 +1923,10 @@ end
 \font\reducedsy=cmsy10
 \def\reducedecsize{1000}
 
-% reset the current fonts
-\textfonts
+\textleading = 13.2pt % line spacing for 11pt CM
+\textfonts            % reset the current fonts
 \rm
-} % end of 11pt text font size definitions
+} % end of 11pt text font size definitions, \definetextfontsizexi
 
 
 % Definitions to make the main text be 10pt Computer Modern, with
@@ -2236,25 +2054,24 @@ end
 \font\reducedsy=cmsy9
 \def\reducedecsize{0900}
 
-% reduce space between paragraphs
-\divide\parskip by 2
-
-% reset the current fonts
-\textfonts
+\divide\parskip by 2  % reduce space between paragraphs
+\textleading = 12pt   % line spacing for 10pt CM
+\textfonts            % reset the current fonts
 \rm
-} % end of 10pt text font size definitions
+} % end of 10pt text font size definitions, \definetextfontsizex
 
 
 % We provide the user-level command
 %   @fonttextsize 10
 % (or 11) to redefine the text font size.  pt is assumed.
 %
-\def\xword{10}
 \def\xiword{11}
+\def\xword{10}
+\def\xwordpt{10pt}
 %
 \parseargdef\fonttextsize{%
   \def\textsizearg{#1}%
-  \wlog{doing @fonttextsize \textsizearg}%
+  %\wlog{doing @fonttextsize \textsizearg}%
   %
   % Set \globaldefs so that documents can use this inside @tex, since
   % makeinfo 4.8 does not support it, but we need it nonetheless.
@@ -2308,7 +2125,7 @@ end
   \let\tenttsl=\titlettsl
   \def\curfontsize{title}%
   \def\lsize{chap}\def\lllsize{subsec}%
-  \resetmathfonts \setleading{25pt}}
+  \resetmathfonts \setleading{27pt}}
 \def\titlefont#1{{\titlefonts\rmisbold #1}}
 \def\chapfonts{%
   \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
@@ -2436,12 +2253,14 @@ end
 
 % Markup style setup for left and right quotes.
 \defmarkupstylesetup\markupsetuplq{%
-  \expandafter\let\expandafter \temp \csname markupsetuplq\currentmarkupstyle\endcsname
+  \expandafter\let\expandafter \temp
+    \csname markupsetuplq\currentmarkupstyle\endcsname
   \ifx\temp\relax \markupsetuplqdefault \else \temp \fi
 }
 
 \defmarkupstylesetup\markupsetuprq{%
-  \expandafter\let\expandafter \temp \csname markupsetuprq\currentmarkupstyle\endcsname
+  \expandafter\let\expandafter \temp
+    \csname markupsetuprq\currentmarkupstyle\endcsname
   \ifx\temp\relax \markupsetuprqdefault \else \temp \fi
 }
 
@@ -2454,28 +2273,31 @@ end
 
 \gdef\markupsetcodequoteleft{\let`\codequoteleft}
 \gdef\markupsetcodequoteright{\let'\codequoteright}
-
-\gdef\markupsetnoligaturesquoteleft{\let`\noligaturesquoteleft}
 }
 
 \let\markupsetuplqcode \markupsetcodequoteleft
 \let\markupsetuprqcode \markupsetcodequoteright
+%
 \let\markupsetuplqexample \markupsetcodequoteleft
 \let\markupsetuprqexample \markupsetcodequoteright
+%
+\let\markupsetuplqkbd     \markupsetcodequoteleft
+\let\markupsetuprqkbd     \markupsetcodequoteright
+%
+\let\markupsetuplqsamp \markupsetcodequoteleft
+\let\markupsetuprqsamp \markupsetcodequoteright
+%
 \let\markupsetuplqverb \markupsetcodequoteleft
 \let\markupsetuprqverb \markupsetcodequoteright
+%
 \let\markupsetuplqverbatim \markupsetcodequoteleft
 \let\markupsetuprqverbatim \markupsetcodequoteright
 
-\let\markupsetuplqsamp \markupsetnoligaturesquoteleft
-\let\markupsetuplqkbd \markupsetnoligaturesquoteleft
-
-% Allow an option to not replace quotes with a regular directed right
-% quote/apostrophe (char 0x27), but instead use the undirected quote
-% from cmtt (char 0x0d).  The undirected quote is ugly, so don't make it
-% the default, but it works for pasting with more pdf viewers (at least
-% evince), the lilypond developers report.  xpdf does work with the
-% regular 0x27.
+% Allow an option to not use regular directed right quote/apostrophe
+% (char 0x27), but instead the undirected quote from cmtt (char 0x0d).
+% The undirected quote is ugly, so don't make it the default, but it
+% works for pasting with more pdf viewers (at least evince), the
+% lilypond developers report.  xpdf does work with the regular 0x27.
 %
 \def\codequoteright{%
   \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
@@ -2499,33 +2321,83 @@ end
   \else \char'22 \fi
 }
 
+% Commands to set the quote options.
+% 
+\parseargdef\codequoteundirected{%
+  \def\temp{#1}%
+  \ifx\temp\onword
+    \expandafter\let\csname SETtxicodequoteundirected\endcsname
+      = t%
+  \else\ifx\temp\offword
+    \expandafter\let\csname SETtxicodequoteundirected\endcsname
+      = \relax
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @codequoteundirected value `\temp', must be on|off}%
+  \fi\fi
+}
+%
+\parseargdef\codequotebacktick{%
+  \def\temp{#1}%
+  \ifx\temp\onword
+    \expandafter\let\csname SETtxicodequotebacktick\endcsname
+      = t%
+  \else\ifx\temp\offword
+    \expandafter\let\csname SETtxicodequotebacktick\endcsname
+      = \relax
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @codequotebacktick value `\temp', must be on|off}%
+  \fi\fi
+}
+
 % [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font.
 \def\noligaturesquoteleft{\relax\lq}
 
 % Count depth in font-changes, for error checks
 \newcount\fontdepth \fontdepth=0
 
-%% Add scribe-like font environments, plus @l for inline lisp (usually sans
-%% serif) and @ii for TeX italic
+% Font commands.
 
-% \smartitalic{ARG} outputs arg in italics, followed by an italic correction
-% unless the following character is such as not to need one.
-\def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else
-                    \ptexslash\fi\fi\fi}
-\def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx}
-\def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx}
+% #1 is the font command (\sl or \it), #2 is the text to slant.
+% If we are in a monospaced environment, however, 1) always use \ttsl,
+% and 2) do not add an italic correction.
+\def\dosmartslant#1#2{%
+  \ifusingtt 
+    {{\ttsl #2}\let\next=\relax}%
+    {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}%
+  \next
+}
+\def\smartslanted{\dosmartslant\sl}
+\def\smartitalic{\dosmartslant\it}
 
-% like \smartslanted except unconditionally uses \ttsl.
-% @var is set to this for defun arguments.
-\def\ttslanted#1{{\ttsl #1}\futurelet\next\smartitalicx}
+% Output an italic correction unless \next (presumed to be the following
+% character) is such as not to need one.
+\def\smartitaliccorrection{%
+  \ifx\next,%
+  \else\ifx\next-%
+  \else\ifx\next.%
+  \else\ptexslash
+  \fi\fi\fi
+  \aftersmartic
+}
+
+% Unconditional use \ttsl, and no ic.  @var is set to this for defuns.
+\def\ttslanted#1{{\ttsl #1}}
 
 % @cite is like \smartslanted except unconditionally use \sl.  We never want
 % ttsl for book titles, do we?
-\def\cite#1{{\sl #1}\futurelet\next\smartitalicx}
+\def\cite#1{{\sl #1}\futurelet\next\smartitaliccorrection}
+
+\def\aftersmartic{}
+\def\var#1{%
+  \let\saveaftersmartic = \aftersmartic
+  \def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}%
+  \smartslanted{#1}%
+}
 
 \let\i=\smartitalic
 \let\slanted=\smartslanted
-\def\var#1{{\setupmarkupstyle{var}\smartslanted{#1}}}
 \let\dfn=\smartslanted
 \let\emph=\smartitalic
 
@@ -2575,34 +2447,12 @@ end
 % @samp.
 \def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}}
 
-% definition of @key that produces a lozenge.  Doesn't adjust to text size.
-%\setfont\keyrm\rmshape{8}{1000}{OT1}
-%\font\keysy=cmsy9
-%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
-%  \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
-%    \vbox{\hrule\kern-0.4pt
-%     \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
-%    \kern-0.4pt\hrule}%
-%  \kern-.06em\raise0.4pt\hbox{\angleright}}}}
+% @indicateurl is \samp, that is, with quotes.
+\let\indicateurl=\samp
 
-% definition of @key with no lozenge.  If the current font is already
-% monospace, don't change it; that way, we respect @kbdinputstyle.  But
-% if it isn't monospace, then use \tt.
-%
-\def\key#1{{\setupmarkupstyle{key}%
-  \nohyphenation
-  \ifmonospace\else\tt\fi
-  #1}\null}
-
-% ctrl is no longer a Texinfo command.
-\def\ctrl #1{{\tt \rawbackslash \hat}#1}
-
-% @file, @option are the same as @samp.
-\let\file=\samp
-\let\option=\samp
-
-% @code is a modification of @t,
-% which makes spaces the same size as normal in the surrounding text.
+% @code (and similar) prints in typewriter, but with spaces the same
+% size as normal in the surrounding text, without hyphenation, etc.
+% This is a subroutine for that.
 \def\tclose#1{%
   {%
     % Change normal interword space to be same as for the current font.
@@ -2621,13 +2471,13 @@ end
     \plainfrenchspacing
     #1%
   }%
-  \null
+  \null % reset spacefactor to 1000
 }
 
 % We *must* turn on hyphenation at `-' and `_' in @code.
 % Otherwise, it is too hard to avoid overfull hboxes
 % in the Emacs manual, the Library manual, etc.
-
+%
 % Unfortunately, TeX uses one parameter (\hyphenchar) to control
 % both hyphenation at - and hyphenation within words.
 % We must therefore turn them both off (\tclose does that)
@@ -2646,14 +2496,16 @@ end
      \let-\codedash
      \let_\codeunder
     \else
-     \let-\realdash
+     \let-\normaldash
      \let_\realunder
     \fi
     \codex
   }
 }
 
-\def\realdash{-}
+\def\codex #1{\tclose{#1}\endgroup}
+
+\def\normaldash{-}
 \def\codedash{-\discretionary{}{}{}}
 \def\codeunder{%
   % this is all so @math{@code{var_name}+1} can work.  In math mode, _
@@ -2666,12 +2518,11 @@ end
              \discretionary{}{}{}}%
             {\_}%
 }
-\def\codex #1{\tclose{#1}\endgroup}
 
 % An additional complication: the above will allow breaks after, e.g.,
-% each of the four underscores in __typeof__.  This is undesirable in
-% some manuals, especially if they don't have long identifiers in
-% general.  @allowcodebreaks provides a way to control this.
+% each of the four underscores in __typeof__.  This is bad.
+% @allowcodebreaks provides a document-level way to turn breaking at -
+% and _ on and off.
 %
 \newif\ifallowcodebreaks  \allowcodebreakstrue
 
@@ -2686,63 +2537,25 @@ end
     \allowcodebreaksfalse
   \else
     \errhelp = \EMsimple
-    \errmessage{Unknown @allowcodebreaks option `\txiarg'}%
+    \errmessage{Unknown @allowcodebreaks option `\txiarg', must be true|false}%
   \fi\fi
 }
 
-% @kbd is like @code, except that if the argument is just one @key command,
-% then @kbd has no effect.
-\def\kbd#1{{\setupmarkupstyle{kbd}\def\look{#1}\expandafter\kbdfoo\look??\par}}
-
-% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
-%   `example' (@kbd uses ttsl only inside of @example and friends),
-%   or `code' (@kbd uses normal tty font always).
-\parseargdef\kbdinputstyle{%
-  \def\txiarg{#1}%
-  \ifx\txiarg\worddistinct
-    \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
-  \else\ifx\txiarg\wordexample
-    \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
-  \else\ifx\txiarg\wordcode
-    \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
-  \else
-    \errhelp = \EMsimple
-    \errmessage{Unknown @kbdinputstyle option `\txiarg'}%
-  \fi\fi\fi
-}
-\def\worddistinct{distinct}
-\def\wordexample{example}
-\def\wordcode{code}
-
-% Default is `distinct'.
-\kbdinputstyle distinct
-
-\def\xkey{\key}
-\def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
-\ifx\one\xkey\ifx\threex\three \key{#2}%
-\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
-\else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi}
-
-% For @indicateurl, @env, @command quotes seem unnecessary, so use \code.
-\let\indicateurl=\code
-\let\env=\code
+% For @command, @env, @file, @option quotes seem unnecessary,
+% so use \code rather than \samp.
 \let\command=\code
-
-% @clicksequence{File @click{} Open ...}
-\def\clicksequence#1{\begingroup #1\endgroup}
-
-% @clickstyle @arrow   (by default)
-\parseargdef\clickstyle{\def\click{#1}}
-\def\click{\arrow}
+\let\env=\code
+\let\file=\code
+\let\option=\code
 
 % @uref (abbreviation for `urlref') takes an optional (comma-separated)
 % second argument specifying the text to display and an optional third
 % arg as text to display instead of (rather than in addition to) the url
-% itself.  First (mandatory) arg is the url.  Perhaps eventually put in
-% a hypertex \special here.
-%
-\def\uref#1{\douref #1,,,\finish}
-\def\douref#1,#2,#3,#4\finish{\begingroup
+% itself.  First (mandatory) arg is the url.
+% (This \urefnobreak definition isn't used now, leaving it for a while
+% for comparison.)
+\def\urefnobreak#1{\dourefnobreak #1,,,\finish}
+\def\dourefnobreak#1,#2,#3,#4\finish{\begingroup
   \unsepspaces
   \pdfurl{#1}%
   \setbox0 = \hbox{\ignorespaces #3}%
@@ -2763,6 +2576,103 @@ end
   \endlink
 \endgroup}
 
+% This \urefbreak definition is the active one.
+\def\urefbreak{\begingroup \urefcatcodes \dourefbreak}
+\let\uref=\urefbreak
+\def\dourefbreak#1{\urefbreakfinish #1,,,\finish}
+\def\urefbreakfinish#1,#2,#3,#4\finish{% doesn't work in @example
+  \unsepspaces
+  \pdfurl{#1}%
+  \setbox0 = \hbox{\ignorespaces #3}%
+  \ifdim\wd0 > 0pt
+    \unhbox0 % third arg given, show only that
+  \else
+    \setbox0 = \hbox{\ignorespaces #2}%
+    \ifdim\wd0 > 0pt
+      \ifpdf
+        \unhbox0             % PDF: 2nd arg given, show only it
+      \else
+        \unhbox0\ (\urefcode{#1})% DVI: 2nd arg given, show both it and url
+      \fi
+    \else
+      \urefcode{#1}% only url given, so show it
+    \fi
+  \fi
+  \endlink
+\endgroup}
+
+% Allow line breaks around only a few characters (only).
+\def\urefcatcodes{%
+  \catcode\ampChar=\active   \catcode\dotChar=\active
+  \catcode\hashChar=\active  \catcode\questChar=\active
+  \catcode\slashChar=\active
+}
+{
+  \urefcatcodes
+  %
+  \global\def\urefcode{\begingroup
+    \setupmarkupstyle{code}%
+    \urefcatcodes
+    \let&\urefcodeamp
+    \let.\urefcodedot
+    \let#\urefcodehash
+    \let?\urefcodequest
+    \let/\urefcodeslash
+    \codex
+  }
+  %
+  % By default, they are just regular characters.
+  \global\def&{\normalamp}
+  \global\def.{\normaldot}
+  \global\def#{\normalhash}
+  \global\def?{\normalquest}
+  \global\def/{\normalslash}
+}
+
+% we put a little stretch before and after the breakable chars, to help
+% line breaking of long url's.  The unequal skips make look better in
+% cmtt at least, especially for dots.
+\def\urefprestretch{\urefprebreak \hskip0pt plus.13em }
+\def\urefpoststretch{\urefpostbreak \hskip0pt plus.1em }
+%
+\def\urefcodeamp{\urefprestretch \&\urefpoststretch}
+\def\urefcodedot{\urefprestretch .\urefpoststretch}
+\def\urefcodehash{\urefprestretch \#\urefpoststretch}
+\def\urefcodequest{\urefprestretch ?\urefpoststretch}
+\def\urefcodeslash{\futurelet\next\urefcodeslashfinish}
+{
+  \catcode`\/=\active
+  \global\def\urefcodeslashfinish{%
+    \urefprestretch \slashChar
+    % Allow line break only after the final / in a sequence of
+    % slashes, to avoid line break between the slashes in http://.
+    \ifx\next/\else \urefpoststretch \fi
+  }
+}
+
+% One more complication: by default we'll break after the special
+% characters, but some people like to break before the special chars, so
+% allow that.  Also allow no breaking at all, for manual control.
+% 
+\parseargdef\urefbreakstyle{%
+  \def\txiarg{#1}%
+  \ifx\txiarg\wordnone
+    \def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak}
+  \else\ifx\txiarg\wordbefore
+    \def\urefprebreak{\allowbreak}\def\urefpostbreak{\nobreak}
+  \else\ifx\txiarg\wordafter
+    \def\urefprebreak{\nobreak}\def\urefpostbreak{\allowbreak}
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @urefbreakstyle setting `\txiarg'}%
+  \fi\fi\fi
+}
+\def\wordafter{after}
+\def\wordbefore{before}
+\def\wordnone{none}
+
+\urefbreakstyle after
+
 % @url synonym for @uref, since that's how everyone uses it.
 %
 \let\url=\uref
@@ -2784,6 +2694,67 @@ end
   \let\email=\uref
 \fi
 
+% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
+%   `example' (@kbd uses ttsl only inside of @example and friends),
+%   or `code' (@kbd uses normal tty font always).
+\parseargdef\kbdinputstyle{%
+  \def\txiarg{#1}%
+  \ifx\txiarg\worddistinct
+    \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
+  \else\ifx\txiarg\wordexample
+    \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
+  \else\ifx\txiarg\wordcode
+    \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @kbdinputstyle setting `\txiarg'}%
+  \fi\fi\fi
+}
+\def\worddistinct{distinct}
+\def\wordexample{example}
+\def\wordcode{code}
+
+% Default is `distinct'.
+\kbdinputstyle distinct
+
+% @kbd is like @code, except that if the argument is just one @key command,
+% then @kbd has no effect.
+\def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}}
+
+\def\xkey{\key}
+\def\kbdsub#1#2#3\par{%
+  \def\one{#1}\def\three{#3}\def\threex{??}%
+  \ifx\one\xkey\ifx\threex\three \key{#2}%
+  \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
+  \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi
+}
+
+% definition of @key that produces a lozenge.  Doesn't adjust to text size.
+%\setfont\keyrm\rmshape{8}{1000}{OT1}
+%\font\keysy=cmsy9
+%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
+%  \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
+%    \vbox{\hrule\kern-0.4pt
+%     \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
+%    \kern-0.4pt\hrule}%
+%  \kern-.06em\raise0.4pt\hbox{\angleright}}}}
+
+% definition of @key with no lozenge.  If the current font is already
+% monospace, don't change it; that way, we respect @kbdinputstyle.  But
+% if it isn't monospace, then use \tt.
+%
+\def\key#1{{\setupmarkupstyle{key}%
+  \nohyphenation
+  \ifmonospace\else\tt\fi
+  #1}\null}
+
+% @clicksequence{File @click{} Open ...}
+\def\clicksequence#1{\begingroup #1\endgroup}
+
+% @clickstyle @arrow   (by default)
+\parseargdef\clickstyle{\def\click{#1}}
+\def\click{\arrow}
+
 % Typeset a dimension, e.g., `in' or `pt'.  The only reason for the
 % argument is to make the input look right: @dmn{pt} instead of @dmn{}pt.
 %
@@ -2805,6 +2776,7 @@ end
   \ifx\temp\empty \else
     \space ({\unsepspaces \ignorespaces \temp \unskip})%
   \fi
+  \null % reset \spacefactor=1000
 }
 
 % @abbr for "Comput. J." and the like.
@@ -2817,10 +2789,222 @@ end
   \ifx\temp\empty \else
     \space ({\unsepspaces \ignorespaces \temp \unskip})%
   \fi
+  \null % reset \spacefactor=1000
+}
+
+% @asis just yields its argument.  Used with @table, for example.
+%
+\def\asis#1{#1}
+
+% @math outputs its argument in math mode.
+%
+% One complication: _ usually means subscripts, but it could also mean
+% an actual _ character, as in @math{@var{some_variable} + 1}.  So make
+% _ active, and distinguish by seeing if the current family is \slfam,
+% which is what @var uses.
+{
+  \catcode`\_ = \active
+  \gdef\mathunderscore{%
+    \catcode`\_=\active
+    \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
+  }
+}
+% Another complication: we want \\ (and @\) to output a math (or tt) \.
+% FYI, plain.tex uses \\ as a temporary control sequence (for no
+% particular reason), but this is not advertised and we don't care.
+%
+% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\.
+\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi}
+%
+\def\math{%
+  \tex
+  \mathunderscore
+  \let\\ = \mathbackslash
+  \mathactive
+  % make the texinfo accent commands work in math mode
+  \let\"=\ddot
+  \let\'=\acute
+  \let\==\bar
+  \let\^=\hat
+  \let\`=\grave
+  \let\u=\breve
+  \let\v=\check
+  \let\~=\tilde
+  \let\dotaccent=\dot
+  $\finishmath
+}
+\def\finishmath#1{#1$\endgroup}  % Close the group opened by \tex.
+
+% Some active characters (such as <) are spaced differently in math.
+% We have to reset their definitions in case the @math was an argument
+% to a command which sets the catcodes (such as @item or @section).
+%
+{
+  \catcode`^ = \active
+  \catcode`< = \active
+  \catcode`> = \active
+  \catcode`+ = \active
+  \catcode`' = \active
+  \gdef\mathactive{%
+    \let^ = \ptexhat
+    \let< = \ptexless
+    \let> = \ptexgtr
+    \let+ = \ptexplus
+    \let' = \ptexquoteright
+  }
+}
+
+% ctrl is no longer a Texinfo command, but leave this definition for fun.
+\def\ctrl #1{{\tt \rawbackslash \hat}#1}
+
+% @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}.
+% Ignore unless FMTNAME == tex; then it is like @iftex and @tex,
+% except specified as a normal braced arg, so no newlines to worry about.
+% 
+\def\outfmtnametex{tex}
+%
+\long\def\inlinefmt#1{\doinlinefmt #1,\finish}
+\long\def\doinlinefmt#1,#2,\finish{%
+  \def\inlinefmtname{#1}%
+  \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi
+}
+% For raw, must switch into @tex before parsing the argument, to avoid
+% setting catcodes prematurely.  Doing it this way means that, for
+% example, @inlineraw{html, foo{bar} gets a parse error instead of being
+% ignored.  But this isn't important because if people want a literal
+% *right* brace they would have to use a command anyway, so they may as
+% well use a command to get a left brace too.  We could re-use the
+% delimiter character idea from \verb, but it seems like overkill.
+% 
+\long\def\inlineraw{\tex \doinlineraw}
+\long\def\doinlineraw#1{\doinlinerawtwo #1,\finish}
+\def\doinlinerawtwo#1,#2,\finish{%
+  \def\inlinerawname{#1}%
+  \ifx\inlinerawname\outfmtnametex \ignorespaces #2\fi
+  \endgroup % close group opened by \tex.
 }
 
 
 \message{glyphs,}
+% and logos.
+
+% @@ prints an @, as does @atchar{}.
+\def\@{\char64 }
+\let\atchar=\@
+
+% @{ @} @lbracechar{} @rbracechar{} all generate brace characters.
+% Unless we're in typewriter, use \ecfont because the CM text fonts do
+% not have braces, and we don't want to switch into math.
+\def\mylbrace{{\ifmonospace\else\ecfont\fi \char123}}
+\def\myrbrace{{\ifmonospace\else\ecfont\fi \char125}}
+\let\{=\mylbrace \let\lbracechar=\{
+\let\}=\myrbrace \let\rbracechar=\}
+\begingroup
+  % Definitions to produce \{ and \} commands for indices,
+  % and @{ and @} for the aux/toc files.
+  \catcode`\{ = \other \catcode`\} = \other
+  \catcode`\[ = 1 \catcode`\] = 2
+  \catcode`\! = 0 \catcode`\\ = \other
+  !gdef!lbracecmd[\{]%
+  !gdef!rbracecmd[\}]%
+  !gdef!lbraceatcmd[@{]%
+  !gdef!rbraceatcmd[@}]%
+!endgroup
+
+% @comma{} to avoid , parsing problems.
+\let\comma = ,
+
+% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent
+% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H.
+\let\, = \ptexc
+\let\dotaccent = \ptexdot
+\def\ringaccent#1{{\accent23 #1}}
+\let\tieaccent = \ptext
+\let\ubaraccent = \ptexb
+\let\udotaccent = \d
+
+% Other special characters: @questiondown @exclamdown @ordf @ordm
+% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss.
+\def\questiondown{?`}
+\def\exclamdown{!`}
+\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}}
+\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}}
+
+% Dotless i and dotless j, used for accents.
+\def\imacro{i}
+\def\jmacro{j}
+\def\dotless#1{%
+  \def\temp{#1}%
+  \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi
+  \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi
+  \else \errmessage{@dotless can be used only with i or j}%
+  \fi\fi
+}
+
+% The \TeX{} logo, as in plain, but resetting the spacing so that a
+% period following counts as ending a sentence.  (Idea found in latex.)
+%
+\edef\TeX{\TeX \spacefactor=1000 }
+
+% @LaTeX{} logo.  Not quite the same results as the definition in
+% latex.ltx, since we use a different font for the raised A; it's most
+% convenient for us to use an explicitly smaller font, rather than using
+% the \scriptstyle font (since we don't reset \scriptstyle and
+% \scriptscriptstyle).
+%
+\def\LaTeX{%
+  L\kern-.36em
+  {\setbox0=\hbox{T}%
+   \vbox to \ht0{\hbox{%
+     \ifx\textnominalsize\xwordpt
+       % for 10pt running text, \lllsize (8pt) is too small for the A in LaTeX.
+       % Revert to plain's \scriptsize, which is 7pt.
+       \count255=\the\fam $\fam\count255 \scriptstyle A$%
+     \else
+       % For 11pt, we can use our lllsize.
+       \selectfonts\lllsize A%
+     \fi
+     }%
+     \vss
+  }}%
+  \kern-.15em
+  \TeX
+}
+
+% Some math mode symbols.
+\def\bullet{$\ptexbullet$}
+\def\geq{\ifmmode \ge\else $\ge$\fi}
+\def\leq{\ifmmode \le\else $\le$\fi}
+\def\minus{\ifmmode -\else $-$\fi}
+
+% @dots{} outputs an ellipsis using the current font.
+% We do .5em per period so that it has the same spacing in the cm
+% typewriter fonts as three actual period characters; on the other hand,
+% in other typewriter fonts three periods are wider than 1.5em.  So do
+% whichever is larger.
+%
+\def\dots{%
+  \leavevmode
+  \setbox0=\hbox{...}% get width of three periods
+  \ifdim\wd0 > 1.5em
+    \dimen0 = \wd0
+  \else
+    \dimen0 = 1.5em
+  \fi
+  \hbox to \dimen0{%
+    \hskip 0pt plus.25fil
+    .\hskip 0pt plus1fil
+    .\hskip 0pt plus1fil
+    .\hskip 0pt plus.5fil
+  }%
+}
+
+% @enddots{} is an end-of-sentence ellipsis.
+%
+\def\enddots{%
+  \dots
+  \spacefactor=\endofsentencespacefactor
+}
 
 % @point{}, @result{}, @expansion{}, @print{}, @equiv{}.
 %
@@ -2842,7 +3026,7 @@ end
 {\tentt \global\dimen0 = 3em}% Width of the box.
 \dimen2 = .55pt % Thickness of rules
 % The text. (`r' is open on the right, `e' somewhat less so on the left.)
-\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
+\setbox0 = \hbox{\kern-.75pt \reducedsf \putworderror\kern-1.5pt}
 %
 \setbox\errorbox=\hbox to \dimen0{\hfil
    \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
@@ -2963,12 +3147,17 @@ end
   % hopefully nobody will notice/care.
   \edef\ecsize{\csname\curfontsize ecsize\endcsname}%
   \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}%
-  \ifx\curfontstyle\bfstylename
-    % bold:
-    \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
+  \ifmonospace
+    % typewriter:
+    \font\thisecfont = ectt\ecsize \space at \nominalsize
   \else
-    % regular:
-    \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
+    \ifx\curfontstyle\bfstylename
+      % bold:
+      \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
+    \else
+      % regular:
+      \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
+    \fi
   \fi
   \thisecfont
 }
@@ -2991,7 +3180,7 @@ end
 %  Textures 1.7.7 (preloaded format=plain 93.10.14)  (68K)  16 APR 2004 02:38
 % so we'll define it if necessary.
 %
-\ifx\Orb\undefined
+\ifx\Orb\thisisundefined
 \def\Orb{\mathhexbox20D}
 \fi
 
@@ -3019,8 +3208,9 @@ end
 \newif\ifsetshortcontentsaftertitlepage
  \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue
 
-\parseargdef\shorttitlepage{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
-        \endgroup\page\hbox{}\page}
+\parseargdef\shorttitlepage{%
+  \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}%
+  \endgroup\page\hbox{}\page}
 
 \envdef\titlepage{%
   % Open one extra group, as we want to close it in the middle of \Etitlepage.
@@ -3080,14 +3270,28 @@ end
   \finishedtitlepagetrue
 }
 
-%%% Macros to be used within @titlepage:
+% Settings used for typesetting titles: no hyphenation, no indentation,
+% don't worry much about spacing, ragged right.  This should be used
+% inside a \vbox, and fonts need to be set appropriately first.  Because
+% it is always used for titles, nothing else, we call \rmisbold.  \par
+% should be specified before the end of the \vbox, since a vbox is a group.
+% 
+\def\raggedtitlesettings{%
+  \rmisbold
+  \hyphenpenalty=10000
+  \parindent=0pt
+  \tolerance=5000
+  \ptexraggedright
+}
+
+% Macros to be used within @titlepage:
 
 \let\subtitlerm=\tenrm
 \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}
 
 \parseargdef\title{%
   \checkenv\titlepage
-  \leftline{\titlefonts\rmisbold #1}
+  \vbox{\titlefonts \raggedtitlesettings #1\par}%
   % print a rule at the page bottom also.
   \finishedtitlepagefalse
   \vskip4pt \hrule height 4pt width \hsize \vskip4pt
@@ -3113,7 +3317,7 @@ end
 }
 
 
-%%% Set up page headings and footings.
+% Set up page headings and footings.
 
 \let\thispage=\folio
 
@@ -3207,10 +3411,14 @@ end
 
 \def\headings #1 {\csname HEADINGS#1\endcsname}
 
-\def\HEADINGSoff{%
-\global\evenheadline={\hfil} \global\evenfootline={\hfil}
-\global\oddheadline={\hfil} \global\oddfootline={\hfil}}
-\HEADINGSoff
+\def\headingsoff{% non-global headings elimination
+  \evenheadline={\hfil}\evenfootline={\hfil}%
+   \oddheadline={\hfil}\oddfootline={\hfil}%
+}
+
+\def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting
+\HEADINGSoff  % it's the default
+
 % When we turn headings on, set the page number to 1.
 % For double-sided printing, put current file name in lower left corner,
 % chapter name on inside top of right hand pages, document
@@ -3261,7 +3469,7 @@ end
 % This produces Day Month Year style of output.
 % Only define if not already defined, in case a txi-??.tex file has set
 % up a different format (e.g., txi-cs.tex does this).
-\ifx\today\undefined
+\ifx\today\thisisundefined
 \def\today{%
   \number\day\space
   \ifcase\month
@@ -3322,7 +3530,7 @@ end
     \begingroup
       \advance\leftskip by-\tableindent
       \advance\hsize by\tableindent
-      \advance\rightskip by0pt plus1fil
+      \advance\rightskip by0pt plus1fil\relax
       \leavevmode\unhbox0\par
     \endgroup
     %
@@ -3808,18 +4016,18 @@ end
 \setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
 \global\advance\multitablelinespace by-\ht0
 \fi
-%% Test to see if parskip is larger than space between lines of
-%% table. If not, do nothing.
-%%        If so, set to same dimension as multitablelinespace.
+% Test to see if parskip is larger than space between lines of
+% table. If not, do nothing.
+%        If so, set to same dimension as multitablelinespace.
 \ifdim\multitableparskip>\multitablelinespace
 \global\multitableparskip=\multitablelinespace
-\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
-                                      %% than skip between lines in the table.
+\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller
+                                      % than skip between lines in the table.
 \fi%
 \ifdim\multitableparskip=0pt
 \global\multitableparskip=\multitablelinespace
-\global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
-                                      %% than skip between lines in the table.
+\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller
+                                      % than skip between lines in the table.
 \fi}
 
 
@@ -3980,7 +4188,7 @@ end
     % ..., but we might end up with active ones in the argument if
     % we're called from @code, as @code{@value{foo-bar_}}, though.
     % So \let them to their normal equivalents.
-    \let-\realdash \let_\normalunderscore
+    \let-\normaldash \let_\normalunderscore
   }
 }
 
@@ -4020,7 +4228,7 @@ end
 }
 \def\ifsetfail{\doignore{ifset}}
 
-% @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
+% @ifclear VAR ... @end executes the `...' iff VAR has never been
 % defined with @set, or has been undefined with @clear.
 %
 % The `\else' inside the `\doifset' parameter is a trick to reuse the
@@ -4031,6 +4239,35 @@ end
 \def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}}
 \def\ifclearfail{\doignore{ifclear}}
 
+% @ifcommandisdefined CMD ... @end executes the `...' if CMD (written
+% without the @) is in fact defined.  We can only feasibly check at the
+% TeX level, so something like `mathcode' is going to considered
+% defined even though it is not a Texinfo command.
+% 
+\makecond{ifcommanddefined}
+\def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}}
+%
+\def\doifcmddefined#1#2{{%
+    \makevalueexpandable
+    \let\next=\empty
+    \expandafter\ifx\csname #2\endcsname\relax
+      #1% If not defined, \let\next as above.
+    \fi
+    \expandafter
+  }\next
+}
+\def\ifcmddefinedfail{\doignore{ifcommanddefined}}
+
+% @ifcommandnotdefined CMD ... handled similar to @ifclear above.
+\makecond{ifcommandnotdefined}
+\def\ifcommandnotdefined{%
+  \parsearg{\doifcmddefined{\else \let\next=\ifcmdnotdefinedfail}}}
+\def\ifcmdnotdefinedfail{\doignore{ifcommandnotdefined}}
+
+% Set the `txicommandconditionals' variable, so documents have a way to
+% test if the @ifcommand...defined conditionals are available.
+\set txicommandconditionals
+
 % @dircategory CATEGORY  -- specify a category of the dir file
 % which this file should belong to.  Ignore this in TeX.
 \let\dircategory=\comment
@@ -4134,11 +4371,14 @@ end
   \def\@{@}% change to @@ when we switch to @ as escape char in index files.
   \def\ {\realbackslash\space }%
   %
-  % Need these in case \tex is in effect and \{ is a \delimiter again.
-  % But can't use \lbracecmd and \rbracecmd because texindex assumes
-  % braces and backslashes are used only as delimiters.
-  \let\{ = \mylbrace
-  \let\} = \myrbrace
+  % Need these unexpandable (because we define \tt as a dummy)
+  % definitions when @{ or @} appear in index entry text.  Also, more
+  % complicated, when \tex is in effect and \{ is a \delimiter again.
+  % We can't use \lbracecmd and \rbracecmd because texindex assumes
+  % braces and backslashes are used only as delimiters.  Perhaps we
+  % should define @lbrace and @rbrace commands a la @comma.
+  \def\{{{\tt\char123}}%
+  \def\}{{\tt\char125}}%
   %
   % I don't entirely understand this, but when an index entry is
   % generated from a macro call, the \endinput which \scanmacro inserts
@@ -4191,7 +4431,7 @@ end
 \def\commondummies{%
   %
   % \definedummyword defines \#1 as \string\#1\space, thus effectively
-  % preventing its expansion.  This is used only for control% words,
+  % preventing its expansion.  This is used only for control words,
   % not control letters, because the \space would be incorrect for
   % control characters, but is needed to separate the control word
   % from whatever follows.
@@ -4210,6 +4450,7 @@ end
   \commondummiesnofonts
   %
   \definedummyletter\_%
+  \definedummyletter\-%
   %
   % Non-English letters.
   \definedummyword\AA
@@ -4246,20 +4487,25 @@ end
   \definedummyword\TeX
   %
   % Assorted special characters.
+  \definedummyword\arrow
   \definedummyword\bullet
   \definedummyword\comma
   \definedummyword\copyright
   \definedummyword\registeredsymbol
   \definedummyword\dots
   \definedummyword\enddots
+  \definedummyword\entrybreak
   \definedummyword\equiv
   \definedummyword\error
   \definedummyword\euro
+  \definedummyword\expansion
+  \definedummyword\geq
   \definedummyword\guillemetleft
   \definedummyword\guillemetright
   \definedummyword\guilsinglleft
   \definedummyword\guilsinglright
-  \definedummyword\expansion
+  \definedummyword\lbracechar
+  \definedummyword\leq
   \definedummyword\minus
   \definedummyword\ogonek
   \definedummyword\pounds
@@ -4271,6 +4517,7 @@ end
   \definedummyword\quoteleft
   \definedummyword\quoteright
   \definedummyword\quotesinglbase
+  \definedummyword\rbracechar
   \definedummyword\result
   \definedummyword\textdegree
   %
@@ -4316,19 +4563,27 @@ end
   \definedummyword\b
   \definedummyword\i
   \definedummyword\r
+  \definedummyword\sansserif
   \definedummyword\sc
+  \definedummyword\slanted
   \definedummyword\t
   %
   % Commands that take arguments.
+  \definedummyword\abbr
   \definedummyword\acronym
+  \definedummyword\anchor
   \definedummyword\cite
   \definedummyword\code
   \definedummyword\command
   \definedummyword\dfn
+  \definedummyword\dmn
   \definedummyword\email
   \definedummyword\emph
   \definedummyword\env
   \definedummyword\file
+  \definedummyword\image
+  \definedummyword\indicateurl
+  \definedummyword\inforef
   \definedummyword\kbd
   \definedummyword\key
   \definedummyword\math
@@ -4356,7 +4611,7 @@ end
   \def\definedummyaccent##1{\let##1\asis}%
   % We can just ignore other control letters.
   \def\definedummyletter##1{\let##1\empty}%
-  % Hopefully, all control words can become @asis.
+  % All control words become @asis by default; overrides below.
   \let\definedummyword\definedummyaccent
   %
   \commondummiesnofonts
@@ -4368,8 +4623,17 @@ end
   %
   \def\ { }%
   \def\@{@}%
-  % how to handle braces?
   \def\_{\normalunderscore}%
+  \def\-{}% @- shouldn't affect sorting
+  %
+  % Unfortunately, texindex is not prepared to handle braces in the
+  % content at all.  So for index sorting, we map @{ and @} to strings
+  % starting with |, since that ASCII character is between ASCII { and }.
+  \def\{{|a}%
+  \def\lbracechar{|a}%
+  %
+  \def\}{|b}%
+  \def\rbracechar{|b}%
   %
   % Non-English letters.
   \def\AA{AA}%
@@ -4397,6 +4661,7 @@ end
   %
   % Assorted special characters.
   % (The following {} will end up in the sort string, but that's ok.)
+  \def\arrow{->}%
   \def\bullet{bullet}%
   \def\comma{,}%
   \def\copyright{copyright}%
@@ -4406,10 +4671,12 @@ end
   \def\error{error}%
   \def\euro{euro}%
   \def\expansion{==>}%
+  \def\geq{>=}%
   \def\guillemetleft{<<}%
   \def\guillemetright{>>}%
   \def\guilsinglleft{<}%
   \def\guilsinglright{>}%
+  \def\leq{<=}%
   \def\minus{-}%
   \def\point{.}%
   \def\pounds{pounds}%
@@ -4424,6 +4691,9 @@ end
   \def\result{=>}%
   \def\textdegree{o}%
   %
+  \expandafter\ifx\csname SETtxiindexlquoteignore\endcsname\relax
+  \else \indexlquoteignore \fi
+  %
   % We need to get rid of all macros, leaving only the arguments (if present).
   % Of course this is not nearly correct, but it is the best we can do for now.
   % makeinfo does not expand macros in the argument to @deffn, which ends up
@@ -4437,6 +4707,11 @@ end
   \macrolist
 }
 
+% Undocumented (for FSFS 2nd ed.): @set txiindexlquoteignore makes us
+% ignore left quotes in the sort term.
+{\catcode`\`=\active
+ \gdef\indexlquoteignore{\let`=\empty}}
+
 \let\indexbackslash=0  %overridden during \printindex.
 \let\SETmarginindex=\relax % put index entries in margin (undocumented)?
 
@@ -4534,10 +4809,9 @@ end
 %
 % ..., ready, GO:
 %
-\def\safewhatsit#1{%
-\ifhmode
+\def\safewhatsit#1{\ifhmode
   #1%
-\else
+ \else
   % \lastskip and \lastpenalty cannot both be nonzero simultaneously.
   \whatsitskip = \lastskip
   \edef\lastskipmacro{\the\lastskip}%
@@ -4561,7 +4835,6 @@ end
     % to re-insert the same penalty (values >10000 are used for various
     % signals); since we just inserted a non-discardable item, any
     % following glue (such as a \parskip) would be a breakpoint.  For example:
-    %
     %   @deffn deffn-whatever
     %   @vindex index-whatever
     %   Description.
@@ -4574,8 +4847,7 @@ end
     % (the whatsit from the \write), so we must insert a \nobreak.
     \nobreak\vskip\whatsitskip
   \fi
-\fi
-}
+\fi}
 
 % The index entry written in the file actually looks like
 %  \entry {sortstring}{page}{topic}
@@ -4694,7 +4966,6 @@ end
 % But this freezes the catcodes in the argument, and can cause problems to
 % @code, which sets - active.  This problem was fixed by a kludge---
 % ``-'' was active throughout whole index, but this isn't really right.
-%
 % The right solution is to prevent \entry from swallowing the whole text.
 %                                 --kasal, 21nov03
 \def\entry{%
@@ -4731,10 +5002,17 @@ end
     % columns.
     \vskip 0pt plus1pt
     %
+    % When reading the text of entry, convert explicit line breaks
+    % from @* into spaces.  The user might give these in long section
+    % titles, for instance.
+    \def\*{\unskip\space\ignorespaces}%
+    \def\entrybreak{\hfil\break}%
+    %
     % Swallow the left brace of the text (first parameter):
     \afterassignment\doentry
     \let\temp =
 }
+\def\entrybreak{\unskip\space\ignorespaces}%
 \def\doentry{%
     \bgroup % Instead of the swallowed brace.
       \noindent
@@ -4967,7 +5245,22 @@ end
 \message{sectioning,}
 % Chapters, sections, etc.
 
-% \unnumberedno is an oxymoron, of course.  But we count the unnumbered
+% Let's start with @part.
+\outer\parseargdef\part{\partzzz{#1}}
+\def\partzzz#1{%
+  \chapoddpage
+  \null
+  \vskip.3\vsize  % move it down on the page a bit
+  \begingroup
+    \noindent \titlefonts\rmisbold #1\par % the text
+    \let\lastnode=\empty      % no node to associate with
+    \writetocentry{part}{#1}{}% but put it in the toc
+    \headingsoff              % no headline or footline on the part page
+    \chapoddpage
+  \endgroup
+}
+
+% \unnumberedno is an oxymoron.  But we count the unnumbered
 % sections so that we can refer to them unambiguously in the pdf
 % outlines by their "section number".  We avoid collisions with chapter
 % numbers by starting them at 10000.  (If a document ever has 10000
@@ -5046,8 +5339,8 @@ end
 \chardef\maxseclevel = 3
 %
 % A numbered section within an unnumbered changes to unnumbered too.
-% To achive this, remember the "biggest" unnum. sec. we are currently in:
-\chardef\unmlevel = \maxseclevel
+% To achieve this, remember the "biggest" unnum. sec. we are currently in:
+\chardef\unnlevel = \maxseclevel
 %
 % Trace whether the current chapter is an appendix or not:
 % \chapheadtype is "N" or "A", unnumbered chapters are ignored.
@@ -5072,8 +5365,8 @@ end
   % The heading type:
   \def\headtype{#1}%
   \if \headtype U%
-    \ifnum \absseclevel < \unmlevel
-      \chardef\unmlevel = \absseclevel
+    \ifnum \absseclevel < \unnlevel
+      \chardef\unnlevel = \absseclevel
     \fi
   \else
     % Check for appendix sections:
@@ -5085,10 +5378,10 @@ end
       \fi\fi
     \fi
     % Check for numbered within unnumbered:
-    \ifnum \absseclevel > \unmlevel
+    \ifnum \absseclevel > \unnlevel
       \def\headtype{U}%
     \else
-      \chardef\unmlevel = 3
+      \chardef\unnlevel = 3
     \fi
   \fi
   % Now print the heading:
@@ -5174,7 +5467,8 @@ end
   \global\let\subsubsection = \appendixsubsubsec
 }
 
-\outer\parseargdef\unnumbered{\unnmhead0{#1}} % normally unnmhead0 calls unnumberedzzz
+% normally unnmhead0 calls unnumberedzzz:
+\outer\parseargdef\unnumbered{\unnmhead0{#1}}
 \def\unnumberedzzz#1{%
   \global\secno=0 \global\subsecno=0 \global\subsubsecno=0
     \global\advance\unnumberedno by 1
@@ -5218,40 +5512,47 @@ end
 \let\top\unnumbered
 
 % Sections.
+% 
 \outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz
 \def\seczzz#1{%
   \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
   \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}%
 }
 
-\outer\parseargdef\appendixsection{\apphead1{#1}} % normally calls appendixsectionzzz
+% normally calls appendixsectionzzz:
+\outer\parseargdef\appendixsection{\apphead1{#1}}
 \def\appendixsectionzzz#1{%
   \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
   \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}%
 }
 \let\appendixsec\appendixsection
 
-\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} % normally calls unnumberedseczzz
+% normally calls unnumberedseczzz:
+\outer\parseargdef\unnumberedsec{\unnmhead1{#1}}
 \def\unnumberedseczzz#1{%
   \global\subsecno=0 \global\subsubsecno=0  \global\advance\secno by 1
   \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}%
 }
 
 % Subsections.
-\outer\parseargdef\numberedsubsec{\numhead2{#1}} % normally calls numberedsubseczzz
+% 
+% normally calls numberedsubseczzz:
+\outer\parseargdef\numberedsubsec{\numhead2{#1}}
 \def\numberedsubseczzz#1{%
   \global\subsubsecno=0  \global\advance\subsecno by 1
   \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}%
 }
 
-\outer\parseargdef\appendixsubsec{\apphead2{#1}} % normally calls appendixsubseczzz
+% normally calls appendixsubseczzz:
+\outer\parseargdef\appendixsubsec{\apphead2{#1}}
 \def\appendixsubseczzz#1{%
   \global\subsubsecno=0  \global\advance\subsecno by 1
   \sectionheading{#1}{subsec}{Yappendix}%
                  {\appendixletter.\the\secno.\the\subsecno}%
 }
 
-\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} %normally calls unnumberedsubseczzz
+% normally calls unnumberedsubseczzz:
+\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}}
 \def\unnumberedsubseczzz#1{%
   \global\subsubsecno=0  \global\advance\subsecno by 1
   \sectionheading{#1}{subsec}{Ynothing}%
@@ -5259,21 +5560,25 @@ end
 }
 
 % Subsubsections.
-\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} % normally numberedsubsubseczzz
+% 
+% normally numberedsubsubseczzz:
+\outer\parseargdef\numberedsubsubsec{\numhead3{#1}}
 \def\numberedsubsubseczzz#1{%
   \global\advance\subsubsecno by 1
   \sectionheading{#1}{subsubsec}{Ynumbered}%
                  {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}%
 }
 
-\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} % normally appendixsubsubseczzz
+% normally appendixsubsubseczzz:
+\outer\parseargdef\appendixsubsubsec{\apphead3{#1}}
 \def\appendixsubsubseczzz#1{%
   \global\advance\subsubsecno by 1
   \sectionheading{#1}{subsubsec}{Yappendix}%
                  {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}%
 }
 
-\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} %normally unnumberedsubsubseczzz
+% normally unnumberedsubsubseczzz:
+\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}}
 \def\unnumberedsubsubseczzz#1{%
   \global\advance\subsubsecno by 1
   \sectionheading{#1}{subsubsec}{Ynothing}%
@@ -5289,14 +5594,6 @@ end
 
 % Define @majorheading, @heading and @subheading
 
-% NOTE on use of \vbox for chapter headings, section headings, and such:
-%       1) We use \vbox rather than the earlier \line to permit
-%          overlong headings to fold.
-%       2) \hyphenpenalty is set to 10000 because hyphenation in a
-%          heading is obnoxious; this forbids it.
-%       3) Likewise, headings look best if no \parindent is used, and
-%          if justification is not attempted.  Hence \raggedright.
-
 \def\majorheading{%
   {\advance\chapheadingskip by 10pt \chapbreak }%
   \parsearg\chapheadingzzz
@@ -5304,10 +5601,8 @@ end
 
 \def\chapheading{\chapbreak \parsearg\chapheadingzzz}
 \def\chapheadingzzz#1{%
-  {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                    \parindent=0pt\ptexraggedright
-                    \rmisbold #1\hfill}}%
-  \bigskip \par\penalty 200\relax
+  \vbox{\chapfonts \raggedtitlesettings #1\par}%
+  \nobreak\bigskip \nobreak
   \suppressfirstparagraphindent
 }
 
@@ -5323,14 +5618,13 @@ end
 % (including whitespace, linebreaking, etc. around it),
 % given all the information in convenient, parsed form.
 
-%%% Args are the skip and penalty (usually negative)
+% Args are the skip and penalty (usually negative)
 \def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi}
 
-%%% Define plain chapter starts, and page on/off switching for it
 % Parameter controlling skip before chapter headings (if needed)
-
 \newskip\chapheadingskip
 
+% Define plain chapter starts, and page on/off switching for it.
 \def\chapbreak{\dobreak \chapheadingskip {-4000}}
 \def\chappager{\par\vfill\supereject}
 % Because \domark is called before \chapoddpage, the filler page will
@@ -5340,9 +5634,8 @@ end
   \chappager
   \ifodd\pageno \else
     \begingroup
-      \evenheadline={\hfil}\evenfootline={\hfil}%
-      \oddheadline={\hfil}\oddfootline={\hfil}%
-      \hbox to 0pt{}%
+      \headingsoff
+      \null
       \chappager
     \endgroup
   \fi
@@ -5468,8 +5761,7 @@ end
     %
     % Typeset the actual heading.
     \nobreak % Avoid page breaks at the interline glue.
-    \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright
-          \hangindent=\wd0 \centerparametersmaybe
+    \vbox{\raggedtitlesettings \hangindent=\wd0 \centerparametersmaybe
           \unhbox0 #1\par}%
   }%
   \nobreak\bigskip % no page break after a chapter title
@@ -5491,18 +5783,18 @@ end
 \def\setchapterstyle #1 {\csname CHAPF#1\endcsname}
 %
 \def\unnchfopen #1{%
-\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                       \parindent=0pt\ptexraggedright
-                       \rmisbold #1\hfill}}\bigskip \par\nobreak
+  \chapoddpage
+  \vbox{\chapfonts \raggedtitlesettings #1\par}%
+  \nobreak\bigskip\nobreak
 }
 \def\chfopen #1#2{\chapoddpage {\chapfonts
 \vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}%
 \par\penalty 5000 %
 }
 \def\centerchfopen #1{%
-\chapoddpage {\chapfonts \vbox{\hyphenpenalty=10000\tolerance=5000
-                       \parindent=0pt
-                       \hfill {\rmisbold #1}\hfill}}\bigskip \par\nobreak
+  \chapoddpage
+  \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}%
+  \nobreak\bigskip \nobreak
 }
 \def\CHAPFopen{%
   \global\let\chapmacro=\chfopen
@@ -5534,6 +5826,8 @@ end
 %
 \def\sectionheading#1#2#3#4{%
   {%
+    \checkenv{}% should not be in an environment.
+    %
     % Switch to the right set of fonts.
     \csname #2fonts\endcsname \rmisbold
     %
@@ -5645,15 +5939,15 @@ end
   %
   % We'll almost certainly start a paragraph next, so don't let that
   % glue accumulate.  (Not a breakpoint because it's preceded by a
-  % discardable item.)
+  % discardable item.)  However, when a paragraph is not started next
+  % (\startdefun, \cartouche, \center, etc.), this needs to be wiped out
+  % or the negative glue will cause weirdly wrong output, typically
+  % obscuring the section heading with something else.
   \vskip-\parskip
   %
-  % This is purely so the last item on the list is a known \penalty >
-  % 10000.  This is so \startdefun can avoid allowing breakpoints after
-  % section headings.  Otherwise, it would insert a valid breakpoint between:
-  %
-  %   @section sec-whatever
-  %   @deffn def-whatever
+  % This is so the last item on the main vertical list is a known
+  % \penalty > 10000, so \startdefun, etc., can recognize the situation
+  % and do the needful.
   \penalty 10001
 }
 
@@ -5785,6 +6079,7 @@ end
 \def\summarycontents{%
   \startcontents{\putwordShortTOC}%
     %
+    \let\partentry = \shortpartentry
     \let\numchapentry = \shortchapentry
     \let\appentry = \shortchapentry
     \let\unnchapentry = \shortunnchapentry
@@ -5840,6 +6135,19 @@ end
 % The last argument is the page number.
 % The arguments in between are the chapter number, section number, ...
 
+% Parts, in the main contents.  Replace the part number, which doesn't
+% exist, with an empty box.  Let's hope all the numbers have the same width.
+% Also ignore the page number, which is conventionally not printed.
+\def\numeralbox{\setbox0=\hbox{8}\hbox to \wd0{\hfil}}
+\def\partentry#1#2#3#4{\dochapentry{\numeralbox\labelspace#1}{}}
+%
+% Parts, in the short toc.
+\def\shortpartentry#1#2#3#4{%
+  \penalty-300
+  \vskip.5\baselineskip plus.15\baselineskip minus.1\baselineskip
+  \shortchapentry{{\bf #1}}{\numeralbox}{}{}%
+}
+
 % Chapters, in the main contents.
 \def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}}
 %
@@ -5929,9 +6237,9 @@ end
 \message{environments,}
 % @foo ... @end foo.
 
-% @tex ... @end tex    escapes into raw Tex temporarily.
+% @tex ... @end tex    escapes into raw TeX temporarily.
 % One exception: @ is still an escape character, so that @end tex works.
-% But \@ or @@ will get a plain tex @ character.
+% But \@ or @@ will get a plain @ character.
 
 \envdef\tex{%
   \setupmarkupstyle{tex}%
@@ -5948,6 +6256,10 @@ end
   \catcode`\'=\other
   \escapechar=`\\
   %
+  % ' is active in math mode (mathcode"8000).  So reset it, and all our
+  % other math active characters (just in case), to plain's definitions.
+  \mathactive
+  %
   \let\b=\ptexb
   \let\bullet=\ptexbullet
   \let\c=\ptexc
@@ -6051,6 +6363,12 @@ end
   \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
   % Flag to tell @lisp, etc., not to narrow margin.
   \let\nonarrowing = t%
+  %
+  % If this cartouche directly follows a sectioning command, we need the
+  % \parskip glue (backspaced over by default) or the cartouche can
+  % collide with the section heading.
+  \ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi
+  %
   \vbox\bgroup
       \baselineskip=0pt\parskip=0pt\lineskip=0pt
       \carttop
@@ -6064,7 +6382,7 @@ end
 	      \lineskip=\normlskip
 	      \parskip=\normpskip
 	      \vskip -\parskip
-	      \comment % For explanation, see the end of \def\group.
+	      \comment % For explanation, see the end of def\group.
 }
 \def\Ecartouche{%
               \ifhmode\par\fi
@@ -6150,41 +6468,42 @@ end
 }
 
 % We often define two environments, @foo and @smallfoo.
-% Let's do it by one command:
-\def\makedispenv #1#2{
-  \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}
-  \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}
+% Let's do it in one command.  #1 is the env name, #2 the definition.
+\def\makedispenvdef#1#2{%
+  \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}%
+  \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}%
   \expandafter\let\csname E#1\endcsname \afterenvbreak
   \expandafter\let\csname Esmall#1\endcsname \afterenvbreak
 }
 
-% Define two synonyms:
-\def\maketwodispenvs #1#2#3{
-  \makedispenv{#1}{#3}
-  \makedispenv{#2}{#3}
+% Define two environment synonyms (#1 and #2) for an environment.
+\def\maketwodispenvdef#1#2#3{%
+  \makedispenvdef{#1}{#3}%
+  \makedispenvdef{#2}{#3}%
 }
-
-% @lisp: indented, narrowed, typewriter font; @example: same as @lisp.
+%
+% @lisp: indented, narrowed, typewriter font;
+% @example: same as @lisp.
 %
 % @smallexample and @smalllisp: use smaller fonts.
 % Originally contributed by Pavel@xerox.
 %
-\maketwodispenvs {lisp}{example}{%
+\maketwodispenvdef{lisp}{example}{%
   \nonfillstart
   \tt\setupmarkupstyle{example}%
   \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
-  \gobble       % eat return
+  \gobble % eat return
 }
 % @display/@smalldisplay: same as @lisp except keep current font.
 %
-\makedispenv {display}{%
+\makedispenvdef{display}{%
   \nonfillstart
   \gobble
 }
 
 % @format/@smallformat: same as @display except don't narrow margins.
 %
-\makedispenv{format}{%
+\makedispenvdef{format}{%
   \let\nonarrowing = t%
   \nonfillstart
   \gobble
@@ -6203,7 +6522,7 @@ end
 \envdef\flushright{%
   \let\nonarrowing = t%
   \nonfillstart
-  \advance\leftskip by 0pt plus 1fill
+  \advance\leftskip by 0pt plus 1fill\relax
   \gobble
 }
 \let\Eflushright = \afterenvbreak
@@ -6238,43 +6557,28 @@ end
 % we're doing normal filling.  So, when using \aboveenvbreak and
 % \afterenvbreak, temporarily make \parskip 0.
 %
+\makedispenvdef{quotation}{\quotationstart}
+%
 \def\quotationstart{%
-  {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
-  \parindent=0pt
-  %
-  % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
+  \indentedblockstart % same as \indentedblock, but increase right margin too.
   \ifx\nonarrowing\relax
-    \advance\leftskip by \lispnarrowing
     \advance\rightskip by \lispnarrowing
-    \exdentamount = \lispnarrowing
-  \else
-    \let\nonarrowing = \relax
   \fi
   \parsearg\quotationlabel
 }
 
-\envdef\quotation{%
-  \setnormaldispenv
-  \quotationstart
-}
-
-\envdef\smallquotation{%
-  \setsmalldispenv
-  \quotationstart
-}
-\let\Esmallquotation = \Equotation
-
 % We have retained a nonzero parskip for the environment, since we're
 % doing normal filling.
 %
 \def\Equotation{%
   \par
-  \ifx\quotationauthor\undefined\else
+  \ifx\quotationauthor\thisisundefined\else
     % indent a bit.
     \leftline{\kern 2\leftskip \sl ---\quotationauthor}%
   \fi
   {\parskip=0pt \afterenvbreak}%
 }
+\def\Esmallquotation{\Equotation}
 
 % If we're given an argument, typeset it in bold with a colon after.
 \def\quotationlabel#1{%
@@ -6284,6 +6588,32 @@ end
   \fi
 }
 
+% @indentedblock is like @quotation, but indents only on the left and
+% has no optional argument.
+% 
+\makedispenvdef{indentedblock}{\indentedblockstart}
+%
+\def\indentedblockstart{%
+  {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip
+  \parindent=0pt
+  %
+  % @cartouche defines \nonarrowing to inhibit narrowing at next level down.
+  \ifx\nonarrowing\relax
+    \advance\leftskip by \lispnarrowing
+    \exdentamount = \lispnarrowing
+  \else
+    \let\nonarrowing = \relax
+  \fi
+}
+
+% Keep a nonzero parskip for the environment, since we're doing normal filling.
+%
+\def\Eindentedblock{%
+  \par
+  {\parskip=0pt \afterenvbreak}%
+}
+\def\Esmallindentedblock{\Eindentedblock}
+
 
 % LaTeX-like @verbatim...@end verbatim and @verb{<char>...<char>}
 % If we want to allow any <char> as delimiter,
@@ -6331,21 +6661,28 @@ end
 
 % Setup for the @verbatim environment
 %
-% Real tab expansion
+% Real tab expansion.
 \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
 %
-\def\starttabbox{\setbox0=\hbox\bgroup}
+% We typeset each line of the verbatim in an \hbox, so we can handle
+% tabs.  The \global is in case the verbatim line starts with an accent,
+% or some other command that starts with a begin-group.  Otherwise, the
+% entire \verbbox would disappear at the corresponding end-group, before
+% it is typeset.  Meanwhile, we can't have nested verbatim commands
+% (can we?), so the \global won't be overwriting itself.
+\newbox\verbbox
+\def\starttabbox{\global\setbox\verbbox=\hbox\bgroup}
 %
 \begingroup
   \catcode`\^^I=\active
   \gdef\tabexpand{%
     \catcode`\^^I=\active
     \def^^I{\leavevmode\egroup
-      \dimen0=\wd0 % the width so far, or since the previous tab
-      \divide\dimen0 by\tabw
-      \multiply\dimen0 by\tabw % compute previous multiple of \tabw
-      \advance\dimen0 by\tabw  % advance to next multiple of \tabw
-      \wd0=\dimen0 \box0 \starttabbox
+      \dimen\verbbox=\wd\verbbox % the width so far, or since the previous tab
+      \divide\dimen\verbbox by\tabw
+      \multiply\dimen\verbbox by\tabw % compute previous multiple of \tabw
+      \advance\dimen\verbbox by\tabw  % advance to next multiple of \tabw
+      \wd\verbbox=\dimen\verbbox \box\verbbox \starttabbox
     }%
   }
 \endgroup
@@ -6354,15 +6691,16 @@ end
 \def\setupverbatim{%
   \let\nonarrowing = t%
   \nonfillstart
-  % Easiest (and conventionally used) font for verbatim
-  \tt
-  \def\par{\leavevmode\egroup\box0\endgraf}%
+  \tt % easiest (and conventionally used) font for verbatim
+  % The \leavevmode here is for blank lines.  Otherwise, we would
+  % never \starttabox and the \egroup would end verbatim mode.
+  \def\par{\leavevmode\egroup\box\verbbox\endgraf}%
   \tabexpand
   \setupmarkupstyle{verbatim}%
   % Respect line breaks,
   % print special symbols as themselves, and
-  % make each space count
-  % must do in this order:
+  % make each space count.
+  % Must do in this order:
   \obeylines \uncatcodespecials \sepspaces
   \everypar{\starttabbox}%
 }
@@ -6419,6 +6757,7 @@ end
     \makevalueexpandable
     \setupverbatim
     \indexnofonts       % Allow `@@' and other weird things in file names.
+    \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}%
     \input #1
     \afterenvbreak
   }%
@@ -6468,7 +6807,7 @@ end
     % commands also insert a nobreak penalty, and we don't want to allow
     % a break between a section heading and a defun.
     %
-    % As a minor refinement, we avoid "club" headers by signalling
+    % As a further refinement, we avoid "club" headers by signalling
     % with penalty of 10003 after the very first @deffn in the
     % sequence (see above), and penalty of 10002 after any following
     % @def command.
@@ -6505,7 +6844,7 @@ end
     #1#2 \endheader
     % common ending:
     \interlinepenalty = 10000
-    \advance\rightskip by 0pt plus 1fil
+    \advance\rightskip by 0pt plus 1fil\relax
     \endgraf
     \nobreak\vskip -\parskip
     \penalty\defunpenalty  % signal to \startdefun and \dodefunx
@@ -6535,13 +6874,36 @@ end
 \def\domakedefun#1#2#3{%
   \envdef#1{%
     \startdefun
+    \doingtypefnfalse    % distinguish typed functions from all else
     \parseargusing\activeparens{\printdefunline#3}%
   }%
   \def#2{\dodefunx#1}%
   \def#3%
 }
 
-%%% Untyped functions:
+\newif\ifdoingtypefn       % doing typed function?
+\newif\ifrettypeownline    % typeset return type on its own line?
+
+% @deftypefnnewline on|off says whether the return type of typed functions
+% are printed on their own line.  This affects @deftypefn, @deftypefun,
+% @deftypeop, and @deftypemethod.
+% 
+\parseargdef\deftypefnnewline{%
+  \def\temp{#1}%
+  \ifx\temp\onword
+    \expandafter\let\csname SETtxideftypefnnl\endcsname
+      = \empty
+  \else\ifx\temp\offword
+    \expandafter\let\csname SETtxideftypefnnl\endcsname
+      = \relax
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @txideftypefnnl value `\temp',
+                must be on|off}%
+  \fi\fi
+}
+
+% Untyped functions:
 
 % @deffn category name args
 \makedefun{deffn}{\deffngeneral{}}
@@ -6560,7 +6922,7 @@ end
   \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}%
 }
 
-%%% Typed functions:
+% Typed functions:
 
 % @deftypefn category type name args
 \makedefun{deftypefn}{\deftypefngeneral{}}
@@ -6575,10 +6937,11 @@ end
 %
 \def\deftypefngeneral#1#2 #3 #4 #5\endheader{%
   \dosubind{fn}{\code{#4}}{#1}%
+  \doingtypefntrue
   \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
 }
 
-%%% Typed variables:
+% Typed variables:
 
 % @deftypevr category type var args
 \makedefun{deftypevr}{\deftypecvgeneral{}}
@@ -6596,7 +6959,7 @@ end
   \defname{#2}{#3}{#4}\defunargs{#5\unskip}%
 }
 
-%%% Untyped variables:
+% Untyped variables:
 
 % @defvr category var args
 \makedefun{defvr}#1 {\deftypevrheader{#1} {} }
@@ -6607,7 +6970,8 @@ end
 % \defcvof {category of}class var args
 \def\defcvof#1#2 {\deftypecvof{#1}#2 {} }
 
-%%% Type:
+% Types:
+
 % @deftp category name args
 \makedefun{deftp}#1 #2 #3\endheader{%
   \doind{tp}{\code{#2}}%
@@ -6635,25 +6999,49 @@ end
 % We are followed by (but not passed) the arguments, if any.
 %
 \def\defname#1#2#3{%
+  \par
   % Get the values of \leftskip and \rightskip as they were outside the @def...
   \advance\leftskip by -\defbodyindent
   %
-  % How we'll format the type name.  Putting it in brackets helps
+  % Determine if we are typesetting the return type of a typed function
+  % on a line by itself.
+  \rettypeownlinefalse
+  \ifdoingtypefn  % doing a typed function specifically?
+    % then check user option for putting return type on its own line:
+    \expandafter\ifx\csname SETtxideftypefnnl\endcsname\relax \else
+      \rettypeownlinetrue
+    \fi
+  \fi
+  %
+  % How we'll format the category name.  Putting it in brackets helps
   % distinguish it from the body text that may end up on the next line
   % just below it.
   \def\temp{#1}%
   \setbox0=\hbox{\kern\deflastargmargin \ifx\temp\empty\else [\rm\temp]\fi}
   %
-  % Figure out line sizes for the paragraph shape.
+  % Figure out line sizes for the paragraph shape.  We'll always have at
+  % least two.
+  \tempnum = 2
+  %
   % The first line needs space for \box0; but if \rightskip is nonzero,
   % we need only space for the part of \box0 which exceeds it:
   \dimen0=\hsize  \advance\dimen0 by -\wd0  \advance\dimen0 by \rightskip
+  %
+  % If doing a return type on its own line, we'll have another line.
+  \ifrettypeownline
+    \advance\tempnum by 1
+    \def\maybeshapeline{0in \hsize}%
+  \else
+    \def\maybeshapeline{}%
+  \fi
+  %
   % The continuations:
   \dimen2=\hsize  \advance\dimen2 by -\defargsindent
-  % (plain.tex says that \dimen1 should be used only as global.)
-  \parshape 2 0in \dimen0 \defargsindent \dimen2
   %
-  % Put the type name to the right margin.
+  % The final paragraph shape:
+  \parshape \tempnum  0in \dimen0  \maybeshapeline  \defargsindent \dimen2
+  %
+  % Put the category name at the right margin.
   \noindent
   \hbox to 0pt{%
     \hfil\box0 \kern-\hsize
@@ -6675,8 +7063,16 @@ end
     % . this still does not fix the ?` and !` ligatures, but so far no
     %   one has made identifiers using them :).
     \df \tt
-    \def\temp{#2}% return value type
-    \ifx\temp\empty\else \tclose{\temp} \fi
+    \def\temp{#2}% text of the return type
+    \ifx\temp\empty\else
+      \tclose{\temp}% typeset the return type
+      \ifrettypeownline
+        % put return type on its own line; prohibit line break following:
+        \hfil\vadjust{\nobreak}\break  
+      \else
+        \space  % type on same line, so just followed by a space
+      \fi
+    \fi           % no return type
     #3% output function name
   }%
   {\rm\enskip}% hskip 0.5 em of \tenrm
@@ -6696,7 +7092,10 @@ end
   \df \sl \hyphenchar\font=0
   %
   % On the other hand, if an argument has two dashes (for instance), we
-  % want a way to get ttsl.  Let's try @var for that.
+  % want a way to get ttsl.  We used to recommend @var for that, so
+  % leave the code in, but it's strange for @var to lead to typewriter.
+  % Nowadays we recommend @code, since the difference between a ttsl hyphen
+  % and a tt hyphen is pretty tiny.  @code also disables ?` !`.
   \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}%
   #1%
   \sl\hyphenchar\font=45
@@ -6794,7 +7193,7 @@ end
 
 % To do this right we need a feature of e-TeX, \scantokens,
 % which we arrange to emulate with a temporary file in ordinary TeX.
-\ifx\eTeXversion\undefined
+\ifx\eTeXversion\thisisundefined
   \newwrite\macscribble
   \def\scantokens#1{%
     \toks0={#1}%
@@ -6805,25 +7204,30 @@ end
   }
 \fi
 
-\def\scanmacro#1{%
-  \begingroup
-    \newlinechar`\^^M
-    \let\xeatspaces\eatspaces
-    % Undo catcode changes of \startcontents and \doprintindex
-    % When called from @insertcopying or (short)caption, we need active
-    % backslash to get it printed correctly.  Previously, we had
-    % \catcode`\\=\other instead.  We'll see whether a problem appears
-    % with macro expansion.				--kasal, 19aug04
-    \catcode`\@=0 \catcode`\\=\active \escapechar=`\@
-    % ... and \example
-    \spaceisspace
-    %
-    % Append \endinput to make sure that TeX does not see the ending newline.
-    % I've verified that it is necessary both for e-TeX and for ordinary TeX
-    %							--kasal, 29nov03
-    \scantokens{#1\endinput}%
-  \endgroup
-}
+\def\scanmacro#1{\begingroup
+  \newlinechar`\^^M
+  \let\xeatspaces\eatspaces
+  %
+  % Undo catcode changes of \startcontents and \doprintindex
+  % When called from @insertcopying or (short)caption, we need active
+  % backslash to get it printed correctly.  Previously, we had
+  % \catcode`\\=\other instead.  We'll see whether a problem appears
+  % with macro expansion.				--kasal, 19aug04
+  \catcode`\@=0 \catcode`\\=\active \escapechar=`\@
+  %
+  % ... and for \example:
+  \spaceisspace
+  %
+  % The \empty here causes a following catcode 5 newline to be eaten as
+  % part of reading whitespace after a control sequence.  It does not
+  % eat a catcode 13 newline.  There's no good way to handle the two
+  % cases (untried: maybe e-TeX's \everyeof could help, though plain TeX
+  % would then have different behavior).  See the Macro Details node in
+  % the manual for the workaround we recommend for macros and
+  % line-oriented commands.
+  % 
+  \scantokens{#1\empty}%
+\endgroup}
 
 \def\scanexp#1{%
   \edef\temp{\noexpand\scanmacro{#1}}%
@@ -6877,17 +7281,18 @@ end
 
 % Macro bodies are absorbed as an argument in a context where
 % all characters are catcode 10, 11 or 12, except \ which is active
-% (as in normal texinfo). It is necessary to change the definition of \.
-
+% (as in normal texinfo). It is necessary to change the definition of \
+% to recognize macro arguments; this is the job of \mbodybackslash.
+%
 % Non-ASCII encodings make 8-bit characters active, so un-activate
 % them to avoid their expansion.  Must do this non-globally, to
 % confine the change to the current group.
-
+%
 % It's necessary to have hard CRs when the macro is executed. This is
-% done by  making ^^M (\endlinechar) catcode 12 when reading the macro
+% done by making ^^M (\endlinechar) catcode 12 when reading the macro
 % body, and then making it the \newlinechar in \scanmacro.
-
-\def\scanctxt{%
+%
+\def\scanctxt{% used as subroutine
   \catcode`\"=\other
   \catcode`\+=\other
   \catcode`\<=\other
@@ -6900,13 +7305,13 @@ end
   \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi
 }
 
-\def\scanargctxt{%
+\def\scanargctxt{% used for copying and captions, not macros.
   \scanctxt
   \catcode`\\=\other
   \catcode`\^^M=\other
 }
 
-\def\macrobodyctxt{%
+\def\macrobodyctxt{% used for @macro definitions
   \scanctxt
   \catcode`\{=\other
   \catcode`\}=\other
@@ -6914,32 +7319,56 @@ end
   \usembodybackslash
 }
 
-\def\macroargctxt{%
+\def\macroargctxt{% used when scanning invocations
   \scanctxt
-  \catcode`\\=\other
+  \catcode`\\=0
 }
+% why catcode 0 for \ in the above?  To recognize \\ \{ \} as "escapes"
+% for the single characters \ { }.  Thus, we end up with the "commands"
+% that would be written @\ @{ @} in a Texinfo document.
+% 
+% We already have @{ and @}.  For @\, we define it here, and only for
+% this purpose, to produce a typewriter backslash (so, the @\ that we
+% define for @math can't be used with @macro calls):
+%
+\def\\{\normalbackslash}%
+% 
+% We would like to do this for \, too, since that is what makeinfo does.
+% But it is not possible, because Texinfo already has a command @, for a
+% cedilla accent.  Documents must use @comma{} instead.
+%
+% \anythingelse will almost certainly be an error of some kind.
+
 
 % \mbodybackslash is the definition of \ in @macro bodies.
 % It maps \foo\ => \csname macarg.foo\endcsname => #N
 % where N is the macro parameter number.
 % We define \csname macarg.\endcsname to be \realbackslash, so
 % \\ in macro replacement text gets you a backslash.
-
+%
 {\catcode`@=0 @catcode`@\=@active
  @gdef@usembodybackslash{@let\=@mbodybackslash}
  @gdef@mbodybackslash#1\{@csname macarg.#1@endcsname}
 }
 \expandafter\def\csname macarg.\endcsname{\realbackslash}
 
+\def\margbackslash#1{\char`\#1 }
+
 \def\macro{\recursivefalse\parsearg\macroxxx}
 \def\rmacro{\recursivetrue\parsearg\macroxxx}
 
 \def\macroxxx#1{%
-  \getargs{#1}%           now \macname is the macname and \argl the arglist
+  \getargs{#1}% now \macname is the macname and \argl the arglist
   \ifx\argl\empty       % no arguments
-     \paramno=0%
+     \paramno=0\relax
   \else
      \expandafter\parsemargdef \argl;%
+     \if\paramno>256\relax
+       \ifx\eTeXversion\thisisundefined
+         \errhelp = \EMsimple
+         \errmessage{You need eTeX to compile a file with macros with more than 256 arguments}
+       \fi
+     \fi
   \fi
   \if1\csname ismacro.\the\macname\endcsname
      \message{Warning: redefining \the\macname}%
@@ -6986,46 +7415,269 @@ end
 % an opening brace, and that opening brace is not consumed.
 \def\getargs#1{\getargsxxx#1{}}
 \def\getargsxxx#1#{\getmacname #1 \relax\getmacargs}
-\def\getmacname #1 #2\relax{\macname={#1}}
+\def\getmacname#1 #2\relax{\macname={#1}}
 \def\getmacargs#1{\def\argl{#1}}
 
+% For macro processing make @ a letter so that we can make Texinfo private macro names.
+\edef\texiatcatcode{\the\catcode`\@}
+\catcode `@=11\relax
+
 % Parse the optional {params} list.  Set up \paramno and \paramlist
-% so \defmacro knows what to do.  Define \macarg.blah for each blah
-% in the params list, to be ##N where N is the position in that list.
+% so \defmacro knows what to do.  Define \macarg.BLAH for each BLAH
+% in the params list to some hook where the argument si to be expanded.  If
+% there are less than 10 arguments that hook is to be replaced by ##N where N
+% is the position in that list, that is to say the macro arguments are to be
+% defined `a la TeX in the macro body.  
+%
 % That gets used by \mbodybackslash (above).
-
+%
 % We need to get `macro parameter char #' into several definitions.
-% The technique used is stolen from LaTeX:  let \hash be something
+% The technique used is stolen from LaTeX: let \hash be something
 % unexpandable, insert that wherever you need a #, and then redefine
 % it to # just before using the token list produced.
 %
 % The same technique is used to protect \eatspaces till just before
 % the macro is used.
-
-\def\parsemargdef#1;{\paramno=0\def\paramlist{}%
-        \let\hash\relax\let\xeatspaces\relax\parsemargdefxxx#1,;,}
+%
+% If there are 10 or more arguments, a different technique is used, where the
+% hook remains in the body, and when macro is to be expanded the body is
+% processed again to replace the arguments.
+%
+% In that case, the hook is \the\toks N-1, and we simply set \toks N-1 to the
+% argument N value and then \edef  the body (nothing else will expand because of
+% the catcode regime underwhich the body was input).
+%
+% If you compile with TeX (not eTeX), and you have macros with 10 or more
+% arguments, you need that no macro has more than 256 arguments, otherwise an
+% error is produced.
+\def\parsemargdef#1;{%
+  \paramno=0\def\paramlist{}%
+  \let\hash\relax
+  \let\xeatspaces\relax
+  \parsemargdefxxx#1,;,%
+  % In case that there are 10 or more arguments we parse again the arguments
+  % list to set new definitions for the \macarg.BLAH macros corresponding to
+  % each BLAH argument. It was anyhow needed to parse already once this list
+  % in order to count the arguments, and as macros with at most 9 arguments
+  % are by far more frequent than macro with 10 or more arguments, defining
+  % twice the \macarg.BLAH macros does not cost too much processing power.
+  \ifnum\paramno<10\relax\else
+    \paramno0\relax
+    \parsemmanyargdef@@#1,;,% 10 or more arguments
+  \fi
+}
 \def\parsemargdefxxx#1,{%
   \if#1;\let\next=\relax
   \else \let\next=\parsemargdefxxx
-    \advance\paramno by 1%
+    \advance\paramno by 1
     \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname
         {\xeatspaces{\hash\the\paramno}}%
     \edef\paramlist{\paramlist\hash\the\paramno,}%
   \fi\next}
 
+\def\parsemmanyargdef@@#1,{%
+  \if#1;\let\next=\relax
+  \else 
+    \let\next=\parsemmanyargdef@@
+    \edef\tempb{\eatspaces{#1}}%
+    \expandafter\def\expandafter\tempa
+       \expandafter{\csname macarg.\tempb\endcsname}%
+    % Note that we need some extra \noexpand\noexpand, this is because we
+    % don't want \the  to be expanded in the \parsermacbody  as it uses an
+    % \xdef .
+    \expandafter\edef\tempa
+      {\noexpand\noexpand\noexpand\the\toks\the\paramno}%
+    \advance\paramno by 1\relax
+  \fi\next}
+
 % These two commands read recursive and nonrecursive macro bodies.
 % (They're different since rec and nonrec macros end differently.)
+%
 
+\catcode `\@\texiatcatcode
 \long\def\parsemacbody#1@end macro%
 {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
 \long\def\parsermacbody#1@end rmacro%
 {\xdef\temp{\eatcr{#1}}\endgroup\defmacro}%
+\catcode `\@=11\relax
+
+\let\endargs@\relax
+\let\nil@\relax
+\def\nilm@{\nil@}%
+\long\def\nillm@{\nil@}%
+
+% This macro is expanded during the Texinfo macro expansion, not during its
+% definition.  It gets all the arguments values and assigns them to macros
+% macarg.ARGNAME
+%
+% #1 is the macro name
+% #2 is the list of argument names
+% #3 is the list of argument values
+\def\getargvals@#1#2#3{%
+  \def\macargdeflist@{}%
+  \def\saveparamlist@{#2}% Need to keep a copy for parameter expansion.
+  \def\paramlist{#2,\nil@}%
+  \def\macroname{#1}%
+  \begingroup
+  \macroargctxt
+  \def\argvaluelist{#3,\nil@}%
+  \def\@tempa{#3}%
+  \ifx\@tempa\empty
+    \setemptyargvalues@
+  \else
+    \getargvals@@
+  \fi
+}
 
-% This defines the macro itself. There are six cases: recursive and
-% nonrecursive macros of zero, one, and many arguments.
+% 
+\def\getargvals@@{%
+  \ifx\paramlist\nilm@
+      % Some sanity check needed here that \argvaluelist is also empty.
+      \ifx\argvaluelist\nillm@
+      \else
+        \errhelp = \EMsimple
+        \errmessage{Too many arguments in macro `\macroname'!}%
+      \fi
+      \let\next\macargexpandinbody@
+  \else
+    \ifx\argvaluelist\nillm@
+       % No more arguments values passed to macro.  Set remaining named-arg
+       % macros to empty.
+       \let\next\setemptyargvalues@
+    \else
+      % pop current arg name into \@tempb
+      \def\@tempa##1{\pop@{\@tempb}{\paramlist}##1\endargs@}%
+      \expandafter\@tempa\expandafter{\paramlist}%
+       % pop current argument value into \@tempc
+      \def\@tempa##1{\longpop@{\@tempc}{\argvaluelist}##1\endargs@}%
+      \expandafter\@tempa\expandafter{\argvaluelist}%
+       % Here \@tempb is the current arg name and \@tempc is the current arg value.
+       % First place the new argument macro definition into \@tempd
+       \expandafter\macname\expandafter{\@tempc}%
+       \expandafter\let\csname macarg.\@tempb\endcsname\relax
+       \expandafter\def\expandafter\@tempe\expandafter{%
+         \csname macarg.\@tempb\endcsname}%
+       \edef\@tempd{\long\def\@tempe{\the\macname}}%
+       \push@\@tempd\macargdeflist@
+       \let\next\getargvals@@
+    \fi
+  \fi
+  \next
+}
+
+\def\push@#1#2{%
+  \expandafter\expandafter\expandafter\def
+  \expandafter\expandafter\expandafter#2%
+  \expandafter\expandafter\expandafter{%
+  \expandafter#1#2}%
+}
+
+% Replace arguments by their values in the macro body, and place the result
+% in macro \@tempa
+\def\macvalstoargs@{%
+  %  To do this we use the property that token registers that are \the'ed
+  % within an \edef  expand only once. So we are going to place all argument
+  % values into respective token registers.
+  %
+  % First we save the token context, and initialize argument numbering.
+  \begingroup
+    \paramno0\relax
+    % Then, for each argument number #N, we place the corresponding argument
+    % value into a new token list register \toks#N
+    \expandafter\putargsintokens@\saveparamlist@,;,%
+    % Then, we expand the body so that argument are replaced by their
+    % values. The trick for values not to be expanded themselves is that they
+    % are within tokens and that tokens expand only once in an \edef .
+    \edef\@tempc{\csname mac.\macroname .body\endcsname}%
+    % Now we restore the token stack pointer to free the token list registers
+    % which we have used, but we make sure that expanded body is saved after
+    % group.
+    \expandafter
+  \endgroup
+  \expandafter\def\expandafter\@tempa\expandafter{\@tempc}%
+  }
+
+\def\macargexpandinbody@{% 
+  %% Define the named-macro outside of this group and then close this group. 
+  \expandafter
+  \endgroup
+  \macargdeflist@
+  % First the replace in body the macro arguments by their values, the result
+  % is in \@tempa .
+  \macvalstoargs@
+  % Then we point at the \norecurse or \gobble (for recursive) macro value
+  % with \@tempb .
+  \expandafter\let\expandafter\@tempb\csname mac.\macroname .recurse\endcsname
+  % Depending on whether it is recursive or not, we need some tailing
+  % \egroup .
+  \ifx\@tempb\gobble
+     \let\@tempc\relax
+  \else
+     \let\@tempc\egroup
+  \fi
+  % And now we do the real job:
+  \edef\@tempd{\noexpand\@tempb{\macroname}\noexpand\scanmacro{\@tempa}\@tempc}%
+  \@tempd
+}
+
+\def\putargsintokens@#1,{%
+  \if#1;\let\next\relax
+  \else
+    \let\next\putargsintokens@
+    % First we allocate the new token list register, and give it a temporary
+    % alias \@tempb .
+    \toksdef\@tempb\the\paramno
+    % Then we place the argument value into that token list register.
+    \expandafter\let\expandafter\@tempa\csname macarg.#1\endcsname
+    \expandafter\@tempb\expandafter{\@tempa}%
+    \advance\paramno by 1\relax
+  \fi
+  \next
+}
+
+% Save the token stack pointer into macro #1
+\def\texisavetoksstackpoint#1{\edef#1{\the\@cclvi}}
+% Restore the token stack pointer from number in macro #1
+\def\texirestoretoksstackpoint#1{\expandafter\mathchardef\expandafter\@cclvi#1\relax}
+% newtoks that can be used non \outer .
+\def\texinonouternewtoks{\alloc@ 5\toks \toksdef \@cclvi}
+
+% Tailing missing arguments are set to empty
+\def\setemptyargvalues@{%
+  \ifx\paramlist\nilm@
+    \let\next\macargexpandinbody@
+  \else
+    \expandafter\setemptyargvaluesparser@\paramlist\endargs@
+    \let\next\setemptyargvalues@
+  \fi
+  \next
+}
+
+\def\setemptyargvaluesparser@#1,#2\endargs@{%
+  \expandafter\def\expandafter\@tempa\expandafter{%
+    \expandafter\def\csname macarg.#1\endcsname{}}%
+  \push@\@tempa\macargdeflist@
+  \def\paramlist{#2}%
+}
+
+% #1 is the element target macro
+% #2 is the list macro
+% #3,#4\endargs@ is the list value
+\def\pop@#1#2#3,#4\endargs@{%
+   \def#1{#3}%
+   \def#2{#4}%
+}
+\long\def\longpop@#1#2#3,#4\endargs@{%
+   \long\def#1{#3}%
+   \long\def#2{#4}%
+}
+
+% This defines a Texinfo @macro. There are eight cases: recursive and
+% nonrecursive macros of zero, one, up to nine, and many arguments.
 % Much magic with \expandafter here.
 % \xdef is used so that macro definitions will survive the file
 % they're defined in; @include reads the file inside a group.
+%
 \def\defmacro{%
   \let\hash=##% convert placeholders to macro parameter chars
   \ifrecursive
@@ -7040,17 +7692,25 @@ end
          \expandafter\noexpand\csname\the\macname xxx\endcsname}%
       \expandafter\xdef\csname\the\macname xxx\endcsname##1{%
          \egroup\noexpand\scanmacro{\temp}}%
-    \else % many
-      \expandafter\xdef\csname\the\macname\endcsname{%
-         \bgroup\noexpand\macroargctxt
-         \noexpand\csname\the\macname xx\endcsname}%
-      \expandafter\xdef\csname\the\macname xx\endcsname##1{%
-          \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
-      \expandafter\expandafter
-      \expandafter\xdef
-      \expandafter\expandafter
-        \csname\the\macname xxx\endcsname
-          \paramlist{\egroup\noexpand\scanmacro{\temp}}%
+    \else
+      \ifnum\paramno<10\relax % at most 9
+        \expandafter\xdef\csname\the\macname\endcsname{%
+           \bgroup\noexpand\macroargctxt
+           \noexpand\csname\the\macname xx\endcsname}%
+        \expandafter\xdef\csname\the\macname xx\endcsname##1{%
+            \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
+        \expandafter\expandafter
+        \expandafter\xdef
+        \expandafter\expandafter
+          \csname\the\macname xxx\endcsname
+            \paramlist{\egroup\noexpand\scanmacro{\temp}}%
+      \else % 10 or more
+        \expandafter\xdef\csname\the\macname\endcsname{%
+          \noexpand\getargvals@{\the\macname}{\argl}%
+        }%    
+        \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp
+        \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\gobble
+      \fi
     \fi
   \else
     \ifcase\paramno
@@ -7067,29 +7727,40 @@ end
         \egroup
         \noexpand\norecurse{\the\macname}%
         \noexpand\scanmacro{\temp}\egroup}%
-    \else % many
-      \expandafter\xdef\csname\the\macname\endcsname{%
-         \bgroup\noexpand\macroargctxt
-         \expandafter\noexpand\csname\the\macname xx\endcsname}%
-      \expandafter\xdef\csname\the\macname xx\endcsname##1{%
-          \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
-      \expandafter\expandafter
-      \expandafter\xdef
-      \expandafter\expandafter
-      \csname\the\macname xxx\endcsname
-      \paramlist{%
-          \egroup
-          \noexpand\norecurse{\the\macname}%
-          \noexpand\scanmacro{\temp}\egroup}%
+    \else % at most 9
+      \ifnum\paramno<10\relax
+        \expandafter\xdef\csname\the\macname\endcsname{%
+           \bgroup\noexpand\macroargctxt
+           \expandafter\noexpand\csname\the\macname xx\endcsname}%
+        \expandafter\xdef\csname\the\macname xx\endcsname##1{%
+            \expandafter\noexpand\csname\the\macname xxx\endcsname ##1,}%
+        \expandafter\expandafter
+        \expandafter\xdef
+        \expandafter\expandafter
+        \csname\the\macname xxx\endcsname
+        \paramlist{%
+            \egroup
+            \noexpand\norecurse{\the\macname}%
+            \noexpand\scanmacro{\temp}\egroup}%
+      \else % 10 or more:
+        \expandafter\xdef\csname\the\macname\endcsname{%
+          \noexpand\getargvals@{\the\macname}{\argl}%
+        }%
+        \global\expandafter\let\csname mac.\the\macname .body\endcsname\temp
+        \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\norecurse
+      \fi
     \fi
   \fi}
 
+\catcode `\@\texiatcatcode\relax
+
 \def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}}
 
 % \braceorline decides whether the next nonwhitespace character is a
 % {.  If so it reads up to the closing }, if not, it reads the whole
 % line.  Whatever was read is then fed to the next control sequence
-% as an argument (by \parsebrace or \parsearg)
+% as an argument (by \parsebrace or \parsearg).
+% 
 \def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
 \def\braceorlinexxx{%
   \ifx\nchar\bgroup\else
@@ -7099,7 +7770,8 @@ end
 
 % @alias.
 % We need some trickery to remove the optional spaces around the equal
-% sign.  Just make them active and then expand them all to nothing.
+% sign.  Make them active and then expand them all to nothing.
+%
 \def\alias{\parseargusing\obeyspaces\aliasxxx}
 \def\aliasxxx #1{\aliasyyy#1\relax}
 \def\aliasyyy #1=#2\relax{%
@@ -7120,7 +7792,8 @@ end
 
 % @inforef is relatively simple.
 \def\inforef #1{\inforefzzz #1,,,,**}
-\def\inforefzzz #1,#2,#3,#4**{\putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
+\def\inforefzzz #1,#2,#3,#4**{%
+  \putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}},
   node \samp{\ignorespaces#1{}}}
 
 % @node's only job in TeX is to define \lastnode, which is used in
@@ -7181,11 +7854,32 @@ end
       \toks0 = \expandafter{\lastsection}%
       \immediate \writexrdef{title}{\the\toks0 }%
       \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
-      \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, during \shipout
+      \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout
     }%
   \fi
 }
 
+% @xrefautosectiontitle on|off says whether @section(ing) names are used
+% automatically in xrefs, if the third arg is not explicitly specified.
+% This was provided as a "secret" @set xref-automatic-section-title
+% variable, now it's official.
+% 
+\parseargdef\xrefautomaticsectiontitle{%
+  \def\temp{#1}%
+  \ifx\temp\onword
+    \expandafter\let\csname SETxref-automatic-section-title\endcsname
+      = \empty
+  \else\ifx\temp\offword
+    \expandafter\let\csname SETxref-automatic-section-title\endcsname
+      = \relax
+  \else
+    \errhelp = \EMsimple
+    \errmessage{Unknown @xrefautomaticsectiontitle value `\temp',
+                must be on|off}%
+  \fi\fi
+}
+
+% 
 % @xref, @pxref, and @ref generate cross-references.  For \xrefX, #1 is
 % the node name, #2 the name of the Info cross-reference, #3 the printed
 % node name, #4 the name of the Info file, #5 the name of the printed
@@ -7194,26 +7888,41 @@ end
 \def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]}
 \def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
 \def\ref#1{\xrefX[#1,,,,,,,]}
+%
+\newbox\toprefbox
+\newbox\printedrefnamebox
+\newbox\infofilenamebox
+\newbox\printedmanualbox
+%
 \def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
   \unsepspaces
-  \def\printedmanual{\ignorespaces #5}%
+  %
+  % Get args without leading/trailing spaces.
   \def\printedrefname{\ignorespaces #3}%
-  \setbox1=\hbox{\printedmanual\unskip}%
-  \setbox0=\hbox{\printedrefname\unskip}%
-  \ifdim \wd0 = 0pt
+  \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}%
+  %
+  \def\infofilename{\ignorespaces #4}%
+  \setbox\infofilenamebox = \hbox{\infofilename\unskip}%
+  %
+  \def\printedmanual{\ignorespaces #5}%
+  \setbox\printedmanualbox  = \hbox{\printedmanual\unskip}%
+  %
+  % If the printed reference name (arg #3) was not explicitly given in
+  % the @xref, figure out what we want to use.
+  \ifdim \wd\printedrefnamebox = 0pt
     % No printed node name was explicitly given.
-    \expandafter\ifx\csname SETxref-automatic-section-title\endcsname\relax
-      % Use the node name inside the square brackets.
+    \expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax
+      % Not auto section-title: use node name inside the square brackets.
       \def\printedrefname{\ignorespaces #1}%
     \else
-      % Use the actual chapter/section title appear inside
-      % the square brackets.  Use the real section title if we have it.
-      \ifdim \wd1 > 0pt
-        % It is in another manual, so we don't have it.
+      % Auto section-title: use chapter/section title inside
+      % the square brackets if we have it.
+      \ifdim \wd\printedmanualbox > 0pt
+        % It is in another manual, so we don't have it; use node name.
         \def\printedrefname{\ignorespaces #1}%
       \else
         \ifhavexrefs
-          % We know the real title if we have the xref values.
+          % We (should) know the real title if we have the xref values.
           \def\printedrefname{\refx{#1-title}{}}%
         \else
           % Otherwise just copy the Info node name.
@@ -7227,13 +7936,20 @@ end
   \ifpdf
     {\indexnofonts
      \turnoffactive
+     \makevalueexpandable
      % This expands tokens, so do it after making catcode changes, so _
-     % etc. don't get their TeX definitions.
+     % etc. don't get their TeX definitions.  This ignores all spaces in
+     % #4, including (wrongly) those in the middle of the filename.
      \getfilename{#4}%
      %
-     % See comments at \activebackslashdouble.
-     {\activebackslashdouble \xdef\pdfxrefdest{#1}%
-      \backslashparens\pdfxrefdest}%
+     % This (wrongly) does not take account of leading or trailing
+     % spaces in #1, which should be ignored.
+     \edef\pdfxrefdest{#1}%
+     \ifx\pdfxrefdest\empty
+       \def\pdfxrefdest{Top}% no empty targets
+     \else
+       \txiescapepdf\pdfxrefdest  % escape PDF special chars
+     \fi
      %
      \leavevmode
      \startlink attr{/Border [0 0 0]}%
@@ -7260,29 +7976,42 @@ end
   \iffloat\Xthisreftitle
     % If the user specified the print name (third arg) to the ref,
     % print it instead of our usual "Figure 1.2".
-    \ifdim\wd0 = 0pt
+    \ifdim\wd\printedrefnamebox = 0pt
       \refx{#1-snt}{}%
     \else
       \printedrefname
     \fi
     %
-    % if the user also gave the printed manual name (fifth arg), append
+    % If the user also gave the printed manual name (fifth arg), append
     % "in MANUALNAME".
-    \ifdim \wd1 > 0pt
+    \ifdim \wd\printedmanualbox > 0pt
       \space \putwordin{} \cite{\printedmanual}%
     \fi
   \else
     % node/anchor (non-float) references.
+    % 
+    % If we use \unhbox to print the node names, TeX does not insert
+    % empty discretionaries after hyphens, which means that it will not
+    % find a line break at a hyphen in a node names.  Since some manuals
+    % are best written with fairly long node names, containing hyphens,
+    % this is a loss.  Therefore, we give the text of the node name
+    % again, so it is as if TeX is seeing it for the first time.
+    % 
+    \ifdim \wd\printedmanualbox > 0pt
+      % Cross-manual reference with a printed manual name.
+      % 
+      \crossmanualxref{\cite{\printedmanual\unskip}}%
+    %
+    \else\ifdim \wd\infofilenamebox > 0pt
+      % Cross-manual reference with only an info filename (arg 4), no
+      % printed manual name (arg 5).  This is essentially the same as
+      % the case above; we output the filename, since we have nothing else.
+      % 
+      \crossmanualxref{\code{\infofilename\unskip}}%
     %
-    % If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
-    % insert empty discretionaries after hyphens, which means that it will
-    % not find a line break at a hyphen in a node names.  Since some manuals
-    % are best written with fairly long node names, containing hyphens, this
-    % is a loss.  Therefore, we give the text of the node name again, so it
-    % is as if TeX is seeing it for the first time.
-    \ifdim \wd1 > 0pt
-      \putwordSection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
     \else
+      % Reference within this manual.
+      %
       % _ (for example) has to be the character _ for the purposes of the
       % control sequence corresponding to the node, but it has to expand
       % into the usual \leavevmode...\vrule stuff for purposes of
@@ -7294,7 +8023,7 @@ end
        \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
        \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
       }%
-      % output the `[mynode]' via a macro so it can be overridden.
+      % output the `[mynode]' via the macro below so it can be overridden.
       \xrefprintnodename\printedrefname
       %
       % But we always want a comma and a space:
@@ -7302,11 +8031,37 @@ end
       %
       % output the `page 3'.
       \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
-    \fi
+    \fi\fi
   \fi
   \endlink
 \endgroup}
 
+% Output a cross-manual xref to #1.  Used just above (twice).
+% 
+% Only include the text "Section ``foo'' in" if the foo is neither
+% missing or Top.  Thus, @xref{,,,foo,The Foo Manual} outputs simply
+% "see The Foo Manual", the idea being to refer to the whole manual.
+% 
+% But, this being TeX, we can't easily compare our node name against the
+% string "Top" while ignoring the possible spaces before and after in
+% the input.  By adding the arbitrary 7sp below, we make it much less
+% likely that a real node name would have the same width as "Top" (e.g.,
+% in a monospaced font).  Hopefully it will never happen in practice.
+% 
+% For the same basic reason, we retypeset the "Top" at every
+% reference, since the current font is indeterminate.
+% 
+\def\crossmanualxref#1{%
+  \setbox\toprefbox = \hbox{Top\kern7sp}%
+  \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
+  \ifdim \wd2 > 7sp  % nonempty?
+    \ifdim \wd2 = \wd\toprefbox \else  % same as Top?
+      \putwordSection{} ``\printedrefname'' \putwordin{}\space
+    \fi
+  \fi
+  #1%
+}
+
 % This macro is called from \xrefX for the `[nodename]' part of xref
 % output.  It's a separate macro only so it can be changed more easily,
 % since square brackets don't work well in some documents.  Particularly
@@ -7357,7 +8112,8 @@ end
     \angleleft un\-de\-fined\angleright
     \iflinks
       \ifhavexrefs
-        \message{\linenumber Undefined cross reference `#1'.}%
+        {\toks0 = {#1}% avoid expansion of possibly-complex value
+         \message{\linenumber Undefined cross reference `\the\toks0'.}}%
       \else
         \ifwarnedxrefs\else
           \global\warnedxrefstrue
@@ -7521,7 +8277,7 @@ end
 % space to prevent strange expansion errors.)
 \def\supereject{\par\penalty -20000\footnoteno =0 }
 
-% @footnotestyle is meaningful for info output only.
+% @footnotestyle is meaningful for Info output only.
 \let\footnotestyle=\comment
 
 {\catcode `\@=11
@@ -7584,6 +8340,8 @@ end
   % expands into a box, it must come within the paragraph, lest it
   % provide a place where TeX can split the footnote.
   \footstrut
+  %
+  % Invoke rest of plain TeX footnote routine.
   \futurelet\next\fo@t
 }
 }%end \catcode `\@=11
@@ -7671,7 +8429,7 @@ end
   it from ftp://tug.org/tex/epsf.tex.}
 %
 \def\image#1{%
-  \ifx\epsfbox\undefined
+  \ifx\epsfbox\thisisundefined
     \ifwarnednoepsf \else
       \errhelp = \noepsfhelp
       \errmessage{epsf.tex not found, images will be ignored}%
@@ -7687,7 +8445,7 @@ end
 % #2 is (optional) width, #3 is (optional) height.
 % #4 is (ignored optional) html alt text.
 % #5 is (ignored optional) extension.
-% #6 is just the usual extra ignored arg for parsing this stuff.
+% #6 is just the usual extra ignored arg for parsing stuff.
 \newif\ifimagevmode
 \def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup
   \catcode`\^^M = 5     % in case we're inside an example
@@ -7695,6 +8453,13 @@ end
   % If the image is by itself, center it.
   \ifvmode
     \imagevmodetrue
+  \else \ifx\centersub\centerV
+    % for @center @image, we need a vbox so we can have our vertical space
+    \imagevmodetrue
+    \vbox\bgroup % vbox has better behavior than vtop herev
+  \fi\fi
+  %
+  \ifimagevmode
     \nobreak\medskip
     % Usually we'll have text after the image which will insert
     % \parskip glue, so insert it here too to equalize the space
@@ -7704,9 +8469,13 @@ end
   \fi
   %
   % Leave vertical mode so that indentation from an enclosing
-  % environment such as @quotation is respected.  On the other hand, if
-  % it's at the top level, we don't want the normal paragraph indentation.
-  \noindent
+  %  environment such as @quotation is respected.
+  % However, if we're at the top level, we don't want the
+  %  normal paragraph indentation.
+  % On the other hand, if we are in the case of @center @image, we don't
+  %  want to start a paragraph, which will create a hsize-width box and
+  %  eradicate the centering.
+  \ifx\centersub\centerV\else \noindent \fi
   %
   % Output the image.
   \ifpdf
@@ -7718,7 +8487,10 @@ end
     \epsfbox{#1.eps}%
   \fi
   %
-  \ifimagevmode \medskip \fi  % space after the standalone image
+  \ifimagevmode
+    \medskip  % space after a standalone image
+  \fi  
+  \ifx\centersub\centerV \egroup \fi
 \endgroup}
 
 
@@ -8136,7 +8908,7 @@ directory should work if nowhere else does.}
 %
 % Latin1 (ISO-8859-1) character definitions.
 \def\latonechardefs{%
-  \gdef^^a0{~}
+  \gdef^^a0{\tie}
   \gdef^^a1{\exclamdown}
   \gdef^^a2{\missingcharmsg{CENT SIGN}}
   \gdef^^a3{{\pounds}}
@@ -8166,7 +8938,7 @@ directory should work if nowhere else does.}
   \gdef^^b9{$^1$}
   \gdef^^ba{\ordm}
   %
-  \gdef^^bb{\guilletright}
+  \gdef^^bb{\guillemetright}
   \gdef^^bc{$1\over4$}
   \gdef^^bd{$1\over2$}
   \gdef^^be{$3\over4$}
@@ -8258,7 +9030,7 @@ directory should work if nowhere else does.}
 
 % Latin2 (ISO-8859-2) character definitions.
 \def\lattwochardefs{%
-  \gdef^^a0{~}
+  \gdef^^a0{\tie}
   \gdef^^a1{\ogonek{A}}
   \gdef^^a2{\u{}}
   \gdef^^a3{\L}
@@ -8339,8 +9111,8 @@ directory should work if nowhere else does.}
   \gdef^^ea{\ogonek{e}}
   \gdef^^eb{\"e}
   \gdef^^ec{\v e}
-  \gdef^^ed{\'\i}
-  \gdef^^ee{\^\i}
+  \gdef^^ed{\'{\dotless{i}}}
+  \gdef^^ee{\^{\dotless{i}}}
   \gdef^^ef{\v d}
   %
   \gdef^^f0{\dh}
@@ -8431,7 +9203,7 @@ directory should work if nowhere else does.}
 
   \gdef\DeclareUnicodeCharacter#1#2{%
     \countUTFz = "#1\relax
-    \wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
+    %\wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
     \begingroup
       \parseXMLCharref
       \def\UTFviiiTwoOctets##1##2{%
@@ -8899,8 +9671,8 @@ directory should work if nowhere else does.}
 % Prevent underfull vbox error messages.
 \vbadness = 10000
 
-% Don't be so finicky about underfull hboxes, either.
-\hbadness = 2000
+% Don't be very finicky about underfull hboxes, either.
+\hbadness = 6666
 
 % Following George Bush, get rid of widows and orphans.
 \widowpenalty=10000
@@ -9107,28 +9879,21 @@ directory should work if nowhere else does.}
 
 \message{and turning on texinfo input format.}
 
+\def^^L{\par} % remove \outer, so ^L can appear in an @comment
+
 % DEL is a comment character, in case @c does not suffice.
 \catcode`\^^? = 14
 
 % Define macros to output various characters with catcode for normal text.
-\catcode`\"=\other
-\catcode`\~=\other
-\catcode`\^=\other
-\catcode`\_=\other
-\catcode`\|=\other
-\catcode`\<=\other
-\catcode`\>=\other
-\catcode`\+=\other
-\catcode`\$=\other
-\def\normaldoublequote{"}
-\def\normaltilde{~}
-\def\normalcaret{^}
-\def\normalunderscore{_}
-\def\normalverticalbar{|}
-\def\normalless{<}
-\def\normalgreater{>}
-\def\normalplus{+}
-\def\normaldollar{$}%$ font-lock fix
+\catcode`\"=\other \def\normaldoublequote{"}
+\catcode`\$=\other \def\normaldollar{$}%$ font-lock fix
+\catcode`\+=\other \def\normalplus{+}
+\catcode`\<=\other \def\normalless{<}
+\catcode`\>=\other \def\normalgreater{>}
+\catcode`\^=\other \def\normalcaret{^}
+\catcode`\_=\other \def\normalunderscore{_}
+\catcode`\|=\other \def\normalverticalbar{|}
+\catcode`\~=\other \def\normaltilde{~}
 
 % This macro is used to make a character print one way in \tt
 % (where it can probably be output as-is), and another way in other fonts,
@@ -9206,34 +9971,48 @@ directory should work if nowhere else does.}
 
 % In texinfo, backslash is an active character; it prints the backslash
 % in fixed width font.
-\catcode`\\=\active
-@def@normalbackslash{{@tt@backslashcurfont}}
+\catcode`\\=\active  % @ for escape char from now on.
+
+% The story here is that in math mode, the \char of \backslashcurfont
+% ends up printing the roman \ from the math symbol font (because \char
+% in math mode uses the \mathcode, and plain.tex sets
+% \mathcode`\\="026E).  It seems better for @backslashchar{} to always
+% print a typewriter backslash, hence we use an explicit \mathchar,
+% which is the decimal equivalent of "715c (class 7, e.g., use \fam;
+% ignored family value; char position "5C).  We can't use " for the
+% usual hex value because it has already been made active.
+@def@normalbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}}
+@let@backslashchar = @normalbackslash % @backslashchar{} is for user documents.
+
 % On startup, @fixbackslash assigns:
 %  @let \ = @normalbackslash
-
 % \rawbackslash defines an active \ to do \backslashcurfont.
 % \otherbackslash defines an active \ to be a literal `\' character with
-% catcode other.
+% catcode other.  We switch back and forth between these.
 @gdef@rawbackslash{@let\=@backslashcurfont}
 @gdef@otherbackslash{@let\=@realbackslash}
 
 % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-% the literal character `\'.
-%
-@def@normalturnoffactive{%
-  @let\=@normalbackslash
-  @let"=@normaldoublequote
-  @let~=@normaltilde
-  @let^=@normalcaret
-  @let_=@normalunderscore
-  @let|=@normalverticalbar
-  @let<=@normalless
-  @let>=@normalgreater
-  @let+=@normalplus
-  @let$=@normaldollar %$ font-lock fix
-  @markupsetuplqdefault
-  @markupsetuprqdefault
-  @unsepspaces
+% the literal character `\'.  Also revert - to its normal character, in
+% case the active - from code has slipped in.
+%
+{@catcode`- = @active
+ @gdef@normalturnoffactive{%
+   @let-=@normaldash
+   @let"=@normaldoublequote
+   @let$=@normaldollar %$ font-lock fix
+   @let+=@normalplus
+   @let<=@normalless
+   @let>=@normalgreater
+   @let\=@normalbackslash
+   @let^=@normalcaret
+   @let_=@normalunderscore
+   @let|=@normalverticalbar
+   @let~=@normaltilde
+   @markupsetuplqdefault
+   @markupsetuprqdefault
+   @unsepspaces
+ }
 }
 
 % Make _ and + \other characters, temporarily.
@@ -9262,10 +10041,19 @@ directory should work if nowhere else does.}
 % Say @foo, not \foo, in error messages.
 @escapechar = `@@
 
+% These (along with & and #) are made active for url-breaking, so need
+% active definitions as the normal characters.
+@def@normaldot{.}
+@def@normalquest{?}
+@def@normalslash{/}
+
 % These look ok in all fonts, so just make them not special.
-@catcode`@& = @other
-@catcode`@# = @other
-@catcode`@% = @other
+% @hashchar{} gets its own user-level command, because of #line.
+@catcode`@& = @other @def@normalamp{&}
+@catcode`@# = @other @def@normalhash{#}
+@catcode`@% = @other @def@normalpercent{%}
+
+@let @hashchar = @normalhash
 
 @c Finally, make ` and ' active, so that txicodequoteundirected and
 @c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}.  If we
diff --git a/install-sh b/install-sh
index 6781b98..377bb86 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@ scriptversion=2009-04-28.21; # UTC
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,6 +156,10 @@ while test $# -ne 0; do
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for 'test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -194,13 +202,17 @@ if test $# -eq 0; then
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@ fi
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@ do
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -347,7 +354,7 @@ do
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
+		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
@@ -385,7 +392,7 @@ do
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=\(\)!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@ do
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 8e2827b..6af6d00 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -33,11 +77,12 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-target_triplet = @target@
 subdir = m4
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/mkinstalldirs ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
+	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -49,11 +94,30 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -99,6 +163,11 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NCURSESW_CFLAGS = @NCURSESW_CFLAGS@
+NCURSESW_CONFIG = @NCURSESW_CONFIG@
+NCURSESW_LIBS = @NCURSESW_LIBS@
+NCURSES_CFLAGS = @NCURSES_CFLAGS@
+NCURSES_LIBS = @NCURSES_LIBS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -110,6 +179,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKGDATADIR = @PKGDATADIR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -139,6 +210,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+haveit = @haveit@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -163,11 +235,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-target = @target@
 target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
@@ -210,11 +278,11 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -261,10 +329,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -344,15 +417,16 @@ uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
new file mode 100644
index 0000000..51df0c0
--- /dev/null
+++ b/m4/ax_check_compile_flag.m4
@@ -0,0 +1,74 @@
+# ===========================================================================
+#   http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
+#
+# DESCRIPTION
+#
+#   Check whether the given FLAG works with the current language's compiler
+#   or gives an error.  (Warnings, however, are ignored)
+#
+#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+#   success/failure.
+#
+#   If EXTRA-FLAGS is defined, it is added to the current language's default
+#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
+#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
+#   force the compiler to issue an error when a bad flag is given.
+#
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
+#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 3
+
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
+  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
+  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
+    [AS_VAR_SET(CACHEVAR,[yes])],
+    [AS_VAR_SET(CACHEVAR,[no])])
+  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS
diff --git a/missing b/missing
index 28055d2..db98974 100755
--- a/missing
+++ b/missing
@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,69 +25,40 @@ scriptversion=2009-04-28.21; # UTC
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
+case $1 in
 
-msg="missing on your system"
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
 
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
@@ -100,272 +70,141 @@ Send bug reports to <bug-automake@gnu.org>."
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
 
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/mkinstalldirs b/mkinstalldirs
index 4191a45..55d537f 100755
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -81,9 +81,9 @@ case $dirmode in
       echo "mkdir -p -- $*"
       exec mkdir -p -- "$@"
     else
-      # On NextStep and OpenStep, the `mkdir' command does not
+      # On NextStep and OpenStep, the 'mkdir' command does not
       # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
+      # directories to create, and then abort because '.' already
       # exists.
       test -d ./-p && rmdir ./-p
       test -d ./--version && rmdir ./--version
diff --git a/nano.spec b/nano.spec
index 117bbae..ba25819 100644
--- a/nano.spec
+++ b/nano.spec
@@ -1,17 +1,17 @@
 %define name	nano
-%define version	2.2.6
+%define version	2.4.0
 %define release	1
 
 Summary	: Pico editor clone with enhancements
 Name		: %{name}
 Version		: %{version}
 Release		: %{release}
-License		: GPL
+License		: GPLv3+
 Group		: Applications/Editors
 URL		: http://www.nano-editor.org/
-Source		: http://www.nano-editor.org/dist/v2.0/%{name}-%{version}.tar.gz
+Source		: http://www.nano-editor.org/dist/v2.3/%{name}-%{version}.tar.gz
 BuildRoot	: %{_tmppath}/%{name}-%{version}-root
-BuildRequires	: autoconf, automake, gettext-devel, ncurses-devel
+BuildRequires	: autoconf, automake, gettext-devel, ncurses-devel, texinfo
 
 %description
 GNU nano is a small and friendly text editor.  It aims to emulate the
@@ -21,17 +21,19 @@ Pico text editor while also offering a few enhancements.
 %setup -q
 
 %build
-%configure --enable-all
+%configure
 make
 
 %install
-rm -rf %{buildroot}
 make DESTDIR="%{buildroot}" install
+#ln -s nano %{buildroot}%{_bindir}/pico
+rm -f %{buildroot}%{_infodir}/dir
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO doc/faq.html doc/nanorc.sample
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO doc/faq.html doc/nanorc.sample
 %{_bindir}/*
+%{_docdir}/nano/*
 %{_mandir}/man*/*
 %{_mandir}/fr/man*/*
 %{_infodir}/nano.info*
diff --git a/nano.spec.in b/nano.spec.in
index 3126213..1d6525a 100644
--- a/nano.spec.in
+++ b/nano.spec.in
@@ -6,12 +6,12 @@ Summary	: Pico editor clone with enhancements
 Name		: %{name}
 Version		: %{version}
 Release		: %{release}
-License		: GPL
+License		: GPLv3+
 Group		: Applications/Editors
 URL		: http://www.nano-editor.org/
-Source		: http://www.nano-editor.org/dist/v2.0/%{name}-%{version}.tar.gz
+Source		: http://www.nano-editor.org/dist/v2.3/%{name}-%{version}.tar.gz
 BuildRoot	: %{_tmppath}/%{name}-%{version}-root
-BuildRequires	: autoconf, automake, gettext-devel, ncurses-devel
+BuildRequires	: autoconf, automake, gettext-devel, ncurses-devel, texinfo
 
 %description
 GNU nano is a small and friendly text editor.  It aims to emulate the
@@ -21,17 +21,19 @@ Pico text editor while also offering a few enhancements.
 %setup -q
 
 %build
-%configure --enable-all
+%configure
 make
 
 %install
-rm -rf %{buildroot}
 make DESTDIR="%{buildroot}" install
+#ln -s nano %{buildroot}%{_bindir}/pico
+rm -f %{buildroot}%{_infodir}/dir
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO doc/faq.html doc/nanorc.sample
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO doc/faq.html doc/nanorc.sample
 %{_bindir}/*
+%{_docdir}/nano/*
 %{_mandir}/man*/*
 %{_mandir}/fr/man*/*
 %{_infodir}/nano.info*
diff --git a/po/ChangeLog b/po/ChangeLog
index 10db548..72b5a8a 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,28 @@
+2014-05-28  Benno Schulenberg  <bensberg@justemail.net>
+	* de.po, eo.po, nl.po: Updates for German, Dutch, and Esperanto.
+
+2014-05-27  Benno Schulenberg  <bensberg@justemail.net>
+	* de.po, nl.po, ru.po: Updates for Russian, Dutch, and German.
+
+2014-05-25  Benno Schulenberg  <bensberg@justemail.net>
+	* it.po, uk.po: Updates from the TP for Ukrainian and Italian.
+
+2014-05-22  Benno Schulenberg  <bensberg@justemail.net>
+	* de.po, uk.po: Updates from the TP for German and Ukrainian.
+
+2014-05-16  Benno Schulenberg  <bensberg@justemail.net>
+	* eo.po, fi.po, fr.po, nl.po, vi.po: Updates from the TP for
+	Vietnamese, Finnish, Dutch, French, and Esperanto.
+
+2014-05-13  Benno Schulenberg  <bensberg@justemail.net>
+	* nano.pot, *.po: Regenerated the POT file and refreshed the PO's.
+
+2014-03-22  Benno Schulenberg  <bensberg@justemail.net>
+	* nano.pot: Regenerated the POT file.
+	* cs.po, es.po, it.po, nb.po, sr.po, zh_TW: Updates from the TP
+	for Czech, Spanish, Italian, Norwegian, Serbian, and Chinese.
+	* LINGUAS: Removed rw (Kinyarwanda) -- it was just fragments.
+
 2007-12-09  Jordi Mallach  <jordi@gnu.org>
 
 	* LINGUAS: Add zh_CN.
@@ -973,4 +998,4 @@
 	* es.po: Updated.
 
 
-$Id: ChangeLog 4195 2007-12-09 17:12:03Z jordi $
+$Id: ChangeLog 4926 2014-05-28 20:27:37Z bens $
diff --git a/po/LINGUAS b/po/LINGUAS
index 319e869..25a1cd7 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,2 +1,2 @@
 # List of available languages.
-bg ca cs da de es eu fi fr ga gl hu id it ms nb nl nn pl pt_BR ro ru rw sr sv tr uk vi zh_CN zh_TW
+bg ca cs da de eo es eu fi fr ga gl hu id it ja ms nb nl nn pl pt_BR ro ru sl sr sv tr uk vi zh_CN zh_TW 
diff --git a/po/bg.gmo b/po/bg.gmo
index 633c741..a895637 100644
--- a/po/bg.gmo
+++ b/po/bg.gmo
diff --git a/po/bg.po b/po/bg.po
index 24087de..20e6b53 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,126 +1,148 @@
 # Bulgarian translation of nano.
 # Copyright (C) 2005 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# Yavor Doganov <yavor@doganov.org>, 2005.
-# Anton Zinoviev <zinoviev@debian.org>, 2005,2006
-#
-# This file should be sent to translation@iro.umontreal.ca with the
-# following subject line: TP-Robot nano-VERSION.bg.po
 #
+# Yavor Doganov <yavor@doganov.org>, 2005.
+# Anton Zinoviev <zinoviev@debian.org>, 2005, 2006
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2006-08-25 00:56+0300\n"
 "Last-Translator: Anton Zinoviev <zinoviev@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Отиване в директори�"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Отменено"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "�е може да �е излезе от %s в ограничен режим"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Грешка при четене на %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "�е може да �е премине в горната директори�"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(дир)"
 
 # TODO: по-добър превод
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(родит.дир.)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Тър�ене"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Зачитане на малки/големи]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Рег.израз]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [�азад]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Тър�ене отначало"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Това е един�твеното �ъвпадение"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "��ма въведен низ за тър�ене"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "�еу�пех при �ъздаването на временен файл: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Грешка при запи�а на временен файл: %s"
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Грешка при запи�а на временен файл: %s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Грешка при четене на %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "�е може да �е вмъкне файл извън %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "��ма повече буфери за отвар�не на файлове"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Превключено на %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "�ов буфер"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Прочетен %lu ред (конвертиран от DOS и Mac формат)"
 msgstr[1] "Прочетени %lu реда (конвертирани от DOS и Mac формат)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -131,14 +153,14 @@ msgid_plural ""
 msgstr[0] "Прочетен %lu ред (конвертиран от DOS и Mac формат)"
 msgstr[1] "Прочетени %lu реда (конвертирани от DOS и Mac формат)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Прочетен %lu ред (конвертиран от Mac формат)"
 msgstr[1] "Прочетени %lu реда (конвертирани от Mac формат)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -147,14 +169,14 @@ msgid_plural ""
 msgstr[0] "Прочетен %lu ред (конвертиран от Mac формат)"
 msgstr[1] "Прочетени %lu реда (конвертирани от Mac формат)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Прочетен %lu ред (конвертиран от DOS формат)"
 msgstr[1] "Прочетени %lu реда (конвертирани от DOS формат)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -163,490 +185,445 @@ msgid_plural ""
 msgstr[0] "Прочетен %lu ред (конвертиран от DOS формат)"
 msgstr[1] "Прочетени %lu реда (конвертирани от DOS формат)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Прочетен %lu ред"
 msgstr[1] "Прочетени %lu реда"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Четене на файл"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "�ов файл"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "„%s“ не е намерен"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ е директори�"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "„%s“ е файл за у�трой�тво"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Команда за изпълнение в нов буфер [от %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Команда за изпълнение [от %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Файл за вмъкване в нови� буфер [от %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Файл за вмъкване [от %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Клавишът е недопу�тим в режим без буфери"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "�е може да �е запише извън %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "�е може да �е добав� нищо към �имволна връзка, на�троена � --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, fuzzy, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Грешка при запи�а на временен файл: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Твърде много резервни копи�?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Грешка при запи� на %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Грешка при запи�а на временен файл: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Запазен е %lu ред"
 msgstr[1] "Запазени �а %lu реда"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS формат]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac формат]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Резервно копие]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Прикреп�не на избрани� тек�т в началото на файл"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Прикреп�не на избрани� тек�т в кра� на файл"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Запазване на избрани� тек�т във файл"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Име на файла за прикреп�не в началото му"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Име на файла за прикреп�не в кра� му"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Име на файл за запазване"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Файлът �ъще�твува, ПРЕЗ�ПИСВ��Е? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Запазване под Р�ЗЛИЧ�О ИМЕ? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(повече)"
 
-#: src/files.c:2694 src/rcfile.c:1220
-#, c-format
+#: src/files.c:2974
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
 "�ати�нете „Enter“, за да продължи �тартирането на nano\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Отм�на"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Зам�на"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Без зам�на"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Зач. м/г"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "�азад"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Рег.израз"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Изход"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "ПредИ�тор."
+#: src/global.c:478
+msgid "Close"
+msgstr "Затвар�не"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "СледИ�тор."
+#: src/global.c:479
+#, fuzzy
+msgid "Uncut Text"
+msgstr "По�тав�не"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Отиване на тек�т"
+#: src/global.c:481
+#, fuzzy
+msgid "Unjustify"
+msgstr "Изкл.подр."
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "КъдеE�ледв."
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Първи файл"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "По�л. файл"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Към файловете"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS формат"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac формат"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Добав�не в кра�"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Добав�не в нач."
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Резервно копие"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Изпълнение на команда"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Отиване в директори�"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Помощ"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Изход"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Тър�ене"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "ПредСтр"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "СледвСтр"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Първи ред"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Зам�на"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "По�л. ред"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Отив. ред"
 
-#: src/global.c:487
-#, fuzzy
-msgid "Suspend"
-msgstr "Временно �пиране"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Предишен ред"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "�ач. абзац"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Следващ ред"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Край абзац"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Отвар�не"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Пълно подравн."
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Опре�н�ване"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Вмъкване на файл"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Отив. ред"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Подравн�ване на текущи� абзац"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Отм�на на текущата функци�"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Извежда тази помощна информаци�"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Затвар�не на текущи� файлов буфер/Изход от nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Изход от nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Запазване на текущи� файл на ди�ка"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Вмъкване на друг файл в текущи�"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Тър�ене на низ или регул�рен израз"
 
-#: src/global.c:520
+#: src/global.c:526
 #, fuzzy
-msgid "Go to previous screen"
-msgstr "Отиване на предишни� екран"
+msgid "Search for a string"
+msgstr "Тър�ене на низ или регул�рен израз"
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Отиване на �ледващи� екран"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr ""
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Отр�зване на текущи� ред и �ъхран�ване в буфера за обмен"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Отр�зване от буфера за обмен и по�тав�не в текущи� ред"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Показване на положението на кур�ора"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Извикване на програмата за проверка на правопи�а"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Зам�на на низ или регул�рен израз"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Отиване на по�очен ред и �тълб"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Маркиране на тек�т в позици�та на кур�ора"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Повтар�не на по�ледното тър�ене"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Отр�зване на текущи� ред и �ъхран�ване в буфера за обмен"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "От�тъп вд��но на текущи� ред"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Маха от�тъпа на текущи� ред"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:543
+#: src/global.c:550
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Отиване един �имвол напред"
 
-#: src/global.c:544
+#: src/global.c:551
 #, fuzzy
 msgid "Go back one character"
 msgstr "Отиване един �имвол назад"
 
-#: src/global.c:546
+#: src/global.c:553
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Отиване напред � една дума"
 
-#: src/global.c:547
+#: src/global.c:554
 #, fuzzy
 msgid "Go back one word"
 msgstr "Отиване назад � една дума"
 
-#: src/global.c:549
+#: src/global.c:556
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Отиване на предишни� ред"
 
-#: src/global.c:550
+#: src/global.c:557
 #, fuzzy
 msgid "Go to next line"
 msgstr "Отиване на �ледващи� ред"
 
-#: src/global.c:551
+#: src/global.c:558
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Отиване в началото на текущи� ред"
 
-#: src/global.c:552
+#: src/global.c:559
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Отиване в кра� на текущи� ред"
 
-#: src/global.c:555
+#: src/global.c:562
 #, fuzzy
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Отиване в началото на текущи� абзац"
 
-#: src/global.c:557
+#: src/global.c:564
 #, fuzzy
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Отиване в кра� на текущи� абзац"
 
-#: src/global.c:560
+#: src/global.c:566
 #, fuzzy
 msgid "Go to the first line of the file"
 msgstr "Отиване в началото на файла"
 
-#: src/global.c:562
+#: src/global.c:567
 #, fuzzy
 msgid "Go to the last line of the file"
 msgstr "Отиване в кра� на файла"
 
-#: src/global.c:564
+#: src/global.c:569
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Отиване при �ъответната �коба"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Превърта нагоре � един ред без да ме�ти кур�ора"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Превърта надолу � един ред без да ме�ти кур�ора"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Превключване на предишни� файлов буфер"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Превключване на �ледващи� файлов буфер"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Вмъкване на �ледващи� клавиш до�ловно"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Вмъкване на �имвол за табулаци� при кур�ора"
 
@@ -654,333 +631,451 @@ msgstr "Вмъкване на �имвол за табулаци� при кур
 msgid "Insert a newline at the cursor position"
 msgstr "Вмъкване на �имвол за нов ред при кур�ора"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Изтриване на �имвола под кур�ора"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Изтриване на �имвола вл�во от кур�ора"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Отр�зване от позици�та на кур�ора до кра� на файла"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Подравн�ване на цели� файл"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Пребро�ване на думите, редовете и знаците във файла"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Опре�н�ване на текущи� екран"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Зачитане малки/големи букви при тър�ене (вкл/изкл)"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Обратна по�ока на тър�ене"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Използване на регул�рни изрази (вкл/изкл)"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Връща предишни� низ за тър�ене/зам�на"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Връща �ледващи� низ за тър�ене/зам�на"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Отиване във файлов браузър"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Запазване на файла в DOS формат (вкл/изкл)"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Запазване на файла в Mac формат (вкл/изкл)"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Вмъкване в кра� на файла (вкл/изкл)"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Вмъкване в началото на файла (вкл/изкл)"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Резервно копира �ъще�твуващи файлове (вкл/изкл)"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Изпълнение на външна команда"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Използване на нов буфер (вкл/изкл)"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Изход от файлови� браузър"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Отиване при първи� файл от �пи�ъка"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Отиване при по�ледни� файл от �пи�ъка"
 
-#: src/global.c:641
+#: src/global.c:634
+#, fuzzy
+msgid "Go to the previous file in the list"
+msgstr "Отиване при първи� файл от �пи�ъка"
+
+#: src/global.c:635
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Отиване при по�ледни� файл от �пи�ъка"
 
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Отиване в директори�"
+
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Извикване на програмата за проверка на правопи�а"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Отиване на предишни� ред"
+
+#: src/global.c:641
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Отиване на �ледващи� ред"
+
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Отиване при първи� файл от �пи�ъка"
+msgid "Invoke formatter, if available"
+msgstr "Извикване на програмата за проверка на правопи�а"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Отиване в директори�"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Помощ"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Затвар�не"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Отм�на"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "Запазване"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Отиване в директори�"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Отр�зване"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Подравн."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Отвар�не"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Правопи�"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Отр�зване"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "Отив. ред"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Изкл.подр."
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS формат"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "По�тав�не"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Зач. м/г"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Рег.израз"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "�азад"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Без зам�на"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Поз.кур�ор"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Правопи�"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "ПредСтр"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "СледвСтр"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Първи ред"
 
-#: src/global.c:771
+#: src/global.c:787
+msgid "Last Line"
+msgstr "По�л. ред"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "�е е �коба"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Избор на тек�т"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Копиране"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "От�тъп"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Без от�тъп"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "�апред"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "�азад"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Следваща дума"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "�апред"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Предишна дума"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Предишен ред"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Следващ ред"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Следваща дума"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Home"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "End"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "�амиране на другата �коба"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "�ач. абзац"
 
-#: src/global.c:848
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Край абзац"
+
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Превъртане нагоре"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Превъртане надолу"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "Предишен файл"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Следващ файл"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
 msgstr "До�ловен вход"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Delete"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "Отр. до кра�"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Брой на думи"
 
-#: src/global.c:1367
+#: src/global.c:905
+#, fuzzy
+msgid "Suspend"
+msgstr "Временно �пиране"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "ПредИ�тор."
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "СледИ�тор."
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Отиване на тек�т"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS формат"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac формат"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Добав�не в кра�"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Добав�не в нач."
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Резервно копие"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Изпълнение на команда"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Към файловете"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Първи файл"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "По�л. файл"
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Предишен ред"
+
+#: src/global.c:979
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "Следващ ред"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Режим на помощ"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "По�то�нно показване на позици�та на кур�ора"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Използване на още един ред за редактиране"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Плавно превъртане"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Без прена��не на дългите редове"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Показване на интервали"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Синтактично о�вет�ване"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Интелигентен клавиш „Home“"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "�втоматичен от�тъп"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Отр�зване до кра�"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "�втоматично прена��не"
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Без прена��не на дългите редове"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Превръщане на табулации в интервали"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Запазване на резервни копи�"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Много файлови буфери"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Поддръжка на мишка"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Без конвертиране от DOS/Mac формат"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Временно �пиране"
 
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "�втоматично прена��не"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1002,7 +1097,7 @@ msgstr ""
 "тър�ене. �ко нати�нете „Enter“, без да въвеждате тек�т, ще �е извърши "
 "предишнто тър�ене.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1016,7 +1111,7 @@ msgstr ""
 " Следните клавиши за до�тъпни в режим „Тър�ене“:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1036,7 +1131,7 @@ msgstr ""
 " Следните клавишни комбинации �а налични в режим „Отиване на ред“:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1058,7 +1153,7 @@ msgstr ""
 "за вмъкване ще �е зареди в отделен буфер. Използвайте Meta-< и >, за да "
 "превключвате между буферите.  "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1072,7 +1167,7 @@ msgstr ""
 " Следните клавишни комбинации �а налични в режим „Вмъкване на файл“:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1098,7 +1193,7 @@ msgstr ""
 " Следните клавишни комбинации �а налични в режим „Запазване на файл“:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1122,7 +1217,7 @@ msgstr ""
 " Следните клавишни комбинации �а налични във файлови� браузър:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1146,7 +1241,7 @@ msgstr ""
 "предишното тър�ене.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1154,7 +1249,7 @@ msgstr ""
 "Следните функционални клавиши �а до�тъпни в режим „Тър�ене“:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1177,7 +1272,7 @@ msgstr ""
 "браузъра:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1201,7 +1296,7 @@ msgstr ""
 " Може да �е използват �ледните допълнителни функционални клавиши:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1222,7 +1317,7 @@ msgstr ""
 " Може да �е използват �ледните функционални клавиши:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1242,7 +1337,7 @@ msgstr ""
 "редактора, показващ редактирани� файл. Лентата за �ъ�то�нието е трети�т ред "
 "от долу нагоре и е предназначен за важни �ъобщени�.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1261,7 +1356,7 @@ msgstr ""
 "да бъдат въвеждани � клавишите „Esc“, „Alt“ или „Meta“ в зави�имо�т от "
 "на�тройките на клавиатурата.   "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1275,15 +1370,15 @@ msgstr ""
 "алтернативните �а показани в �коби:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "(вкл/изкл)"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "�епозволен клавиш в режим на преглед"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1292,7 +1387,7 @@ msgstr ""
 "\n"
 "Буферът е запи�ан в %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1301,7 +1396,7 @@ msgstr ""
 "\n"
 "Буферът не е запи�ан в %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1310,11 +1405,11 @@ msgstr ""
 "\n"
 "Буферът не е запи�ан: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Размерът на прозореца е твърде малък за nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1323,253 +1418,263 @@ msgstr ""
 "Използване: nano [ОПЦИИ] [[+РЕД,СТЪЛБ]] Ф�ЙЛ]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Опци�\t\tДълга опци�\t\tЗначение\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Опци�\t\tЗначение\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Показва тази �правка"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+РЕД,СТЪЛБ"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Започва от ред РЕД, �тълб СТЪЛБ"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "С интелигентен клавиш „Home“"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Резервно копира �ъще�твуващи файлове"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <дир>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<дир>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Директори� за резервните копи�"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Удебелен шрифт вме�то инвер�но видео"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Прави въведените табулации на интервали"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Позвол�ва много файлови буфери"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Запазва/чете и�тори�та на тър�ене/зам�на"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Пренебрегва конфиг. файлове nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Коригира объркване от цифрови� клав.блок"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Без знак за нов ред в кра� на файловете"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Без преобразуване от DOS/Mac формат"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Използване още един ред за редактиране"
 
-#: src/nano.c:860
+#: src/nano.c:886
+#, fuzzy
+msgid "Log & read location of cursor position"
+msgstr "Вмъкване на �имвол за табулаци� при кур�ора"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <низ>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<низ>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "�из за цитиране"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Ограничен режим"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#�тълбове>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#�тълбове>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Широчината на табулаци�та - #�тълбове"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Бързо изключване на лентата за �ъ�то�ние"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Показва вер�и�та и излиза"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Открива прецизно между�ловните граници"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <низ>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<низ>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "По�очва �интак�и� за оцвет�ване"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "По�то�нно показва позици�та на кур�ора"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Коригира объркване на „Backspace/Delete“"
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "Извежда тази помощна информаци�"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "�втоматичен от�тъп при нови редове"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Отр�зване от кур�ора до кра� на реда"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "�е �ледва �имволните връзки, заме�тва ги"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "С използване на мишка"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <дир>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<дир>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Работна директори�"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Запазва клавишите „XON“(^Q) и „XOFF“(^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#�тълбове>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#�тълбове>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Прена�� редовете при ширина #�тълбове"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <прог>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<прог>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "�лтернативен правопи�ен коректор"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "При изход запазва файла без питане"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Режим на преглед (�амо за четене)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Без прена��не на дългите редове"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Без двата по�ледни реда � помощ"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Позвол�ва временно �пиране"
 
-#: src/nano.c:924
+#: src/nano.c:954
 #, fuzzy
 msgid "Enable soft line wrapping"
 msgstr "�втоматично прена��не"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(не �е използват,за �ъвме�тимо�т � Pico)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano, вер�и� %s (компилиран в %s ча�а на %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr ""
 " Е-поща: nano@nano-editor.org\tИнтернет адре�: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1578,156 +1683,180 @@ msgstr ""
 "\n"
 " Компилирани опции:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "За �ъжаление поддръжката за тази функци� е изключена"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Запазване на променени� буфер? (ПРИ ОТГОВОР „�е“ ПРОМЕ�ИТЕ ЩЕ СЕ З�ГУБЯТ)"
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Получи �е SIGHUP или SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Използвайте „fg“, за да �е върнете в nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "активирано"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "деактивирано"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "�еизве�тна команда"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "„XON“ е пренебрегнат, мън-мън."
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "„XOFF“ е пренебрегнат, мън-мън."
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Пои�кани�т размер на табулаци� „%s“ е неправилен"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Пои�кани�т размер „%s“ за мак�имална дължина на редове е неправилен"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr ""
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "YyДд"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn�н"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "AaВв"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Да"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "В�ички"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "�е"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Грешка в %s на ред %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "�ргументът „%s“ има незатворенa \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "�изовете за регул�рни изрази тр�бва да започват и завършват �ъ� �имвола \""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "�еправилен регул�рен израз \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Лип�ва името на �интак�и�а"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "Синтак�и�ът „none“ е запазен"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Синтак�и�ът „default“ не приема разширени�"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 #, fuzzy
 msgid "Missing key name"
 msgstr "Лип�ва името на �интак�и�а"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr ""
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:426
+#: src/rcfile.c:489
 #, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "�еу�пех при извикване на „%s“"
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr ""
+
+#: src/rcfile.c:629
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Грешка при четене на %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1742,135 +1871,196 @@ msgstr ""
 "„black“, � възможна пред�тавка „bright“\n"
 "за цветове на преден план."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "�е може да бъде добавена команда за цв�т без �интактична команда"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Лип�ва името на цвета"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Цветът за фон „%s“ не може да бъде �рък"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Лип�ва низът за регул�рни� израз"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ изи�ква �ъответ�тващ „end=“"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Цветът за фон „%s“ не може да бъде �рък"
+
+#: src/rcfile.c:865
 #, fuzzy
 msgid "Cannot add a header regex without a syntax command"
 msgstr "�е може да бъде добавена команда за цв�т без �интактична команда"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:921
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "�е може да бъде добавена команда за цв�т без �интактична команда"
+
+#: src/rcfile.c:926
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Лип�ва низът за регул�рни� израз"
+
+#: src/rcfile.c:985
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "�е може да бъде добавена команда за цв�т без �интактична команда"
+
+#: src/rcfile.c:990
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Лип�ва името на цвета"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "�е може да бъде добавена команда за цв�т без �интактична команда"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr ""
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Командата „%s“ не е позволена във вмъкван файл"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Синтак�и�ът „%s“ н�ма команди за цветове"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Командата „%s“ е неизве�тна"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Лип�ващ флаг"
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "Лип�ва името на цвета"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Опци�та „%s“ изи�ква аргумент"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Опци�та не е правилен многобайтов низ"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "�еобходими �а �имволи, които не �а празни"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "�еобходими �а два �имвола � нормална ширина"
 
-#: src/rcfile.c:1114
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1339
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "�е може да �е отмени флаг „%s“"
 
-#: src/rcfile.c:1123
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1345
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "�еизве�тен флаг „%s“"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "�е може да бъде намерена домашната директори�! �х!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"�ати�нете „Enter“, за да продължи �тартирането на nano\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "„%.*s%s“ не е намерен"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Зачитане на малки/големи]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Рег.израз]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [�азад]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (за зам�на) в избрани� тек�т"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (за зам�на)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Зам�на на това �ъвпадение?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Зам�на �"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Заменено е %lu �ъвпадение"
 msgstr[1] "Заменени �а %lu �ъвпадени�"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Въведете номер на ред и �тълб"
 
-#: src/search.c:1061
+#: src/search.c:1054
 #, fuzzy
 msgid "Invalid line or column number"
 msgstr "Въведете номер на ред и �тълб"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "�е е �коба"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "��ма �ъвпадаща �коба"
 
@@ -1882,227 +2072,306 @@ msgstr "У�тавено е маркиране"
 msgid "Mark Unset"
 msgstr "Отменено е маркирането"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 #, fuzzy
 msgid "text delete"
 msgstr "Следващ файл"
 
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "�втоматично прена��не"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 #, fuzzy
 msgid "text insert"
 msgstr "Следващ ред"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 #, fuzzy
 msgid "text replace"
 msgstr " (за зам�на)"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "�еу�пех при pipe"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "�еу�пех при �ъздаването на pipe"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "�еу�пех при fork"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "�еправилен низ за цитиране %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Сега може да �е отмени подравн�ването!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Редактиране на зам�на"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "�еу�пех при �ъздаването на pipe"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Създаване на �пи�ък �ъ� �грешени думи, изчакайте..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "�е може да �е определи размера на буфера на pipe"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Грешка при извикване на „spell“"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Грешка при извикване на „sort -f“"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Грешка при извикване на „uniq“"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Проверката на правопи�а завърши"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Грешка при извикване на „%s“"
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Извикване на програмата за проверка на правопи�а"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "�еу�пех при проверката на правопи�а: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "�еу�пех при проверката на правопи�а: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Без знак за нов ред в кра� на файловете"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "Показва тази �правка"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "Показва тази �правка"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sДуми: %lu  Редове: %ld  Знаци: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "В избрани� тек�т: "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "До�ловен вход"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano е в недо�тиг на памет!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Вход уникод"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Променен"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Преглед"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "ДИР:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Файл:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "ред %ld/%ld (%d%%), �тълб %lu/%lu (%d%%), �имвол %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Тек�тов редактор nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "вер�и�"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Създадено от:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Специални благодарно�ти на:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "Фондаци� „Свободен �офтуер“"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "За ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "и в�ички о�танали, които �ме забравили..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Благодарим, че използвате nano!"
 
+#~ msgid "Move to the previous screen"
+#~ msgstr "Отиване на предишни� екран"
+
+#~ msgid "Move to the next screen"
+#~ msgstr "Отиване на �ледващи� екран"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "�амиране на другата �коба"
+
+#~ msgid "Insert File"
+#~ msgstr "Вмъкване на файл"
+
 #~ msgid "Space"
 #~ msgstr "Space"
 
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(не �е използват,за �ъвме�тимо�т � Pico)"
+
+#~ msgid "Missing flag"
+#~ msgstr "Лип�ващ флаг"
+
 #~ msgid "Come on, be reasonable"
 #~ msgstr "Хайде, бъдете разумни"
 
+#~ msgid "Could not pipe"
+#~ msgstr "�еу�пех при pipe"
+
 #~ msgid "Indent marked text"
 #~ msgstr "От�тъп на маркирани� тек�т"
 
@@ -2173,9 +2442,6 @@ msgstr "Благодарим, че използвате nano!"
 #~ msgid "Duplicate syntax name %s"
 #~ msgstr "Дублирано име на �интак�и� %s"
 
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "�еу�пех при �ъздаването на временен файл: %s"
-
 #~ msgid "Find other bracket"
 #~ msgstr "�амиране на друга �коба"
 
@@ -2184,3 +2450,6 @@ msgstr "Благодарим, че използвате nano!"
 
 #~ msgid "Word Count in Selection"
 #~ msgstr "Брой думи в избрани� тек�т"
+
+#~ msgid "Could not invoke \"%s\""
+#~ msgstr "�еу�пех при извикване на „%s“"
diff --git a/po/ca.gmo b/po/ca.gmo
index 6cff23c..9a6b1f1 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
diff --git a/po/ca.po b/po/ca.po
index ce39359..d38c5fb 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,122 +1,154 @@
 # Catalan messages for the GNU nano editor.
-# Copyright © 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright © 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2014, 2015 Free Software Foundation, Inc.
 # This file is distributed under the same licence as the nano package.
-# Jordi Mallach <jordi@gnu.org>, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009.
-# Miquel Vidal <miquel@sindominio.net>, 2001.
 #
+# Miquel Vidal <miquel@sindominio.net>, 2001.
+# Jordi Mallach <jordi@gnu.org>, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2014, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.1.11pre1\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2009-09-19 13:28+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 09:50+0100\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Vés a un directori"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "No es pot anar fora de %s en mode restringit"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "S'ha produït un error en llegir %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "No es pot ascendir de directori"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(directori pare)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Cerca"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Maj/Min]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [ExpReg]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Cap Enrere]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Recerca recomençada"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Aquesta és la única coincidència"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "No hi ha cap patró de recerca actual"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"No s'ha pogut determinar la identitat per al fitxer de blocatge (ha fallat "
+"getpwuid())"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr ""
+"No s'ha pogut determinar el nom de l'ordinador per al fitxer de blocatge: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "S'ha produït un error en escriure el fitxer de blocatge %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "S'ha produït un error en suprimir el fitxer de blocatge %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "S'ha produït un error en obrir el fitxer de blocatge %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+"S'ha produït un error en llegir el fitxer de blocatge %s: No s'han llegit "
+"prous dades"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr "El fitxer %s s'està editant (per %s amb %s, PID %d); voleu continuar?"
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+"S'ha produït un error en escriure el fitxer de blocatge: el directori «%s» "
+"no existeix"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "No es poden inserir fitxers des de fora de %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "No hi ha més búfers de fitxer oberts"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "S'ha canviat a %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Nou búfer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "%lu línia llegida (convertida des del format DOS i Mac)"
 msgstr[1] "%lu línies llegides (convertides des del format DOS i Mac)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -131,14 +163,14 @@ msgstr[1] ""
 "%lu línies llegides (convertides des del format DOS i Mac - Avís: no hi ha "
 "permís d'escriptura)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "%lu línia llegida (convertida des del format Mac)"
 msgstr[1] "%lu línies llegides (convertides des del format Mac)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -151,14 +183,14 @@ msgstr[1] ""
 "%lu línies llegides (convertides des del format Mac - Avís: no hi ha permís "
 "d'escriptura)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "%lu línia llegida (convertida des del format DOS)"
 msgstr[1] "%lu línies llegides (convertides des del format DOS)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -171,478 +203,443 @@ msgstr[1] ""
 "%lu línies llegides (convertides des del format DOS - Avís: no hi ha permís "
 "d'escriptura)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu línia llegida"
 msgstr[1] "%lu línies llegides"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "S'ha llegit %lu línia (Avís: no hi ha permís d'escriptura)"
+msgstr[1] "S'han llegit %lu línies (Avís: no hi ha permís d'escriptura)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "S'està llegint el fitxer"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Nou fitxer"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "«%s» no trobat"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "«%s» és un directori"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "«%s» és un fitxer de dispositiu"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Fitxer a executar a un nou búfer [des de %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Ordre a executar [des de %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fitxer a inserir a un nou búfer [des de %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fitxer a inserir [des de %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tecla il·legal en mode no-multibuffer"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"No s'ha pogut escriure la còpia de seguretat, voleu continuar desant (Digueu "
+"N si no n'esteu segur)"
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "No es pot escriure fora de %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 "No es pot avantposar o afegir a un enllaç simbòlic amb --nofollow establert"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "S'ha produït un error en escriure la còpia de seguretat %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Massa fitxers de còpia de seguretat?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "S'ha produït un error en escriure %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "S'ha produït un error en escriure un fitxer temporal: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "S'ha escrit %lu línia"
 msgstr[1] "S'han escrit %lu línies"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Còpia de seguretat]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Avantposa sel·lecció a un fitxer"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Afegeix la sel·lecció a un fitxer"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Escriu la sel·lecció a un fitxer"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Nom del fitxer en el qual avantposar"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Nom del fitxer en el qual afegir"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Nom del fitxer a escriure"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "El fitxer existeix, el voleu SOBREESCRIURE? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Voleu desar el fitxer sota un NOM DIFERENT? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "S'ha modificat el fitxer des de que l'heu obert, voleu desar-lo?"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(més)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Premeu Intro per a continuar carregant nano.\n"
+"Premeu Intro per a continuar\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Reemplaça"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"No s'ha pogut crear el directori %s: %s\n"
+"És requerit per desar/carregar l'historial de cerca o posició del cursor.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "No reemplaces"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"El camí %s no és un directori i ho ha de ser.\n"
+"Nano no podrà carregar o desar l'historial de cerca o la posició del "
+"cursor.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Maj/Min"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"S'ha detectat un fitxer d'historial antic (%s) que s'ha intentat moure\n"
+"al lloc aconsellat (%s), però s'ha produït un error: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Cap Enrere"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"S'ha detectat un fitxer d'historial antic (%s) que s'ha mogut\n"
+"al lloc aconsellat (%s)\n"
+"(Vegeu les PMF del nano per a obtenir més informació sobre aquest canvi)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Expreg"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Surt"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "HistPrèv"
+#: src/global.c:478
+msgid "Close"
+msgstr "Tanca"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "HistSeg"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Destalla el text"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Vés al text"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Desjustifica"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "On és la següent"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Primer fitxer"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Últim fitxer"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "A fitxers"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Format DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Format Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Afegeix"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Avantposa"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Fes còpia de seguretat"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Executa una ordre"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Vés a directori"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Ajuda"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Surt"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Cerca"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Pàg Ant"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Pàg Seg"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Primera línia"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Reemplaça"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Última línia"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Vés a línia"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Suspèn"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Ant Línia"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Princ de par"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Seg Línia"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Final de par"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Llegeix"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "JustCompl"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Refresca"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Insereix un fitxer"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Vés a línia"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Justifica el paràgraf actual"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Cancel·la la funció actual"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Mostra aquest text d'ajuda"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Tanca el búfer de fitxer actual / Surt del nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Surt del nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Escriu el fitxer actual al disc"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Insereix un altre fitxer dins de l'actual"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Cerca una cadena o expressió regular"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Vés a la pàgina anterior"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Cerca una cadena"
 
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "Vés a la pàgina següent"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Vés a la pantalla anterior"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Vés a la pantalla següent"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Retalla la línia actual i desa-la al cutbuffer"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Enganxa el cutbuffer a la línia actual"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Mostra la posició del cursor"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Invoca el corrector ortogràfic, si està disponible"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Reemplaça una cadena o una expressió regular"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Vés a un número de línia i columna"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Marca text a la posició del cursor"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Marca text començant des de la posició del cursor"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr "Repeteix l'última recerca"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Copia la línia actual i emmagatzema-la al cutbuffer"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Ajusta el fitxer actual"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Desajusta el fitxer actual"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Desfés l'última operació"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Refés l'última operació"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Vés endavant un caràcter"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Vés enrere un caràcter"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Vés endavant una paraula"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Vés enrere una paraula"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Vés a la línia anterior"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Vés a la línia següent"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Vés al principi de la línia actual"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Vés al final de la línia actual"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 "Vés al principi del paràgraf actual; posteriorment del paràgraf anterior"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Vés al final del paràgraf actual; posteriorment del paràgraf següent"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Vés a la primera línia del fitxer"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Vés a l'última línia del fitxer"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Vés a la clau corresponent"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Desplaça amunt una línia sense desplaçar el cursor"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Desplaça avall una línia sense desplaçar el cursor"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Canvia a l'anterior búfer de fitxer"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Canvia al següent búfer de fitxer"
 
 # Verbatim -> textualment segons un diccionari online.
 # S'accepten altres propostes. jm
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Insereix la següent premuda de tecla textualment"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Insereix una tabulació a la posició del cursor"
 
@@ -650,332 +647,434 @@ msgstr "Insereix una tabulació a la posició del cursor"
 msgid "Insert a newline at the cursor position"
 msgstr "Insereix una línia nova a la posició del cursor"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Suprimeix el caràcter sota el cursor"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Suprimeix el caràcter a l'esquerra del cursor"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Retalla des de la posició del cursor al final del fitxer"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Justifica el fitxer sencer"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Compta el nombre de paraules, línies i caràcters"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Redibuixa la pantalla actual"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Suspèn l'editor (si la suspensió és habilitada)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Commuta la sensibilitat a majúscules de la cerca"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Inverteix la direcció de la cerca"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Commuta l'ús d'expressions regulars"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Recupera la cadena de cerca/reemplaça anterior"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Recupera la cadena de cerca/reemplaça següent"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Vés al navegador de fitxers"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Commuta l'ús del format DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Commuta l'ús del format Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Commuta l'afegiment"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Commuta l'avantposat"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Commuta la creació d'una còpia de seguretat del fitxer original"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Executa una ordre externa"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Commuta l'ús d'un búfer nou"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Surt del navegador de fitxers"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Vés al primer fitxer de la llista"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Vés a l'últim fitxer de la llista"
 
-#: src/global.c:641
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "Vés a l'últim fitxer de la llista"
-
-#: src/global.c:642
-#, fuzzy
+#: src/global.c:634
 msgid "Go to the previous file in the list"
-msgstr "Vés al primer fitxer de la llista"
+msgstr "Vés al fitxer previ de la llista"
+
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Vés al fitxer següent de la llista"
 
-#: src/global.c:643
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Vés al directori"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Tanca"
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Invoca l'analitzador sintàctic, si està disponible"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Vés al missatge anterior de l'analitzador"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Vés al missatge següent de l'analitzador"
+
+#: src/global.c:642
+msgid "Invoke formatter, if available"
+msgstr "Invoca el formatador, si està disponible"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Ajuda"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Desa"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Vés a directori"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Retalla"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Justifica"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Llegeix"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Ortografia"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Retalla"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Analitzador"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Desjustifica"
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Formatador"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Destalla el text"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Maj/Min"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Expreg"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Cap Enrere"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "No reemplaces"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Pos Act"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Ortografia"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Pàg Ant"
 
-#: src/global.c:771
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Pàg Seg"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Primera línia"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Última línia"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Vés a la clau"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Marca text"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Copia text"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Sagna text"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Desagna text"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Desfés"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Refés"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Endavant"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Enrere"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Paraula següent"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Endavant"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Paraula anterior"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Ant Línia"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Seg Línia"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Paraula següent"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Inici"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Fi"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Troba la clau corresponent"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Princ de par"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Final de par"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Desplaça amunt"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Desplaça avall"
 
-#: src/global.c:856
-msgid "Previous File"
-msgstr "Anterior fitxer"
-
 #: src/global.c:858
+msgid "Prev File"
+msgstr "Fitxer anterior"
+
+#: src/global.c:860
 msgid "Next File"
-msgstr "Següent fitxer"
+msgstr "Fitxer següent"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Entrada textual"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Textual"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Retorn"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Retrocés"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "RetallaFinsFinal"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Compte de paraules"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Suspèn"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "HistPrèv"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "HistSeg"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Vés al text"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Format DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Format Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Afegeix"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Avantposa"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Fes còpia de seguretat"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Executa una ordre"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "A fitxers"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Primer fitxer"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Últim fitxer"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Miss lint ant"
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "Miss lint seg"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Mode ajuda"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Visualització constant de la posició del cursor"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Utilitza una línia més per a editar"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Desplaçament suau"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Ajusta suaument les línies llargues"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Mostra l'espai en blanc"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Resaltat de sintaxi en color"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Tecla «Inici» intel·ligent"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Sagna automàticament"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Retalla fins al final"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Ajustament de línies llargues"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Ajusta completament les línies llargues"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversió de les tabulacions introduïdes a espais"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Fitxers de còpia de seguretat"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Múltiples búfers de fitxers"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Suport per a ratolí"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Sense conversió des del format DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Suspensió"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Ajustament de línies suau"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -998,7 +1097,7 @@ msgstr ""
 "l'indicatiu de recerca. Prémer Retorn sense introduir cap text durà a terme "
 "l'anterior recerca. "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1012,7 +1111,7 @@ msgstr ""
 " Les següents tecles de funció estan disponibles en el mode Cerca:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1032,7 +1131,7 @@ msgstr ""
 " Les següents tecles de funció estan disponibles en el mode anar a línia:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1054,7 +1153,7 @@ msgstr ""
 "F o amb un fitxer nanorc, la inserció d'un fitxer farà que es carregue en un "
 "búfer diferent (feu servir Meta-< i > per a canviar de búfers de fitxer). "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1069,7 +1168,7 @@ msgstr ""
 "fitxer:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1097,7 +1196,7 @@ msgstr ""
 " Les següents tecles de funció estan disponibles en el mode desa el fitxer:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1123,7 +1222,7 @@ msgstr ""
 "fitxers:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1148,7 +1247,7 @@ msgstr ""
 "l'anterior recerca.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1157,7 +1256,7 @@ msgstr ""
 "navegador:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1180,7 +1279,7 @@ msgstr ""
 "«anar a un directori»:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1205,7 +1304,7 @@ msgstr ""
 "d'ortografia:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1225,7 +1324,7 @@ msgstr ""
 " Les següents tecles de funció estan disponibles al mode Executa una ordre:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1246,7 +1345,7 @@ msgstr ""
 "inferior i mostra missatges importants. Les últimes dues línies mostren les "
 "dreceres més utilitzades a l'editor."
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1265,7 +1364,7 @@ msgstr ""
 "s'hi pot accedir mitjançant les tecles Esc, Alt o Meta, tot depenent de la "
 "configuració del vostre teclat. "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1279,15 +1378,15 @@ msgstr ""
 "alternatives estan representades entre parèntesi:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "habilita/inhabilita"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "La tecla és il·legal al mode visualització"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1296,7 +1395,7 @@ msgstr ""
 "\n"
 "S'ha escrit el búfer en %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1305,7 +1404,7 @@ msgstr ""
 "\n"
 "No s'ha escrit el búfer a %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1314,263 +1413,268 @@ msgstr ""
 "\n"
 "No s'ha escrit el búfer: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
-msgstr "La mida de la terminal és massa petita per a nano...\n"
+msgstr "La mida del terminal és massa petita per al nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr "Forma d'ús: nano [OPCIONS] [[+L�NIA,COLUMNA] FITXER]...\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opció\t\tOpció llarga GNU\tSignificat\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opció\t\tSignificat\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Mostra aquest missatge"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+L�NIA,COLUMNA"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Comença en la línia número L�NIA, columna COLUMNA"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Habilita la tecla «inici» intel·ligent"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Fes còpies de seguretat dels fitxers existents"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Directori on desar els fitxers de còpia de seguretat únics"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Utilitza negreta en comptes de text amb els colors invertits"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Converteix les tabulacions introduïdes a espais"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Habilita múltiples búfers de fitxers"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Empra fitxers de blocatge (a l'estil del Vim)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Registra i llegeix la història de cerca/reemplaça"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "No faces servir els fitxers nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Arregla el problema de confusió del teclat numèric"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "No afegeixes retorns de carro al final dels fitxers"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "No converteixes des del format DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Utilitza una línia més per a editar"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Emmagatzema i llegeix la posició del cursor"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<cad>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Marcador de cita"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Mode restringit"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Desplaça't per línies en lloc de mitges pantalles"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Estableix l'amplada de tab a #cols columnes"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Neteja la barra d'estat ràpidament"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Imprimeix informació sobre la versió i surt"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Detecta els límits entre paraules amb més detall"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <cad>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<cad>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Definició de sintaxi a utilitzar per a colorejar"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Mostra contínuament la posició del cursor"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Arregla el problema de confusió entre Esborra/Suprimeix"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Mostra aquest text d'ajuda"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Sagna automàticament noves línies"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Retalla des del cursor al final de línia"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "No segueixes enllaços simbòlics, sobreescriu-los"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Habilita l'ús del ratolí"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "No llegeixes el fitxer (només escriu sobre ell)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Estableix directori d'operació"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Preserva les tecles XON (^Q) i XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Omet silenciosament problemes d'inici com errors al fitxer rc"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Estableix el punt d'ajustament a la columna #cols"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Habilita un corrector alternatiu"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Desa automàticament en sortir, no preguntes"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Permet el desfer genèric [EXPERIMENTAL]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Mode de visualització (només lectura)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
 msgstr "No ajustes les línies llargues"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "No mostres les dues línies d'ajuda"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Habilita la suspensió"
 
-#: src/nano.c:924
-#, fuzzy
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "Habilita l¡ajustament suau de línies"
-
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorades, per a compatibilitat amb Pico)"
+msgstr "Habilita l'ajustament suau de línies"
 
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano versió %s (compilat %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano, versió %s\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Correu-e: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1579,154 +1683,179 @@ msgstr ""
 "\n"
 " Opcions compilades:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "El suport per a aquesta funció està inhabilitat"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Cap nom de fitxer"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Voleu desar el búfer modificat (RESPONDRE «No» DESTRUIRÀ ELS CANVIS) ?"
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "No s'ha pogut tornar a obrir l'entrada estàndard des del teclat\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "S'està llegint des de l'entrada estàndard, ^C per a avortar-ho\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "S'ha rebut SIGHUP o SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Utilitzeu «fg» per a tornar a nano.\n"
+msgstr "Empreu «fg» per a tornar al nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "habilitat"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "inhabilitat"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "L'ordre és desconeguda"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorat, blah, blah"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorat, blah, blah"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "La mida de tabulador demanada «%s» és invàlida"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "La mida de plenat demanada «%s» és invàlida"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Introduïu «%s -h» per obtenir una llista de les opcions disponibles.\n"
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "TtAa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Sí"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Totes"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "No"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Error en %s en la línia %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "L'argument «%s» té una «\"» no terminada"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Les cadenes d'expressió regular han de començar i acabar amb un caràcter \""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "L'expreg «%s» és invàlida: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Manca el nom de la sintaxi"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "La sintaxi «none» és reservada"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "La sintaxi «default» no admet extensions"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Manca el nom de la clau"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "les assignacions de tecles han de començar amb «^», «M» o «F»"
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "El nom de la tecla és massa curt"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "El nom de la tecla ha de començar amb «^», «M» o «F»"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr "Heu d'especificar una funció a la qual assignar la tecla"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Heu d'especificar un menú al qual assignar la tecla (o «all»)"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
+"Heu d'especificar un menú (o «all») en què assignar/desassignar la tecla"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:489
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "No s'ha pogut assignar «%s» a una funció"
+msgid "Cannot map name \"%s\" to a function"
+msgstr "No es pot assignar el nom «%s» a una funció"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "No s'ha pogut assignar el nom «%s» a un menú"
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "No es pot assignar el nom «%s» a un menú"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "La combinació «%s» és una assignació il·legal"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "La funció «%s» no existeix al menú «%s»"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "La combinació «%s» no es pot reassignar"
+
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "S'ha produït un error en expandir %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1741,135 +1870,193 @@ msgstr ""
 "«black», amb el prefix opcional «bright»\n"
 "per als colors de primer pla."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "No es pot afegir una ordre de color sense una ordre de sintaxi"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Manca el nom del color"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "El color de fons «%s» no pot ser brillant"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Manca la cadena d'expreg"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "«start=» requereix el seu «end=» corresponent"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "El color de fons «%s» no pot ser brillant"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "No es pot afegir una expreg de capçalera sense una ordre de sintaxi"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+"No es pot afegir una expreg de cadena de «magic» sense una ordre de sintaxi"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Manca el nom de cadena de «magic»"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "No es pot afegir un analitzador sense una ordre de sintaxi"
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Manca l'ordre de l'analitzador"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "No es pot afegir un formatador sense una ordre de sintaxi"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Manca l'ordre del formatador"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Error fatal: no hi ha lletres asignades per a la funció «%s»"
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr ""
+"Error fatal: no hi ha lletres asignades per a la funció «%s». S'està "
+"sortint.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"S'està sortint. Useu nano amb l'opció -I si heu d'ajustar les vostres "
-"preferències\n"
+"Si és necessari, empreu el nano amb l'opció -I  per a ajustar les vostres "
+"preferències.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "No s'ha trobat la sintaxi «%s» a estendre"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "L'ordre «%s» no es pot utilitzar a un fitxer inclós"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "La sintaxi «%s» no té ordres de colors"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "No es pot entendre l'ordre «%s»"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Manca el senyalador"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Manca l'opció"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "L'opció «%s» requereix un argument"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "L'opció no és una cadena d'octets múltiples vàlida"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Es requereixen caràcters que no siguen d'espaiat"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Es necessiten dos caràcters d'una columna"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "No es pot llevar el senyalador «%s»"
+msgid "Cannot unset option \"%s\""
+msgstr "No es pot desestablir l'opció «%s»"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "El senyalador «%s» és desconegut"
+msgid "Unknown option \"%s\""
+msgstr "L'opció «%s» és desconeguda"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
-msgstr "No s'ha pogut trobar el directori d'usuari! Wah!"
+msgstr "No s'ha pogut trobar el directori d'usuari! Ai!"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Premeu Intro per a continuar carregant el nano.\n"
 
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "«%.*s%s» no trobat"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Maj/Min]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [ExpReg]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Cap Enrere]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (a reemplaçar) dins de la selecció"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (a reemplaçar)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Voleu reemplaçar aquesta instància?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Reemplaça amb"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "S'ha reemplaçat %lu coincidència"
 msgstr[1] "S'han reemplaçat %lu coincidències"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Introduïu el número de línia, número de columna"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "El número de línia o columna és invàlid"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "No és una clau"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "No hi ha clau corresponent"
 
@@ -1881,221 +2068,322 @@ msgstr "Marca establida"
 msgid "Mark Unset"
 msgstr "Marca esborrada"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "No hi ha res al búfer de desfer."
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 "Error intern: no hi ha coincidència per a la línia %d. Deseu el vostre "
-"treball"
+"treball."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "afegiment de text"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "supressió de text"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "ajustament de línies llargues"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "unió de línia"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "tall de text"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "enganxada de text"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "trencat de línia"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "inserció de text"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "reemplaçament de text"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Error intern: tipus desconegut. Deseu el vostre treball"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Error intern: tipus desconegut. Deseu el vostre treball."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "S'ha desfet l'acció (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "No hi ha res a refer."
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr ""
-"Error intern: la configuració del refer ha fallat. Deseu el vostre treball"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "Error intern: no es pot configurar el desfer. Deseu el vostre treball."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "S'ha refet l'acció (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "No s'ha pogut canalitzar"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "No s'ha pogut crear un conducte"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "No s'ha pogut iniciar un altre procés"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 "Error intern: no es pot configurar l'enganxada. Deseu el vostre treball."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Error intern: tipus desconegut. Deseu el vostre treball."
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "El marcador de cita %s és erroni: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Ara podeu desjustificar!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Edita un reemplaçament"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "No s'ha pogut crear un conducte"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "S'està creant una llista de paraules incorrectes, espereu..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "No s'ha pogut obtindre la mida de la memòria intermèdia del conducte"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "S'ha produït un error en iniciar «spell»"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "S'ha produït un error en iniciar «sort -f»"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "S'ha produït un error en iniciar «uniq»"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Revisió d'ortografia finalitzada"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "S'ha produït un error en iniciar executar «%s»"
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "S'està invocant el corrector ortogràfic, espereu"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "La comprovació d'ortografia ha fallat: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "La comprovació d'ortografia ha fallat: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "No hi ha cap analitzador definit per a aquest tipus de fitxer!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Voleu desar el búfer abans d'analitzar-ho?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "S'esta invocant l'analitzador, espereu"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "S'han rebut 0 línies analitzables de l'ordre: %s"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+"Aquest missatge és pel fitxer no obert %s, voleu obrir-lo en un nou búfer?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "A l'últim missatge"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Al primer missatge"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Error: no s'ha definit un formatador"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Finalitzat"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "S'esta invocant el formatador, espereu"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Ha finalitzat el format"
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sParaules: %lu  Línies: %ld  Caràcters: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "A la selecció:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Entrada textual"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano s'ha quedat sense memòria!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Entrada d'Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Modificat"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Visualitza"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Fitxer:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Avís: s'està modificant un fitxer no blocat, comproveu permisos del directori"
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "línia %ld/%ld (%d%%), col %lu/%lu (%d%%), car %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "L'editor de text GNU nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "versió"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Per cortesia de:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Agraïments especials per a:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "La Fundació per al Software Lliure (FSF)"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "els molts traductors i el TP"
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Per ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "i per qualsevol dels qui ens hem oblidat esmentar..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Gràcies per fer servir nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Error intern: no hi ha coincidència per a la línia %ld. Deseu el vostre "
+#~ "treball."
+
+#~ msgid "line wrap"
+#~ msgstr "ajustament de línies llargues"
+
+#~ msgid "Insert File"
+#~ msgstr "Insereix un fitxer"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Vés a la pàgina anterior"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Troba la clau corresponent"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Ajustament de línies llargues"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Ajustament de línies suau"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Permet el desfer genèric [EXPERIMENTAL]"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(ignorades, per a compatibilitat amb Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Heu d'especificar un menú al qual assignar la tecla (o «all»)"
+
+#~ msgid "Missing flag"
+#~ msgstr "Manca el senyalador"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Error intern: tipus desconegut. Deseu el vostre treball"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "Error intern: la configuració del refer ha fallat. Deseu el vostre treball"
+
+#~ msgid "Could not pipe"
+#~ msgstr "No s'ha pogut canalitzar"
+
 #~ msgid "line split"
 #~ msgstr "trencament de línia"
 
@@ -2175,9 +2463,6 @@ msgstr "Gràcies per fer servir nano!"
 #~ msgid "Duplicate syntax name %s"
 #~ msgstr "El nom de la sintaxi %s és duplicat"
 
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "No s'ha pogut crear un fitxer temporal: %s"
-
 #~ msgid "Find other bracket"
 #~ msgstr "Troba la clau corresponent"
 
@@ -2247,8 +2532,8 @@ msgstr "Gràcies per fer servir nano!"
 
 #~ msgid "Could not set owner %d/group %d on backup %s: %s"
 #~ msgstr ""
-#~ "No s'ha pogut establir el propietari %d/grup %d en la còpia de seguretat %"
-#~ "s: %s"
+#~ "No s'ha pogut establir el propietari %d/grup %d en la còpia de seguretat "
+#~ "%s: %s"
 
 #~ msgid "Could not set access/modification time on backup %s: %s"
 #~ msgstr ""
diff --git a/po/cs.gmo b/po/cs.gmo
index 5ae0be4..79141cd 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 81f7b5b..ed6fd27 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,116 +1,141 @@
-# Czech translation for nano
+# Czech translation for nano.
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
-# Pavel Fric <pavelfric@seznam.cz>, 2010.
 # Václav Haisman <V.Haisman@sh.cvut.cz>, 2000, 2001.
+# Pavel Fric <pavelfric@seznam.cz>, 2010, 2012, 2013, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-10-19 22:11+0100\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2014-07-19 16:10+0200\n"
 "Last-Translator: Pavel Fric <pavelfric@seznam.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.5\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Jít do adresáře"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Zrušeno"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "V omezeném režimu nelze jít mimo %s"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Chyba při �tení: %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Nepodařilo se přejít do nadřazeného adresáře"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(adresář)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(rodi�ovský adresář)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Hledat"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Rozlišovat velikost písmen]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [regulární výraz]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Zpět]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Hledání dokon�eno"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Toto je jediný výskyt"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Žádný sou�asný vzor hledání"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr "Nepodařilo se ur�it moji identitu pro soubor lock (getpwuid() selhal)"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Nepodařilo se ur�it název po�íta�e pro soubor lock: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Chyba při zápisu souboru lock %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Chyba při mazání souboru lock %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Chyba při otevírání souboru lock %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "Chyba �tení souboru lock %s: Nepře�ten dostatek dat"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Chyba při zápisu souboru lock: Adresář '%s' neexistuje"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Nelze vložit soubor z vně %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Žádné další otevřené souborové vyrovnávací paměti"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Přepnuto na %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Nová vyrovnávací paměť"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -118,7 +143,7 @@ msgstr[0] "Pře�ten jeden řádek (převeden z formátu DOS a Mac)"
 msgstr[1] "Pře�teny %lu řádky (převedeny z formátu DOS a Mac)"
 msgstr[2] "Pře�teno %lu řádků (převedeny z formátu DOS a Mac)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -136,7 +161,7 @@ msgstr[2] ""
 "Pře�teno %lu řádků (převedeny z formátu DOS a Mac - Varování: Žádné "
 "oprávnění pro zápis)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -144,7 +169,7 @@ msgstr[0] "Pře�ten jeden řádek (převeden z formátu Mac)"
 msgstr[1] "Pře�teny %lu řádky (převedeny z formátu Mac)"
 msgstr[2] "Pře�teno %lu řádků (převedeny z formátu Mac)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -160,7 +185,7 @@ msgstr[2] ""
 "Pře�teno %lu řádků (převedeny z formátu Mac - Varování: Žádné oprávnění pro "
 "zápis)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -168,7 +193,7 @@ msgstr[0] "Pře�ten jeden řádek (převeden z formátu DOS)"
 msgstr[1] "Pře�teny %lu řádky (převedeny z formátu DOS)"
 msgstr[2] "Pře�teno %lu řádků (převedeny z formátu DOS)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -184,7 +209,7 @@ msgstr[2] ""
 "Pře�teno %lu řádků (převedeny z formátu DOSc - Varování: Žádné oprávnění pro "
 "zápis)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -192,7 +217,7 @@ msgstr[0] "Pře�ten jeden řádek"
 msgstr[1] "Pře�teny %lu řádky"
 msgstr[2] "Pře�teno %lu řádků"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
@@ -200,87 +225,95 @@ msgstr[0] "Pře�ten jeden řádek (Varování: Žádné oprávnění pro zápis
 msgstr[1] "Pře�teny %lu řádky (Varování: Žádné oprávnění pro zápis)"
 msgstr[2] "Pře�teno %lu řádků (Varování: Žádné oprávnění pro zápis)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "ÄŒte se soubor"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Nový soubor"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" nenalezen"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ je adresář"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" je soubor zařízení"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Příkaz k provedení v nové vyrovnávací paměti [z %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Příkaz k provedení [z %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Soubor k vložení do nové vyrovnávací paměti [z %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Soubor k vložení [z %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Klávesa nepřípustná, když není v režimu více vyrovnávacích pamětí"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"Nepodařilo se zapsat zálohovací soubor. Pokra�ovat v ukládání? (N, nejste-li "
+"si jisti) "
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Nelze zapsat vnÄ› %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
-"Nelze připojit dopředu nebo dozadu k symbolickému odkazu, když je nastaveno "
-"--nofollow"
+"Nelze připojit na za�átek nebo připojit na konec k symbolickému odkazu, když "
+"je nastaveno --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Chyba při zápisu zálohovacího souboru %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Příliš mnoho zálohovacích souborů?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Chyba při zápisu %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Chyba při zápisu do�asného souboru s: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -288,706 +321,770 @@ msgstr[0] "Zapsán jeden řádek"
 msgstr[1] "Zapsány %lu řádky"
 msgstr[2] "Zapsáno %lu řádků"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Formát DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Formát Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Záloha]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
-msgstr "Připojit výběr k souboru dopředu"
+msgstr "Připojit výběr na za�átek souboru"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "Připojit výběr k souboru"
+msgstr "Připojit výběr na konec souboru"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Zapsat výběr do souboru"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
-msgstr "Název souboru k připojení dopředu"
+msgstr "Název souboru, na jehož za�átek provést připojení"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
-msgstr "Název souboru k připojení"
+msgstr "Název souboru, na jehož konec provést připojení"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Název souboru k zapsání"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Soubor existuje. PŘEPSAT?"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Uložit soubor pod JIN�M N�ZVEM? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Soubor byl poté, co jste jej otevřel, upraven. Pokra�ovat v ukládání?"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(více)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Stiskněte klávesu Enter pro pokra�ování ve spouštění programu nano.\n"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Zrušit"
+"Stiskněte klávesu Enter pro pokra�ování \n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "Nahradit"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Nelze vytvořit adresář %s: %s\n"
+"Je vyžadován pro ukládání/nahrávání historie hledání nebo poloh ukazatele.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Žádné nahrazení"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"Cesta %s není adresářem, a je třeba, aby byla.\n"
+"Nano nebude schopen nahrát nebo uložit historii hledání nebo poloh "
+"ukazatele.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "VELK� P�SMENA/malá písmena"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Zjištěn zděděný soubor s historií nano (%s). Byl u�iněn pokus o jeho přesun\n"
+"do upřednostňovaného umístění (%s), ale vyskytla se chyba: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Zpět"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Zjištěn zděděný soubor s historií nano (%s). Byl přesunut\n"
+"do upřednostňovaného umístění (%s)\n"
+"(viz FAQ pro nano k této změně)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Regulární výraz"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Ukon�it"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "Předchozí historie"
+#: src/global.c:478
+msgid "Close"
+msgstr "Zavřít"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "Další historie"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Vložit text"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Jít na text"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Zrušit zarovnání"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
-msgstr "Kde je další"
-
-#: src/global.c:457
-msgid "First File"
-msgstr "První soubor"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Poslední soubor"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Jít na soubory"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Formát DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Formát Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Připojit"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Připojit dopředu"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Soubor se zálohou"
+msgstr "Hledat další"
 
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Provést příkaz"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Jít do adresáře"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Získat nápovědu"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Ukon�it"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
-msgstr "Kde je"
-
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Předchozí strana"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Další strana"
+msgstr "Hledat"
 
-#: src/global.c:485
-msgid "First Line"
-msgstr "První řádek"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Nahradit"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Poslední řádek"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Přejít na řádek"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Odložit (na pozadí)"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Předchozí řádek"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Za�átek odstavce"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Další řádek"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Konec odstavce"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Otevřít soubor"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Plné zarovnání"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Vložit soubor"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Přejít na řádek"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Zarovnat nynější odstavec"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Zrušit sou�asnou funkci"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Zobrazit tento text s nápovědou"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Zavřít nynější souborovou vyrovnávací paměť/Ukon�it nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Ukon�it nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Zapsat nynější soubor na disk"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Vložit další soubor do nynějšího"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Hledat řetězec nebo regulární výraz"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Jít na předchozí obrazovku"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Hledat řetězec"
 
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "Jít na další obrazovku"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Jít o jednu obrazovku nahoru"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Jít o jednu obrazovku dolů"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Vyjmout nynější řádek a uložit jej ve schránce"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Vložit ze schránky do nynějšího řádku"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
-msgstr "Zobrazit polohu ukazovátka"
+msgstr "Zobrazit polohu ukazatele"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
-msgstr "Vyvolat ověření pravopisu (je-li dostupné)"
+msgstr "Vyvolat ověřování pravopisu (je-li dostupné)"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Nahradit řetězec nebo regulární výraz"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Jít na ur�itý řádek a sloupec"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Ozna�it text v poloze ukazovátka"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Ozna�it text po�ínaje od polohy ukazatele"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr "Opakovat poslední hledání"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Zkopírovat nynější řádek a uložit jej ve schránce"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Odsadit nynější řádek"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Zrušit odsazení nynějšího řádku"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Zrušit poslední operaci"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Zopakovat poslední zrušenou operaci"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Jít o jeden znak vpřed"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Jít o jeden znak zpět"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Jít o jedno slovo vpřed"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Jít o jedno slovo zpět"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Jít na předchozí řádek"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Jít na další řádek"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Jít na za�átek nynějšího řádku"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Jít na konec nynějšího řádku"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Jít na za�átek odstavce; potom předchozího odstavce"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Jít za koneck odstavce; potom dalšího odstavce"
+msgstr "Jít za konec odstavce; potom dalšího odstavce"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Jít na první řádek souboru"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Jít na poslední řádek souboru"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Jít na odpovídající závorky"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr "Posunout obraz o jeden řádek nahoru, aniž by se pohnulo ukazovátko"
+msgstr "Posunout obraz o jeden řádek nahoru, aniž by se pohnul ukazatel"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr "Posunout obraz o jeden řádek dolů, aniž by se pohnulo ukazovátko"
+msgstr "Posunout obraz o jeden řádek dolů, aniž by se pohnul ukazatel"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Přepnout na předchozí souborovou vyrovnávací paměť"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Přepnout na další souborovou vyrovnávací paměť"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr "Vložit další znak přímo (doslovně, nevykládaný)"
+msgstr "Vložit další znak přímo (takový jaký je)"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "Vložit zarážku v poloze ukazovátka"
+msgstr "Vložit zarážku v poloze ukazatele"
 
 #: src/global.c:581
 msgid "Insert a newline at the cursor position"
-msgstr "Vložit zalomení řádku v poloze ukazovátka"
+msgstr "Vložit zalomení řádku v poloze ukazatele"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
-msgstr "Smazat znak v poloze ukazovátka"
+msgstr "Smazat znak v poloze ukazatele"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
-msgstr "Smazat znak nalevo od polohy ukazovátka"
+msgstr "Smazat znak nalevo od polohy ukazatele"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Vyjmout od polohy ukazovátka po konec souboru"
+msgstr "Vyjmout od polohy ukazatele po konec souboru"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Zarovnat celý soubor"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Spo�ítat po�et slov, řádků a znaků"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Obnovit (překreslit) sou�asnou obrazovku"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr "Odložit editor na pozadí (je-li povolen \"suspend\")"
+msgstr ""
+"Odložit editor na pozadí (máte-li oprávnění, je-li povolen \"suspend\")"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Přepnout při hledání rozlišování mezi psaním velkých a malých písmen"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Obrátit směr hledání"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Přepnout používání regulárních výrazů"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "Vybavit předchozí řetězec hledání/nahrazení"
+msgstr "Vyvolat předchozí řetězec hledání/nahrazení"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "Vybavit další řetězec hledání/nahrazení"
+msgstr "Vyvolat další řetězec hledání/nahrazení"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Jít do prohlíže�e souborů"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Přepnout zápis ve formátu DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Přepnout zápis ve formátu Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
-msgstr "Přepnout připojování"
+msgstr "Přepnout připojování na konec souboru"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr "Přepnout připojování dopředu"
+msgstr "Přepnout připojování na za�átek souboru"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Přepnout zálohování původního souboru při ukládání"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Provést vnější příkaz"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Přepnout používání nové vyrovnávací paměti"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Ukon�it prohlíže� souborů"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Jít na první řádek v seznamu"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Jít na poslední řádek v seznamu"
 
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "Jít na další řádek v seznamu"
-
-#: src/global.c:642
+#: src/global.c:634
 msgid "Go to the previous file in the list"
 msgstr "Jít na předchozí řádek v seznamu"
 
-#: src/global.c:643
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Jít na další řádek v seznamu"
+
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Jít do adresáře"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Zavřít"
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Vyvolat statický rozbor (je-li dostupný)"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
-msgstr "Uložit"
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Jít na předchozí zprávu statického rozboru"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
-msgid "Justify"
-msgstr "Zarovnat"
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Jít na další zprávu statického rozboru"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Otevřít soubor"
+#: src/global.c:642
+#, fuzzy
+msgid "Invoke formatter, if available"
+msgstr "Vyvolat statický rozbor (je-li dostupný)"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Nápověda"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: src/global.c:678
+msgid "Write Out"
+msgstr "Zapsat"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Jít do adresáře"
+
+#: src/global.c:719
 msgid "Cut Text"
 msgstr "Vyjmout text"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Zrušit zarovnání"
+#: src/global.c:728
+msgid "Justify"
+msgstr "Zarovnat"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Zrušit vyjmutí textu"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Pravopis"
+
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Statický rozbor"
+
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "Formát DOS"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "VELK� P�SMENA/malá písmena"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Regulární výraz"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Zpět"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Žádné nahrazení"
+
+#: src/global.c:770
 msgid "Cur Pos"
-msgstr "Poloha ukazovátka"
+msgstr "Ukazatel"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Pravopis"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Předchozí strana"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Další strana"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "První řádek"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Poslední řádek"
 
-#: src/global.c:771
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "K závorce"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Ozna�it text"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Kopírovat text"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Odsadit text"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Zrušit odsazení textu"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Zpět"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Znovu"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Vpřed"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Zpět"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Další slovo"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Vpřed"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Předchozí slovo"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Předchozí řádek"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Další řádek"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Další slovo"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
-msgstr "Poloha 1"
+msgstr "Za�átek"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Konec"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Najít jiné závorky"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Za�átek odstavce"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Konec odstavce"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Posunout obraz nahoru"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Posunout obraz dolů"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "Předchozí soubor"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Další soubor"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+msgid "Verbatim"
 msgstr "Přímé zadání"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Zarážka"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Delete (smazat následující znak)"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Backspace (smazat předcházející znak)"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "Vyjmout až po konec"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Po�et slov"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Odložit na pozadí"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Předchozí historie"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Další historie"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Jít na text"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Formát DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Formát Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Připojit na konec"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Připojit na za�átek"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Soubor se zálohou"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Provést příkaz"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Jít na soubory"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "První soubor"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Poslední soubor"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Předchozí rozbor"
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "Další rozbor"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Režim s nápovědou"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
-msgstr "Ukazovat stálou polohu ukazovátka"
+msgstr "Ukazovat stálou polohu ukazatele"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Používání ještě jednoho řádku k úpravám"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Plynulé posunování obrazu"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Plynulé zalamování dlouhých řádků"
+
+#: src/global.c:1237
 msgid "Whitespace display"
-msgstr "Zobrazování prázdného místa"
+msgstr "Zobrazování bílých znaků"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Barevné zvýrazňování skladby"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
-msgstr "Chytrá klávesa pro Polohu 1"
+msgstr "Chytrá klávesa pro za�átek dokumentu (Poloha 1)"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Automaticky odsadit"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Vyjmout po konec"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Zalamování dlouhých řádků"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Tvrdé zalamování dlouhých řádků"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Převod zadaných zarážek na mezery"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Zálohovací soubory"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Více souborových vyrovnávacích pamětí"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Podpora pro myš"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Žádný převod z formátů DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
-msgstr "Odklad na pozadí"
-
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Plynulé zalamování dlouhých řádků"
+msgstr "Odložit na pozadí"
 
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -999,7 +1096,7 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"Text s nápovědou pro příkaz ke hledání\n"
+"Nápověda pro příkaz Hledat\n"
 "\n"
 " Zadejte slova nebo znaky, podle kterých chcete hledat, a stiskněte klávesu "
 "Enter.  Pokud je pro vámi zadaný text nalezena shoda, obrazovka se posune k "
@@ -1009,7 +1106,7 @@ msgstr ""
 "závorkách. Stisknutí klávesy Enter bez zadání nějakého textu povede k "
 "provedení předchozího požadavku na hledání.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1023,7 +1120,7 @@ msgstr ""
 " Následující funk�ní klávesy jsou dostupné v režimu Hledání:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1034,7 +1131,7 @@ msgid ""
 " The following function keys are available in Go To Line mode:\n"
 "\n"
 msgstr ""
-"Text s nápovědou pro „Přejít na řádek“\n"
+"Nápověda pro Přejít na řádek\n"
 "\n"
 " zadejte �íslo řádku, na který si přejete přejít, a stiskněte klávesu Enter. "
 "Pokud je v textu menší po�et řádků, než jaký jste udal, nano provede skok na "
@@ -1043,7 +1140,7 @@ msgstr ""
 " Následující funk�ní klávesy jsou dostupné v režimu Přejít na řádek:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1055,10 +1152,10 @@ msgid ""
 "Meta-F toggle, or a nanorc file, inserting a file will cause it to be loaded "
 "into a separate buffer (use Meta-< and > to switch between file buffers).  "
 msgstr ""
-"Text s nápovědou pro Vložit soubor\n"
+"Nápověda pro Vložit soubor\n"
 "\n"
 " Zadejte název souboru, který se má vložit do nynější souborové vyrovnávací "
-"paměti v sou�asné poloze ukazovátka.\n"
+"paměti v sou�asné poloze ukazatele.\n"
 "\n"
 " Pokud jste nano sestavil s podporou pro více souborových vyrovnávacích "
 "pamětí, a povolil tuto funkci více souborových vyrovnávacích pamětí volbou "
@@ -1067,7 +1164,7 @@ msgstr ""
 "oddělené vyrovnávací paměti (použijte Meta-< a > pro přepínání mezi "
 "souborovými vyrovnávacími paměťmi)."
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1082,7 +1179,7 @@ msgstr ""
 " Následující funk�ní klávesy jsou dostupné v režimu Vložit soubor:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1097,12 +1194,12 @@ msgid ""
 " The following function keys are available in Write File mode:\n"
 "\n"
 msgstr ""
-"Text s nápovědou pro „Zapsat soubor“\n"
+"Nápověda pro Zapsat soubor\n"
 "\n"
 " Zadejte název, pod kterým si přejete uložit sou�asný soubor, a stiskněte "
 "klávesu Enter.\n"
 "\n"
-" Pokud jste ozna�il text, bude vám položena otázka, zda chete zapsat pouze "
+" Pokud jste ozna�il text, bude vám položena otázka, zda chcete zapsat pouze "
 "vybranou �ást textu do odděleného souboru. Abyste zmenšil nebezpe�í, že by "
 "došlo k přepsání nynějšího souboru jeho �ástí, není v tomto režimu nynější "
 "souborový název veden jako výchozí.\n"
@@ -1110,7 +1207,7 @@ msgstr ""
 " Následující funk�ní klávesy jsou dostupné v režimu Zapsat soubor:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1123,7 +1220,7 @@ msgid ""
 " The following function keys are available in the file browser:\n"
 "\n"
 msgstr ""
-"Text s nápovědou pro „Prohlíže� souborů\"\n"
+"Nápověda pro Prohlíže� souborů\n"
 "\n"
 " Prohlíže� souborů se používá pro názorné procházení uspořádání adresářů, "
 "aby se vybral soubor pro �tení nebo zápis. Můžete použít klávesy šipek nebo "
@@ -1135,7 +1232,7 @@ msgstr ""
 " Následující funk�ní klávesy jsou dostupné v prohlíže�i souborů:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1148,7 +1245,7 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"Text s nápovědou pro příkaz k \"Hledání v prohlíže�i souborů\"\n"
+"Nápověda pro příkaz Hledat v prohlíže�i souborů\"\n"
 "\n"
 " Zadejte slova nebo znaky, které byste chtěl vyhledat, a potom stiskněte "
 "klávesu Enter. Pokud dojde k nalezení textu shodného s textem, který jste "
@@ -1159,16 +1256,16 @@ msgstr ""
 "provedení předchozího požadavku na hledání.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-" Následující funk�ní klávesy jsou dostupné v režimu \"Hledání v prohlíže�i "
-"souborů\":\n"
+" Následující funk�ní klávesy jsou dostupné v režimu hledání v prohlíže�i "
+"souborů:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1180,7 +1277,7 @@ msgid ""
 " The following function keys are available in Browser Go To Directory mode:\n"
 "\n"
 msgstr ""
-"Text s nápovědou pro \"Jít do adresáře\" v prohlíže�i souborů\n"
+"Nápověda pro Jít do adresáře v prohlíže�i souborů\n"
 "\n"
 " Zadejte název adresáře, který byste chtěl procházet.\n"
 "\n"
@@ -1192,7 +1289,7 @@ msgstr ""
 "prohlíže�i souborů:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1205,7 +1302,7 @@ msgid ""
 " The following function keys are available in Spell Check mode:\n"
 "\n"
 msgstr ""
-"Text s nápovědou pro \"Ověřování pravopisu\"\n"
+"Nápověda pro ověřování pravopisu\n"
 "\n"
 " Ověřování pravopisu ověřuje pravopis celého textu v sou�asném souboru. "
 "Narazí-li se na neznámé slovo, je zvýrazněno a náhradu lze upravovat. Budete "
@@ -1216,7 +1313,7 @@ msgstr ""
 "\":\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1227,17 +1324,17 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-"Text s nápovědou pro \"Provést příkaz\"\n"
+"Nápověda pro Provést příkaz\n"
 "\n"
 " Tento režim vám umožňuje vložit výstup vnějšího příkazu, který byl proveden "
 "v shellu, do sou�asné vyrovnávací paměti (nebo do nové vyrovnávací paměti v "
 "režimu více souborových vyrovnávacích pamětí). Pokud potřebujete další "
-"prázdnou vyrovnávací paměť, nezadavejte žádný příkaz.\n"
+"prázdnou vyrovnávací paměť, nezadávejte žádný příkaz.\n"
 "\n"
 " Následující funk�ní klávesy jsou dostupné v režimu \"Provést příkaz\":\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1256,7 +1353,7 @@ msgstr ""
 "soubor změněn, nebo nebyl. Hlavní okno obsahuje soubor, který je upravován. "
 "Stavový řádek (třetí řádek zdola) ukazuje důležité zprávy.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1275,7 +1372,7 @@ msgstr ""
 "bu� pomocí klávesy Esc, Alt, nebo Meta v závislosti na nastavení vaší "
 "klávesnice.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1289,15 +1386,15 @@ msgstr ""
 "uváděny v závorkách:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "Zapnout/Vypnout"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Klávesa nepřípustná v režimu pouze pro �tení"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1306,7 +1403,7 @@ msgstr ""
 "\n"
 "Vyrovnávací paměť zapsána do %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1315,7 +1412,7 @@ msgstr ""
 "\n"
 "Vyrovnávací paměť nezapsána do %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1324,11 +1421,11 @@ msgstr ""
 "\n"
 "Vyrovnávací paměť nezapsána: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Velikost okna je pro nano příliš malá...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1337,253 +1434,259 @@ msgstr ""
 "Použití: nano [VOLBY] [[+Ř�DEK,SLOUPEC] SOUBOR]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Volba\t\tdlouhá volba GNU\t\tVýznam\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Volba\t\tVýznam\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Ukázat tuto zprávu"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+�DEK,SLOUPEC"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Za�ít na řádku Ř�DEK,sloupec SLOUPEC"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
-msgstr "Povolit chytrou klávesu Poloha 1"
+msgstr "Povolit chytrou klávesu pro za�átek dokumentu (Poloha 1)"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Uložit zálohy stávajících souborů"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <adresář>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<adresář>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Adresář pro ukládání jedine�ných zálohovacích souborů"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Použít tu�ný tisk místo opa�ného textu"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Převést zadané zarážky na mezery"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Povolit více souborových vyrovnávacích pamětí"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Použít soubory lock (ve stylu Vimu)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Zapisovat a �íst historii hledání/nahrazování řetězců"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Nezkoumat soubory nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Opravit zmatek okolo kláves na �íselné klávesnici"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Nepřidávat zalomení řádku na koncích souborů"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Nepřevádět soubory z formátů DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Používat ještě jeden řádek k úpravám"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Zapsat & pře�íst umístění polohy ukazatele"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <řetězec znaků>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<řetězec znaků>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Dání řetězce do uvozovek"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Omezený režim"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Posunovat obraz po řádcích místo po půlobrazovkách"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#sloupce>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#sloupce>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Nastavit velikost zarážky na #sloupce"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Provést rychlé vymazání stavového řádku"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
-msgstr "Vytisknout informaci o verzi a ukon�it"
+msgstr "Zobrazit informaci o verzi a ukon�it"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Rozpoznávat hranice slov přesněji"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <řetězec znaků>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<řetězec znaků>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Vymezení skladby k užití pro obarvování"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
-msgstr "Stále ukazovat polohu ukazovátka"
+msgstr "Stále ukazovat polohu ukazatele"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Odstranit záměnu kláves Backspace/Delete"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Ukázat tento text s nápovědou"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Automaticky odsadit nové řádky"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "Vyjmout od polohy ukazovátka po konec řádku"
+msgstr "Vyjmout od polohy ukazatele po konec řádku"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Nenásledovat symbolické odkazy, nýbrž přepsat"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Povolit použití myši"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Soubor ne�íst (pouze jej zapsat)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <adresář>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<adresář>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Nastavit pracovní adresář"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Zachovat klávesy XON (^Q) a XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Přecházet tiše potíže při spuštění, jako jsou chyby v souborech rc"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#sloupce>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#sloupce>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Nastavit bod zalomení při sloupci #sloupce"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Nastavit bod tvrdého zalomení při sloupci #sloupce"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <program>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<program>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Povolit náhradní program na ověřování pravopisu"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Při ukon�ení automaticky bez zpětného dotazu uložit"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Povolit obecnou funkci pro zpět [pokusné]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Režim pouze pro �tení (žádné změny nejsou možné)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Nezalamovat dlouhé řádky do nových řádků"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Nezalamovat dlouhé řádky natvrdo"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Neukazovat dva pomocné řádky"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Povolit odložení na pozadí (zastavit a zpět k shellu)"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "Povolit plynulé zalamování dlouhých řádků"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(přechází se, pro slu�itelnost s Pico)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU verze nano %s (sestaveno %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr ""
 "Adresa elektronické pošty: nano@nano-editor.org\tWWW: http://www.nano-editor."
 "org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1592,154 +1695,180 @@ msgstr ""
 "\n"
 " Volby při sestavování:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Promiňte, ale tato funkce není podporována"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Žádný název souboru"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Uložit změněnou vyrovnávací paměť (odpově� \"Ne\" zahodí změny)?"
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 "Obvyklý vstup (stdin) se z klávesnice znovu otevřít nepodařilo. Promiňte\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Čte se z obvyklého vstupu (stdin), ^C k pro přerušení\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Přijat SIGHUP nebo SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Použijte \"fg\" pro návrat do nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "povoleno"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "zakázáno"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Neznámý příkaz"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON nebrán na vědomí, huhňání"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF nebrán na vědomí, huhňání"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Požadovaná velikost zarážky \"%s\" je neplatná"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Požadovaná velikost výplně \"%s\" je neplatná"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Pište '%s -h' pro seznam dostupných voleb.\n"
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Ano"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "VÅ¡e"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Ne"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Chyba v %s na řádku %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument „%s“ má neukon�ené \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Řetězce znaků pro regulární výrazy musí za�ínat a kon�it znakem \""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Špatný regulární výraz \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Chybí název skladby"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "Skladba \"none\" je zamluvena"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
-msgstr "Skladba \"defaul\" nesmí mít žádné přípony"
+msgstr "Skladba \"default\" nesmí mít žádné přípony"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Chybí název klí�e"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Název klávesy zkratky je příliš krátký"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "Klávesové zkratky musí za�ínat \"^\", \"M\", nebo \"F\""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr "Funkce spojená s klávesou musí být zadána"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "Musí být zadána funkce spojená s klávesovou zkratkou"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Nabídka spojená s klávesou (nebo \"vše\") musí být zadána"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
+"Musí být zadána nabídka (funkce) (nebo \"all\" pro vše), se kterou je "
+"klávesová zkratka spojena"
+
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Nelze spojit název \"%s\" s funkcí"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Nepodařilo se spojit název \"%s\" s funkcí"
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Nelze spojit název \"%s\" s nabídkou"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:528
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Nepodařilo se spojit název \"%s\" s nabídkou"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Funkce '%s' neexistuje v nabídce '%s'"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:543
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "Promiňte, ale keystr \"%s\" není dovoleným přiřazením"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Promiňte, ale klávesu \"%s\" nelze znovu přiřadit"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Chyba při rozšíření %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1755,116 +1884,173 @@ msgstr ""
 "a „black“ (�erná), s volitelnou předponou „bright“ (světlá)\n"
 "pro barvy popředí."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Nelze přidat pokyn pro barvu bez příkazu pro skladbu"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Chybí název barvy"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Barva pozadí \"%s\" nemůže být světlá (\"bright\")"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Chybí řetězec regulárního výrazu"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ vyžaduje odpovídající „end=“"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Barva pozadí \"%s\" nemůže být světlá (\"bright\")"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Nelze přidat regulární výraz pro záhlaví bez příkazu pro skladbu"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+"Nelze přidat regulární výraz kouzelného řetězce bez příkazu pro skladbu"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Chybí název kouzelného řetězce"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "Nelze přidat statický rozbor bez příkazu pro skladbu - syntax"
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Chybí příkaz pro statický rozbor"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Nelze přidat statický rozbor bez příkazu pro skladbu - syntax"
+
+#: src/rcfile.c:1015
+#, fuzzy
+msgid "Missing formatter command"
+msgstr "Chybí příkaz pro statický rozbor"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Vážná chyba: s funkcí \"%s\" nejsou spojeny žádné klávesy"
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "Závažná chyba: S funkcí \"%s\" není spojena žádná klávesová zkratka.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Ukon�uje se. Spusťte, prosím, v případě potřeby nano s volbou \"-l\", chcete-"
-"li změnit svá nastavení nanorc\n"
+"Spusťte, prosím, v případě potřeby nano s volbou \"-l\", chcete-li změnit "
+"svá nastavení nanorc.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Nepodařilo se najít skladbu \"%s\" k rozšíření"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Příkaz \"%s\" nedovolen v zahrnutém souboru"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Skladba \"%s\" nemá pokyny pro barvy"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Příkazu \"%s\" neporozuměno"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Chybí příznak"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Chybějící volba"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Volba \"%s\" vyžaduje argument"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Volba není žádným platným řetězcem znaků multibyte"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Požadovány ne-prázdné znaky"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Požadovány dva znaky v rozsahu jednoho sloupce"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Nelze vypnout příznak \"%s\""
+msgid "Cannot unset option \"%s\""
+msgstr "Nelze vypnout volbu \"%s\""
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Neznámý příznak \"%s\""
+msgid "Unknown option \"%s\""
+msgstr "Neznámá volba \"%s\""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nemohu najít svůj domovský adresář! Jau!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Stiskněte klávesu Enter pro pokra�ování ve spouštění programu nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" nenalezen"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Rozlišovat velikost písmen]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [regulární výraz]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Zpět]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (k nahrazení) ve výběru"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (k nahrazení)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Nahradit tento případ?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Nahradit"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -1872,19 +2058,20 @@ msgstr[0] "Nahrazen jeden výskyt"
 msgstr[1] "Nahrazeny %lu výskyty"
 msgstr[2] "Nahrazeno %lu výskytů"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Zadat �íslo řádku, �íslo sloupce"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Neplatné �íslo řádku nebo, �íslo sloupce"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Žádná závorka"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Žádná odpovídající závorka"
 
@@ -1896,219 +2083,325 @@ msgstr "Zna�ka nastavena"
 msgid "Mark Unset"
 msgstr "Zna�ka odstraněna"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Nic ve vyrovnávací paměti pro \"Zpět\"!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
-msgstr "Vnitřní chyba: nelze nalézt řádek %d. Uložte, prosím, svou práci."
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr ""
+"Vnitřní chyba: Nelze nalézt shodu pro řádek %d. Uložte, prosím, svou práci."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "Přidat text"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "Smazat text"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "Zalomení řádku"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "Spojit řádek"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "Vyjmout text"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr "Vzít zpět vyjmutí textu"
+msgstr "Zrušit vyjmutí textu"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "Zalamovat řádky"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "Vložit text"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "Nahradit text"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr "Vnitřní chyba: neznámý typ. Uložte, prosím, svou práci."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Operace vrácena zpět (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Nic k zopakování!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
-"Vnitřní chyba: Příprava na zopakování operace se nezdařila. Uložte, prosím, "
-"svou práci."
+"Vnitřní chyba: Nelze připravit \"provést znovu\". Uložte, prosím, svou práci."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Operace zopakována (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Přenos dat se nepodařilo provést"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Nepodařilo se vytvořit přenos dat"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Vidlici se nepodařilo provést"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
-"Vnitřní chyba: vzetí vyjmutí zpět nelze nastavit. Uložte, prosím, svou práci."
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Vnitřní chyba: neznámý typ. Uložte, prosím, svou práci."
+"Vnitřní chyba: Nelze připravit �innost vložení (vzetí vyjmutí zpět). Uložte, "
+"prosím, svou práci."
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Neplatný řetězec znaku uvozovek %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Nyní lze zrušit zarovnání odstavce!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Upravit nahrazení"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Nepodařilo se vytvořit přenos dat"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Vytváří se seznam nesprávně napsaných slov. Čekejte, prosím,..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Nepodařilo se získat velikost vyrovnávací paměti přenosu dat"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Chyba při vyvolání „spell“"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Chyba při vyvolání „sort -f“"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Chyba při vyvolání „uniq“"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Ověřování pravopisu dokon�eno"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Chyba při vyvolání „%s“"
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Vyvolat ověření správného psaní. Po�kejte, prosím"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Ověření pravopisu se nezdařilo: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Ověření pravopisu se nezdařilo: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Pro tento typ souboru není stanoven žádný statický rozbor!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Uložit před statickým rozborem změněnou vyrovnávací paměť?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Volá se statický rozbor. Po�kejte, prosím"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Příkaz %s nevytvořil žádný zpracovatelný řádek"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+"Tato zpráva se týká neotevřeného souboru %s. Otevřít v nové vyrovnávací "
+"paměti?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Při poslední zprávě"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Při první zprávě"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+#, fuzzy
+msgid "Invoking formatter, please wait"
+msgstr "Volá se statický rozbor. Po�kejte, prosím"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sSlov: %lu  Řádků: %ld  Znaků: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Ve výběru:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Přímé zadání"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano už nemá paměti!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Vstup Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Změněno"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Pohled"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "Adresář:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Soubor:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Varování: Mění se soubor, který není zam�en. Ověřit oprávnění k adresáři?"
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "Řádek %ld/%ld (%d%%), Sloupec %lu/%lu (%d%%), Znak %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Textový editor nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "Verze"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Vyvíjeno:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Zvláštní poděkování:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Pro ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "a všichni nejmenovaní..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Děkujeme vám za to, že používáte nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Vnitřní chyba: Nelze nalézt shodu pro řádek %ld. Uložte, prosím, svou "
+#~ "práci."
+
+#~ msgid "line wrap"
+#~ msgstr "Zalomení řádku"
+
+#~ msgid "Insert File"
+#~ msgstr "Vložit soubor"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Jít na předchozí obrazovku"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Najít jiné závorky"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Zalamování dlouhých řádků"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Plynulé zalamování dlouhých řádků"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Povolit obecnou funkci pro zpět [pokusné]"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(přechází se, pro slu�itelnost s Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Nabídka spojená s klávesou (nebo \"vše\") musí být zadána"
+
+#~ msgid "Missing flag"
+#~ msgstr "Chybí příznak"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Vnitřní chyba: neznámý typ. Uložte, prosím, svou práci."
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "Vnitřní chyba: Příprava na zopakování operace se nezdařila. Uložte, "
+#~ "prosím, svou práci."
+
+#~ msgid "Could not pipe"
+#~ msgstr "Přenos dat se nepodařilo provést"
+
 #~ msgid "Error writing backup file %s: File owner mismatch"
 #~ msgstr "Chyba při zápisu zálohovacího souboru %s: Nesouhlasí vlastník"
diff --git a/po/da.gmo b/po/da.gmo
index af55c44..67709a7 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 0a644d3..b5b3dbc 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the nano package.
 #
 # Keld Simonsen <keld@dkuug.dk>, 2001-2003
-# Ask Hjorth Larsen <asklarsen@gmail.com>, 2010
+# Ask Hjorth Larsen <asklarsen@gmail.com>, 2010-2011
 #
 # Konventioner:
 #   view mode -> visningstilstand ?
@@ -13,117 +13,142 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-06-14 14:48+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2011-11-11 22:53+0100\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "GÃ¥ til katalog"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Afbrudt"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Kan ikke gå uden for %s i begrænset tilstand"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fejl ved læsning af %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Kan ikke gå et katalog op"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(kat)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(ophavs-kat)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Søg"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Versalfølsom]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Regudtr]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Bagud]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Søgningen genstartet fra begyndelsen"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Dette er det eneste tilfælde"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Intet aktuelt søgemønster"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Kunne ikke sætte rettighederne %o på %s: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Fejl ved skrivning af sikkerhedskopifil %s: %s"
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Fejl ved skrivning af sikkerhedskopifil %s: %s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Fejl ved skrivning af sikkerhedskopifil %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, fuzzy, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Fejl ved skrivning af sikkerhedskopifil %s: Filens ejer stemmer ikke"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kan ikke indsætte fil fra ydersiden af %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Ikke flere åbne filbuffere"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Skiftede til %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Ny buffer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Læste %lu linje (Konverteret fra DOS- og Mac-format)"
 msgstr[1] "Læste %lu linjer (Konverteret fra DOS- og Mac-format)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -138,14 +163,14 @@ msgstr[1] ""
 "Læste %lu linjer (Konverteret fra DOS- og Mac-format - Advarsel: Ingen "
 "skriveadgang)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Læste %lu linje (Konverteret fra Mac-format)"
 msgstr[1] "Læste %lu linjer (Konverteret fra Mac-format)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -156,14 +181,14 @@ msgstr[0] ""
 msgstr[1] ""
 "Læste %lu linjer (Konverteret fra Mac-format - Advarsel: Ingen skriveadgang)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Læste %lu linje (Konverteret fra DOS-format)"
 msgstr[1] "Læste %lu linjer (Konverteret fra DOS-format)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -174,497 +199,450 @@ msgstr[0] ""
 msgstr[1] ""
 "Læste %lu linjer (Konverteret fra DOS-format - Advarsel: Ingen skriveadgang)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Læste %lu linje"
 msgstr[1] "Læste %lu linjer"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] "Læs %lu linje (Advarsel: Ingen skriveadgang)"
 msgstr[1] "Læs %lu linjer (Advarsel: Ingen skriveadgang)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Læser filen"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Ny fil"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" kunne ikke findes"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" er et katalog"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" er en enhedsfil"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Kommando at køre i ny buffer [fra %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Kommando der skal køres [fra %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fil at indsætte i ny buffer [fra %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fil at indsætte [fra %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tasten ugyldig i ikke-multibuffer-tilstand"
 
-#: src/files.c:1486
+# afsluttende mellemrum efter strengen bevirker sandsynligvis at tekstmarkøren står rigtigt
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"Kunne ikke skrive sikkerhedskopi; fortsæt med at gemme? (Sig N hvis usikker) "
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan ikke skrive uden for %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "Kan ikke foran- eller efterstille til symlænke med --nofollow givet"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Fejl ved skrivning af sikkerhedskopifil %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "For mange sikkerhedskopifiler?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fejl ved skrivning af %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fejl ved skrivning af midlertidig fil: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Skrev %lu linje"
 msgstr[1] "Skrev %lu linjer"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS-format]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac-format]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Sikkerhedskopi]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Foranstil udvalg til fil"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Tilføj udvalg til fil"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Skriv udvalg til fil"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Filnavn at foranstille på"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Filnavn at tilføje på"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Filnavn at skrive"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
-msgstr "Filen findes, OVERSKRIV?"
+msgstr "Filen findes, OVERSKRIV? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
-msgstr "Gem filen under ET ANDET NAVN?"
+msgstr "Gem filen under ET ANDET NAVN? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
-msgstr "Filen blev ændret siden du sidst åbnede den, gem alligevel?"
+msgstr "Filen blev ændret siden du sidst åbnede den, gem alligevel? "
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(mere)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Tryk enter for at fortsætte opstart af nano.\n"
+"Tryk retur for at fortsætte\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Annullér"
+#: src/files.c:2989
+#, fuzzy, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Kan ikke oprette kataloget %s: %s\n"
+"Dette kræves for at kunne gemme/hente søgehistorik eller markørposition\n"
 
-# max 10 tegn
-#: src/global.c:416
-msgid "Replace"
-msgstr "Erstat"
+#: src/files.c:2995
+#, fuzzy, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"Stien %s er ikke et katalog, men skal være det.\n"
+"Nano vil ikke kunne indlæse eller gemme søge- eller markørpositionshistorik\n"
 
-# max 10 tegn
-#: src/global.c:417
-msgid "No Replace"
-msgstr "ErstatIkke"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Fandt en ældre nanohistorikfil (%s), som jeg forsøgte at flytte\n"
+"til den foretrukne placering (%s), men stødte på en fejl: %s"
 
-# max 10 tegn
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "VersalFøls"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Fandt en ældre nanohistorikfil (%s), som jeg flyttede\n"
+"til den foretrukne placering (%s)\n"
+"(se OSS om nano vedrørende denne ændring)"
 
 # max 10 tegn
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Baglæns"
-
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Regudtr"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Afslut"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "ForrigHist"
+#: src/global.c:478
+msgid "Close"
+msgstr "Luk"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "NæstHist"
+#: src/global.c:479
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Indsæt"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "GÃ¥ til tekst"
+#: src/global.c:481
+#, fuzzy
+msgid "Unjustify"
+msgstr "AfOmbryd"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Find næste"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Første fil"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Sidste fil"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Til filer"
-
-# max 16 tegn
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS-format"
-
-# max 16 tegn
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac-format"
-
-# max 16 tegn
-#: src/global.c:464
-msgid "Append"
-msgstr "Tilføj ved enden"
-
-# max 16 tegn
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Tilføj ved start"
-
-# max 16 tegn
-#: src/global.c:466
-msgid "Backup File"
-msgstr "SikrKopiér fil"
-
-# max 16 tegn
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Kør kommando"
-
-# max 16 tegn
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "GÃ¥ til katalog"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Få hjælp"
-
 # max 10 tegn
-#: src/global.c:481
-msgid "Exit"
-msgstr "Afslut"
-
-# max 10 tegn
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Hvor er"
 
 # max 10 tegn
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "ForrigSide"
-
-# max 10 tegn
-#: src/global.c:484
-msgid "Next Page"
-msgstr "NæsteSide"
-
-# max 10 tegn
-#: src/global.c:485
-msgid "First Line"
-msgstr "FørstLinje"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Erstat"
 
-# max 10 tegn
-#: src/global.c:486
-msgid "Last Line"
-msgstr "SidstLinje"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "GÃ¥ til linje"
 
-# max 10 tegn
-#: src/global.c:487
-msgid "Suspend"
-msgstr "I baggrund"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Forrige linje"
 
-# max 10 tegn
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "AfsnitStrt"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Næste linje"
 
-# max 10 tegn
-#: src/global.c:490
-msgid "End of Par"
-msgstr "AfsnitSlut"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Læs fil"
 
 # max 10 tegn
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "FuldOmbryd"
 
 # max 10 tegn
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Opdatér"
 
-# okay, her slutter 'max 10 tegn'-regionen vist, eftersom den engelske er på 11
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Indsæt fil"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "GÃ¥ til linje"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Ombryd den aktuelle paragraf"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Afbryd den aktuelle funktion"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Vis denne hjælpetekst"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Luk nuværende filbuffer / afslut nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Afslut nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Skriv den aktuelle fil til disk"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Indsæt en anden fil i den nuværende"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Søg efter en streng eller et regulært udtryk"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Gå til forrige skærm"
+#: src/global.c:526
+#, fuzzy
+msgid "Search for a string"
+msgstr "Søg efter en streng eller et regulært udtryk"
+
+#: src/global.c:528
+#, fuzzy
+msgid "Go one screenful up"
+msgstr "Gå til næste skærm"
 
-#: src/global.c:521
-msgid "Go to next screen"
+#: src/global.c:529
+#, fuzzy
+msgid "Go one screenful down"
 msgstr "Gå til næste skærm"
 
-#: src/global.c:523
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Klip den aktuelle linje ud og gem den i udklipsbufferen"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Indsæt fra udklipsbufferen i aktuel linje"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Vis markørens position"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Start stavekontrollen, hvis tilgængelig"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Erstat en streng eller et regulært udtryk"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "GÃ¥ til linje- og kolonnenummer"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Markér tekst ved aktuel markørposition"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Gentag sidste søgning"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Kopiér aktuelle linje ud og gem den i udklipsbufferen"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Indryk den aktuelle linje"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Fjern indrykning af aktuel linje"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Fortryd sidste handling"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Omgør sidste fortrudte handling"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "GÃ¥ et tegn fremad"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "GÃ¥ et tegn bagud"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "GÃ¥ et ord fremad"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "GÃ¥ et ord bagud"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "GÃ¥ til forrige linje"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Gå til næste linje"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "GÃ¥ til begyndelsen af aktuel linje"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "GÃ¥ til enden af aktuel linje"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Gå til starten af afsnittet; dernæst af forrige afsnit"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Gå til lige efter afsnittets slutning; dernæst efter næste afsnit"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Gå til filens første linje"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "GÃ¥ til filens sidste linje"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "GÃ¥ til modsvarende klamme"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Rul en linje op uden at flytte markøren"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Rul en linje ned uden at flytte markøren"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "GÃ¥ til forrige filbuffer"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Gå til næste filbuffer"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Indsæt næste tasteanslag ordret"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Indsæt et tabulatortegn ved markørpositionen"
 
@@ -672,330 +650,466 @@ msgstr "Indsæt et tabulatortegn ved markørpositionen"
 msgid "Insert a newline at the cursor position"
 msgstr "Indsæt et linjeskift ved markørpositionen"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Fjern tegnet under markøren"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Fjern tegnet til venstre for markøren"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Klip fra markørpositionen til filens slutning"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Ombryd hele filen"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Tæl ord, linjer og tegn"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Opdatér (genskriv) den aktuelle skærm"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Kør i baggrunden (hvis suspend er slået til)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Slå forskel på store og små bogstaver til eller fra"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Omvend søgeretning"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Slå brug af regulære udtryk til eller fra"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Husk de foregående søg og erstat-strenge"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Husk de følgende søg og erstat-strenge"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "GÃ¥ til filbrowser"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Slå DOS-format til eller fra"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Slå Mac-format til eller fra"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Slå efterstillet tilføjelse til eller fra"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Slå foranstillet tilføjelse til eller fra"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Slå sikkerhedskopiering af originalfil til eller fra"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Udfør ekstern kommando"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Slå brug af ny buffer til eller fra"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "GÃ¥ ud af filbrowseren"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Gå til første fil i listen"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "GÃ¥ til sidste fil i listen"
 
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "Gå til næste fil i listen"
-
-#: src/global.c:642
+#: src/global.c:634
 msgid "Go to the previous file in the list"
 msgstr "GÃ¥ til forrige fil i listen"
 
-#: src/global.c:643
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Gå til næste fil i listen"
+
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "GÃ¥ til katalog"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Luk"
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Start stavekontrollen, hvis tilgængelig"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "GÃ¥ til forrige linje"
+
+#: src/global.c:641
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Gå til næste linje"
+
+#: src/global.c:642
+#, fuzzy
+msgid "Invoke formatter, if available"
+msgstr "Start stavekontrollen, hvis tilgængelig"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Få hjælp"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Annullér"
+
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "Gem"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+# max 16 tegn
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "GÃ¥ til katalog"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Klip ud"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Ombryd"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Læs fil"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Stavetjek"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Klip ud"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "GÃ¥ til linje"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "AfOmbryd"
+# max 16 tegn
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS-format"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Indsæt"
+# max 10 tegn
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "VersalFøls"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Regudtr"
+
+# max 10 tegn
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Baglæns"
+
+# max 10 tegn
+#: src/global.c:762
+msgid "No Replace"
+msgstr "ErstatIkke"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Akt. pos"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Stavetjek"
+# max 10 tegn
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "ForrigSide"
 
-#: src/global.c:771
+# max 10 tegn
+#: src/global.c:782
+msgid "Next Page"
+msgstr "NæsteSide"
+
+# max 10 tegn
+#: src/global.c:785
+msgid "First Line"
+msgstr "FørstLinje"
+
+# max 10 tegn
+#: src/global.c:787
+msgid "Last Line"
+msgstr "SidstLinje"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ikke en klamme"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Markér tekst"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Kopiér tekst"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Indryk tekst"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Fjern indrykning"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Fortryd"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Omgør"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Fremad"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Bagud"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Næste ord"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Fremad"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Forrige ord"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Forrige linje"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Næste linje"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Næste ord"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Hjem"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Slut"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Find anden klamme"
+# max 10 tegn
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "AfsnitStrt"
+
+# max 10 tegn
+#: src/global.c:846
+msgid "End of Par"
+msgstr "AfsnitSlut"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Rul op"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Rul ned"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "Foregående fil"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Næste fil"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
 msgstr "Ordret input"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tabulator"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Fjern"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Slet baglæns"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "KlipResten"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Ordtælling"
 
-#: src/global.c:1367
+# max 10 tegn
+#: src/global.c:905
+msgid "Suspend"
+msgstr "I baggrund"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "ForrigHist"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "NæstHist"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "GÃ¥ til tekst"
+
+# max 16 tegn
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS-format"
+
+# max 16 tegn
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac-format"
+
+# max 16 tegn
+#: src/global.c:934
+msgid "Append"
+msgstr "Tilføj ved enden"
+
+# max 16 tegn
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Tilføj ved start"
+
+# max 16 tegn
+#: src/global.c:939
+msgid "Backup File"
+msgstr "SikrKopiér fil"
+
+# max 16 tegn
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Kør kommando"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Til filer"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Første fil"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Sidste fil"
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Forrige linje"
+
+#: src/global.c:979
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "Næste linje"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Hjælpetilstand"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Konstant visning af markørposition"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Brug af en ekstra linje til redigering"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Jævn rulning"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Ombryd ikke lange linjer"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Visning af mellemrum"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Farvefremhævelse af syntaks"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Smart home-tast"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Automatisk indrykning"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Klip ud til enden"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Ombrydning af lange linjer"
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Ombryd ikke lange linjer"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konvertering af skrevne tab-tegn til mellemrum"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Sikkerhedskopiér filer"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Flere fil-buffere"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Museunderstøttelse"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Ingen konvertering fra DOS/Mac-format"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Suspension"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Blød linjeombrydning"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1017,7 +1131,7 @@ msgstr ""
 "teksten. Hvis du taster enter uden at indtaste nogen tekst vil den "
 "foregående søgning blive udført.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1030,7 +1144,7 @@ msgstr ""
 "\n"
 "Følgende funktionstaster er tilgængelige i søgetilstand:\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1050,7 +1164,7 @@ msgstr ""
 " Følgende funktionstaster er til stede i Gå til linje-tilstand:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1073,7 +1187,7 @@ msgstr ""
 "få den til at blive indlæst i en separat buffer (brug Meta-< og > til at "
 "skifte mellem filbuffere).  "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1086,7 +1200,7 @@ msgstr ""
 "\n"
 " Følgende funktionstaster er tilgængelige i Indsæt fil-tilstand:\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1114,7 +1228,7 @@ msgstr ""
 " Følgende funktionstaster er til stede i Skriv fil-tilstand:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1138,7 +1252,7 @@ msgstr ""
 " Følgende funktionstaster er til stede i filskimmeren:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1162,7 +1276,7 @@ msgstr ""
 "foregående søgning blive udført. \n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1170,7 +1284,7 @@ msgstr ""
 " Følgende funktionstaster er til stede i browsersøgetilstand:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1193,7 +1307,7 @@ msgstr ""
 "filbrowser:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1217,7 +1331,7 @@ msgstr ""
 " Følgende andre funktioner er til stede i stavekontrol-tilstand:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1237,7 +1351,7 @@ msgstr ""
 " Følgende taster er tilgængelige i denne tilstand:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1257,7 +1371,7 @@ msgstr ""
 "hovedvinduet som viser filen der redigeres. Statuslinjen er tredje linje fra "
 "underkanten og viser vigtige meddelelser.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1275,7 +1389,7 @@ msgstr ""
 "(M-), og kan skrives enten ved at taste Esc, Alt eller selve Meta-tasten "
 "afhængigt af tastaturopsætningen.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1289,15 +1403,15 @@ msgstr ""
 "Alternative taster vises i parenteser:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "aktivér/deaktivér"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Tasten ugyldig i visningstilstand"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1306,7 +1420,7 @@ msgstr ""
 "\n"
 "Bufferen skrevet til %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1315,7 +1429,7 @@ msgstr ""
 "\n"
 "Buffer ikke skrevet til %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1324,11 +1438,11 @@ msgstr ""
 "\n"
 "Buffer ikke skrevet: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Vinduestørrelsen er for lille til Nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1337,251 +1451,260 @@ msgstr ""
 "Brug: nano [FLAG] [[+LINJE,KOLONNE] FIL]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Flag\t\tLangt GNU-flag\t\tBetydning\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Flag\t\tBetydning\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Vis denne meddelelse"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+LINJE,KOLONNE"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Start ved linjenummer LINJE, kolonne KOLONNE"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Brug smart home-tast"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Gem sikkerhedskopier af eksisterende filer"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <kat>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<kat>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Katalog til at gemme unikke sikkerhedskopifiler"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Brug fed frem for omvendt video-tekst"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Konvertér skrevne tabulatortegn til mellemrum"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Tillad flere fil-buffere"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Log & læs streng-historik for søg og erstat"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Se ikke på nanorc-filer"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Fiks forvirringsproblem med numerisk tastatur"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Tilføj ikke linjeskift til slut i filer"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Konvertér ikke fra DOS/Mac-format"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Brug en ekstra linje til redigering"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Gem & læs markørens position"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Anførelsesstreng"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Begrænset tilstand"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Rul linjevis frem for en halv skærm ad gangen"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#kolonner>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#kolonner>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Sæt bredden på et tabulatortegn til #kolonner"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Ryd statuslinje hurtigt"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Udskriv versionsinformation og afslut"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Find ordgrænser mere præcist"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<str>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Syntaksdefinition for farvelægning"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Vis markørposition hele tiden"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Fiks forvirringsproblem med Tilbagetast/Slettetast"
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "Vis denne hjælpetekst"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Indryk automatisk nye linjer"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Klip fra markøren til linjens slutning"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Følg ikke symbolske lænker, overskriv"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Aktivér styring med mus"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <kat>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<kat>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Sæt behandlet katalog"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Behold XON- (^Q) og XOFF- (^S) taster"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Ignorer opstartsproblemer såsom fejl i rc-fil uden fejlmeddelelser"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#kolonner>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#kolonner>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Placér ombrydningspunkt ved #kolonner"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Brug alternativ stavekontrol"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Gem automatisk ved afslutning, spørg ikke"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Tillad generisk fortryd [EKSPERIMENTEL]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Visningstilstand (skrivebeskyttet)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Ombryd ikke lange linjer"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Vis ikke de to hjælpelinjer"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Slå suspend til"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "Brug blød linjeombrydning"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignoreret, for Pico-kompatibilitet)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano version %s (kompileret %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " E-post: nano@nano-editor.org\tHjemmeside: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1590,154 +1713,180 @@ msgstr ""
 "\n"
 " Kompileringsflag:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Desværre, understøttelse af denne funktion er blevet deaktiveret"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Gem ændret buffer (AT SVARE \"Nej\" VIL ØDELÆGGE ÆNDRINGER)? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Kunne ikke genåbne stdin fra tastaturet, beklager\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Læser fra stdin, ^C for at afbryde\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Modtog SIGHUP eller SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Brug \"fg\" for at returnere til nano\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "aktiveret"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "deaktiveret"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Ukendt kommando"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignoreret, mumle mumle"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoreret, mumle mumle"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Ønsket tab-størrelse \"%s\" er ugyldig"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Ønsket fyld-størrelse \"%s\" er ugyldig"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr ""
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Nej"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Fejl i %s på linje %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument \"%s\" har et uafsluttet \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Regex-strenge skal begynde og ende med et \"-tegn"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Dårligt regulært udtryk \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Mangler syntaksnavn"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\"-syntaksen er reserveret"
 
 # Extension skal her forstås som f.eks. 'nano --something extension', altså en slags argument, der kræves af et andet argument
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "\"default\"-syntaksen kan ikke tage udvidelser"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Mangler tastenavn"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:463
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "tastebindinger skal starte med \"^\", \"M\" eller \"F\""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+#, fuzzy
+msgid "Must specify a function to bind the key to"
 msgstr "Skal angive funktion at binde tast til"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Skal angive menu at binde tast til (eller \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:426
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#: src/rcfile.c:489
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
 msgstr "Kunne ikke associere navnet \"%s\" med en funktion"
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
+#: src/rcfile.c:496
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "Kunne ikke associere navnet \"%s\" med en menu"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
+
+#: src/rcfile.c:543
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Beklager, keystr \"%s\" er en ugyldig binding"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Fejl ved læsning af %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1752,136 +1901,196 @@ msgstr ""
 "\"black\", med den valgfri forstavelse \"bright\"\n"
 "til forgrundsfarver."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Kan ikke tilføje farvekommando uden en syntakskommando"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Baggrundsfarven \"%s\" må ikke være lys"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Mangler regex-streng"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" kræver et tilsvarende \"end=\""
 
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Baggrundsfarven \"%s\" må ikke være lys"
+
 # Headeren/filhovedet er første linje i rc-filen, så vidt jeg kan se
-#: src/rcfile.c:804
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Kan ikke tilføje filhoved-regex uden en syntakskommando"
 
-#: src/rcfile.c:874
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Kan ikke tilføje magisk strengregex uden syntakskommando"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Mangler magisk strengnavn"
+
+# Headeren/filhovedet er første linje i rc-filen, så vidt jeg kan se
+#: src/rcfile.c:985
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Kan ikke tilføje filhoved-regex uden en syntakskommando"
+
+#: src/rcfile.c:990
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Mangler farvenavn"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Kan ikke tilføje farvekommando uden en syntakskommando"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Fatal fejl: Ingen taster bundet til funktionen \"%s\""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, fuzzy, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 "Afslutter.  Start om nødvendigt nano med flaget -I for at justere dine "
 "nanorc-indstillinger\n"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Kunne ikke associere navnet \"%s\" med en menu"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Kommandoen \"%s\" tillades ikke i inkluderet fil"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntaksen \"%s\" har ingen farvekommandoer"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Kommando \"%s\" ikke forstået"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Mangler flag"
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Flaget \"%s\" kræver et argument"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Flaget er ikke en gyldig flerbytestreng"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Kræver ikke-blanke tegn"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Der kræves to enkelt-kolonnetegn"
 
-#: src/rcfile.c:1114
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1339
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Kan ikke fjerne flag \"%s\""
 
-#: src/rcfile.c:1123
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1345
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Ukendt flag \"%s\""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Jeg kan ikke finde mit hjemmekatalog!  Hulk!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Tryk enter for at fortsætte opstart af nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" ikke fundet"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Versalfølsom]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Regudtr]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Bagud]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (at erstatte) i markering"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (at erstatte)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Erstat denne forekomst?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Erstat med"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Erstattede %lu forekomst"
 msgstr[1] "Erstattede %lu forekomster"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Indtast linjenummer, kolonnenummer"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Ugyldigt linje- eller kolonnenummer"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ikke en klamme"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Ingen modsvarende klamme"
 
@@ -1893,222 +2102,320 @@ msgstr "Markering sat"
 msgid "Mark Unset"
 msgstr "Markering fjernet"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Intet i fortrydelsesbufferen!"
 
-#: src/text.c:455 src/text.c:593
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+#: src/text.c:445 src/text.c:590
+#, fuzzy, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr "Intern fejl: Kan ikke matche linje %d.  Gem venligst dit arbejde"
 
 # De her mystiske "text add" og den slags indgår i strengen "Undid action (%s)" hvor %s er en af disse
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "tilføj tekst"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "slet tekst"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "ombryd linje"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "sammenføj linje"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "klip tekst"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "indsæt tekst"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "linje bryd"
 
 # dette sker hvis teksten f.eks. er læst fra en fil
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "import af tekst"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "tekst erstat"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Intern fejl: ukendt type.  Gem venligst dit arbejde"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Intern fejl: ukendt type.  Gem venligst dit arbejde."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Fortrød handling (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Intet at omgøre!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "Intern fejl: Opsætning af Omgør slog fejl.  Gem venligst dit arbejde"
+#: src/text.c:584
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "Intern fejl: Kan ikke opsætte uncut.  Gem venligst dit arbejde."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Omgjorde handling (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Kunne ikke overføre i datakanal"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Kunne ikke oprette datakanal"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Kunne ikke forgrene"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr "Intern fejl: Kan ikke opsætte uncut.  Gem venligst dit arbejde."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Intern fejl: ukendt type.  Gem venligst dit arbejde."
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Dårlig anførselsstreng %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Kan nu af-ombryde!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Redigér en erstatning"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Kunne ikke oprette datakanal"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Opretter ordliste med fejlstavelser, vent venligst..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Kunde ikke få størrelse af datakanals-buffer"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Fejl ved kald af \"spell\""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Fejl ved kald af \"sort -f\""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Fejl ved kald af \"uniq\""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Stavekontrol færdiggjort"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fejl ved kald af \"%s\""
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Start stavekontrollen, hvis tilgængelig"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavekontrollen mislykkedes: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavekontrollen mislykkedes: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Tilføj ikke linjeskift til slut i filer"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "Vis denne meddelelse"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "Vis denne meddelelse"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sOrd: %lu  Linjer: %ld  Tegn: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "I markering:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Ordret input"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano har ikke mere hukommelse!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Unicode-input"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Ændret"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Se"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "KAT:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Fil:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "linje %ld/%ld (%d%%), kol %lu/%lu (%d%%), tegn %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Tekstredigereren nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "version"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Præsenteres af:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Særlig tak til:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "For ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "og alle andre som vi har glemt..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Tak for at du bruger nano!"
 
-#~ msgid "Error writing backup file %s: File owner mismatch"
+# okay, her slutter 'max 10 tegn'-regionen vist, eftersom den engelske er på 11
+#~ msgid "Insert File"
+#~ msgstr "Indsæt fil"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Gå til forrige skærm"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Find anden klamme"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Ombrydning af lange linjer"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Blød linjeombrydning"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Tillad generisk fortryd [EKSPERIMENTEL]"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(ignoreret, for Pico-kompatibilitet)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Skal angive menu at binde tast til (eller \"all\")"
+
+#~ msgid "Missing flag"
+#~ msgstr "Mangler flag"
+
+#~ msgid "line wrap"
+#~ msgstr "ombryd linje"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Intern fejl: ukendt type.  Gem venligst dit arbejde"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
 #~ msgstr ""
-#~ "Fejl ved skrivning af sikkerhedskopifil %s: Filens ejer stemmer ikke"
+#~ "Intern fejl: Opsætning af Omgør slog fejl.  Gem venligst dit arbejde"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Kunne ikke overføre i datakanal"
 
 #~ msgid "add_to_cutbuffer() called with inptr->data = %s\n"
 #~ msgstr "add_to_cutbuffer() kaldt med inptr->data = %s\n"
@@ -2164,9 +2471,6 @@ msgstr "Tak for at du bruger nano!"
 #~ msgid "Could not open %s for prepend: %s"
 #~ msgstr "Kunde ikke åbne %s for foranstilling: %s"
 
-#~ msgid "Could not set permissions %o on %s: %s"
-#~ msgstr "Kunne ikke sætte rettighederne %o på %s: %s"
-
 #~ msgid "Can't open \"%s\": %s"
 #~ msgstr "Kan ikke åbne \"%s\": %s"
 
diff --git a/po/de.gmo b/po/de.gmo
index 852b801..a8da44b 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 4fa0974..05ed520 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,123 +1,154 @@
-# German Messages for the nano editor
+# German messages for the nano editor.
 # Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
+#
 # Karl Eichwalder <keichwa@gmx.net>, 2001.
 # Florian König <floki@bigfoot.com>, 2000, 2001.
-# Michael Piefel <piefel@informatik.hu-berlin.de>, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010.
-#
+# Michael Piefel <piefel@informatik.hu-berlin.de>, 2001-2006, 2008-2011, 2013-2014.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2014, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-04-15 15:28+0100\n"
-"Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-21 20:38+0100\n"
+"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.5\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Gehe zu Verzeichnis"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
-msgstr "Kann im eingeschränkten Modus nicht nach außerhalb von %s gehen"
+msgstr ""
+"Im eingeschränkten Modus kann nicht zu Orten außerhalb von %s gewechselt "
+"werden."
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fehler beim Lesen von %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "Konnte nicht ins übergeordnete Verzeichnis wechseln"
+msgstr "Ins übergeordnete Verzeichnis kann nicht gewechselt werden."
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(Verz.)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(Verz. höher)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Suche"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [GROSS/klein]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [reg. Ausdruck]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Rückwärts]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Suche wieder von vorn"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Das ist das einzige Auftreten"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Kein aktuelles Suchmuster"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"Identität für die Sperrdatei konnte nicht bestimmt werden (getpwuid() "
+"fehlgeschlagen)"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Rechnername für Sperrdatei konnte nicht bestimmt werden: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Fehler beim Schreiben der Sperrdatei %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Fehler beim Löschen der Sperrdatei %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Fehler beim Öffnen der Sperrdatei %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "Fehler beim Lesen der Sperrdatei %s: Nicht genügend Daten gelesen"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr "Datei %s wird bearbeitet (von %s mit %s, Prozess-ID %d); fortsetzen?"
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Fehler beim Schreiben der Sperrdatei: Verzeichnis »%s« existiert nicht"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "Kann Datei von außerhalb %s nicht einfügen"
+msgstr "Datei kann außerhalb von %s nicht eingefügt werden"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Keine weiteren offenen Dateipuffer"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Umgeschaltet zu %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Neuer Puffer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
-msgstr[0] "eine Zeile gelesen (aus DOS- und Mac-Format konvertiert)"
+msgstr[0] "%lu Zeile gelesen (aus DOS- und Mac-Format konvertiert)"
 msgstr[1] "%lu Zeilen gelesen (aus DOS- und Mac-Format konvertiert)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -126,851 +157,921 @@ msgid_plural ""
 "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
 "permission)"
 msgstr[0] ""
-"eine Zeile gelesen (aus DOS- und Mac-Format konvertiert – Warnung: Kein "
+"%lu Zeile gelesen (aus DOS- und Mac-Format konvertiert – Warnung: Kein "
 "Schreibrecht)"
 msgstr[1] ""
 "%lu Zeilen gelesen (aus DOS- und Mac-Format konvertiert – Warnung: Kein "
 "Schreibrecht)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
-msgstr[0] "eine Zeile gelesen (aus Mac-Format konvertiert)"
+msgstr[0] "%lu Zeile gelesen (aus Mac-Format konvertiert)"
 msgstr[1] "%lu Zeilen gelesen (aus Mac-Format konvertiert)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from Mac format - Warning: No write permission)"
 msgstr[0] ""
-"eine Zeile gelesen (aus Mac-Format konvertiert – Warnung: Kein Schreibrecht)"
+"%lu Zeile gelesen (aus Mac-Format konvertiert – Warnung: Kein Schreibrecht)"
 msgstr[1] ""
 "%lu Zeilen gelesen (aus Mac-Format konvertiert – Warnung: Kein Schreibrecht)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
-msgstr[0] "eine Zeile gelesen (aus DOS-Format konvertiert)"
+msgstr[0] "%lu Zeile gelesen (aus DOS-Format konvertiert)"
 msgstr[1] "%lu Zeilen gelesen (aus DOS-Format konvertiert)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS format - Warning: No write permission)"
 msgstr[0] ""
-"eine Zeile gelesen (aus DOS-Format konvertiert – Warnung: Kein Schreibrecht)"
+"%lu Zeile gelesen (aus DOS-Format konvertiert – Warnung: Kein Schreibrecht)"
 msgstr[1] ""
 "%lu Zeilen gelesen (aus DOS-Format konvertiert – Warnung: Kein Schreibrecht)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
-msgstr[0] "eine Zeile gelesen"
+msgstr[0] "%lu Zeile gelesen"
 msgstr[1] "%lu Zeilen gelesen"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "eine Zeile gelesen (Warnung: Kein Schreibrecht)"
+msgstr[0] "%lu Zeile gelesen (Warnung: Kein Schreibrecht)"
 msgstr[1] "%lu Zeilen gelesen (Warnung: Kein Schreibrecht)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
-msgstr "Lese Datei"
+msgstr "Datei wird gelesen"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Neue Datei"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "„%s“ nicht gefunden"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ ist ein Verzeichnis"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "„%s“ ist eine Gerätedatei"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "In neuem Puffer auszuführender Befehl [von %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Auszuführender Befehl [von %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
-msgstr "in neuen Puffer einzufügende Datei [von %s] "
+msgstr "In neuen Puffer einzufügende Datei [von %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
-msgstr "einzufügende Datei [von %s] "
+msgstr "Einzufügende Datei [von %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
-msgstr "Taste unzulässig wenn nicht im Multibuffer-Modus"
+msgstr "Taste unzulässig, wenn nicht im Multibuffer-Modus"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"Sicherungsdatei konnte nicht geschrieben werden, weiter speichern? (N wenn "
+"unsicher)"
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "Kann nicht außerhalb von %s schreiben"
+msgstr "Außerhalb von %s kann nicht geschrieben werden."
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
-"Kann nicht vorn oder hinten an eine symbolische Verknüpfung anfügen, wenn --"
-"nofollow gesetzt ist"
+"Voranstellen oder Anhängen an eine symbolische Verknüpfung ist nicht "
+"möglich, wenn --nofollow gesetzt ist."
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Fehler beim Schreiben der Sicherungskopie %s: %s"
+msgstr "Fehler beim Schreiben der Sicherungsdatei %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
-msgstr "Zu viele Sicherungskopien?"
+msgstr "Zu viele Sicherungsdateien?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fehler beim Schreiben von %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fehler beim Schreiben der temporären Datei: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
-msgstr[0] "eine Zeile geschrieben"
+msgstr[0] "%lu Zeile geschrieben"
 msgstr[1] "%lu Zeilen geschrieben"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS-Format]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac-Format]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
-msgstr " [Sicherungskopie]"
+msgstr " [Sicherungsdatei]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Auswahl vorne an Datei anfügen"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Auswahl an Datei anhängen"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Auswahl in Datei schreiben"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Dateiname zum vorn Anfügen"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Dateiname zum Anhängen"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Dateiname zum Speichern"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Datei exisitiert, ÃœBERSCHREIBEN? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Datei unter einem ANDEREN NAMEN speichern? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Datei wurde seit dem Öffnen geändert, dennoch speichern? "
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(mehr)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Drücken Sie die Eingabetaste, um mit dem Starten von nano fortzufahren.\n"
+"Drücken Sie die Eingabetaste zum Fortfahren\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Ersetzen"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Verzeichnis %s kann nicht angelegt werden: %s\n"
+"Es wird benötigt, um Suchverlauf und Cursorposition zu speichern und zu "
+"laden.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Keine Ersetzung"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"Pfad %s ist kein Verzeichnis, obwohl er eines sein muss.\n"
+"Nano wird Suchverlauf und Cursorposition nicht laden oder speichern können.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "GROSS/klein"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Eine veraltete Nano-Verlaufsdatei (%s) wurde gefunden. Es wurde\n"
+"versucht, diese an die neue bevorzugte Stelle (%s) zu schieben,\n"
+"was aber Fehler verursachte: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Rückwärts"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Eine veraltete Nano-Verlaufsdatei (%s) wurde gefunden. Diese wurde\n"
+"an die neue bevorzugte Stelle (%s) verschoben.\n"
+"(siehe die Nano-FAQ bezüglich dieser Änderung)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "reg. Ausdruck"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Beenden"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "zur. Geschichte"
+#: src/global.c:478
+msgid "Close"
+msgstr "Schließen"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "vor Geschichte"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Ausschn. r"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Zu Text"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Ausr.rückgängig"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Wo ist nächstes"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Erste Datei"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Letzte Datei"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "In Dateien"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS-Format"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac-Format"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Anhängen"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "vorn Anfügen"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Sicherungskopie"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Befehl ausführen"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Gehe zu Verz."
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Hilfe"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Beenden"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Wo ist"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Seite zurück"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Seite vor"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Erste Zeile"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Ersetzen"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Letzte Zeile"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Zu Zeile"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "in den Hintergrund"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Zeile zurück"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Anf des Abs."
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Zeile vor"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Ende des Abs."
+#: src/global.c:497
+msgid "Read File"
+msgstr "Datei öffnen"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Kompl. Ausr."
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Auffrischen"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Datei einfügen"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Zu Zeile"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Absatz ausrichten"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Funktion abbrechen"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Diese Hilfe anzeigen"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
-msgstr "Aktuellen Dateipuffer schließen / nano beenden"
+msgstr "Aktuellen Dateipuffer schließen / Nano beenden"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
-msgstr "nano beenden"
+msgstr "Nano beenden"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Datei speichern"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
-msgstr "Datei einfügen"
+msgstr "Weitere Datei in die aktuelle Datei einfügen"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "nach einer Zeichenkette oder einem regulären Ausdruck suchen"
+msgstr "Nach einer Zeichenkette oder einem regulären Ausdruck suchen"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "zum vorhergehenden Bildschirm springen"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Nach einer Zeichenkette suchen"
 
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "zum folgenden Bildschirm springen"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Eine Bildschirmseite hoch gehen"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Eine Bildschirmseite runter gehen"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "die aktuelle Zeile ausschneiden und in der Zwischenablage speichern"
+msgstr "Die aktuelle Zeile ausschneiden und in der Zwischenablage speichern"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "aus der Zwischenablage einfügen"
+msgstr "Aus der Zwischenablage einfügen"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
-msgstr "die aktuelle Cursorposition anzeigen"
+msgstr "Die aktuelle Cursorposition anzeigen"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Rechtschreibprüfung aufrufen (wenn verfügbar)"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "eine Zeichenkette oder einen regulären Ausdruck ersetzen"
+msgstr "Eine Zeichenkette oder einen regulären Ausdruck ersetzen"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
-msgstr "zu einer bestimmten Zeile und Spalte springen"
+msgstr "Zu einer bestimmten Zeile und Spalte springen"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Text an der Cursorposition markieren"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Text beginnend an Cursorposition markieren"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr "letzte Suche wiederholen"
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Die letzte Suche wiederholen"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "die aktuelle Zeile kopieren und in der Zwischenablage speichern"
+msgstr "Die aktuelle Zeile kopieren und in der Zwischenablage speichern"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
-msgstr "die aktuelle Zeile einrücken"
+msgstr "Die aktuelle Zeile einrücken"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "die aktuelle Zeile ausrücken"
+msgstr "Die aktuelle Zeile ausrücken"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr "letzte Operation rückgängig"
+msgstr "Letzte Operation rückgängig machen"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr "rückgängig gemachte Operation wiederholen"
+msgstr "Rückgängig gemachte Operation wiederholen"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
-msgstr "ein Zeichen vorwärts gehen"
+msgstr "Ein Zeichen vorwärts gehen"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
-msgstr "ein Zeichen rückwärts gehen"
+msgstr "Ein Zeichen rückwärts gehen"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "ein Wort vorwärts gehen"
+msgstr "Ein Wort vorwärts gehen"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "ein Wort rückwärts gehen"
+msgstr "Ein Wort rückwärts gehen"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
-msgstr "zur vorhergehenden Zeile gehen"
+msgstr "Zur vorhergehenden Zeile gehen"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
-msgstr "zur folgenden Zeile gehen"
+msgstr "Zur folgenden Zeile gehen"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
-msgstr "zum Anfang der aktuellen Zeile springen"
+msgstr "Zum Anfang der aktuellen Zeile springen"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
-msgstr "zum Ende der aktuellen Zeile springen"
+msgstr "Zum Ende der aktuellen Zeile springen"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "zum Anfang des aktuellen Absatzes springen; dann des vorigen Absatzes"
+msgstr "Zum Anfang des aktuellen Absatzes springen; dann des vorigen Absatzes"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
-"hinter das Ende des aktuellen Absatzes springen; dann des vorigen Absatzes"
+"Hinter das Ende des aktuellen Absatzes springen; dann des vorigen Absatzes"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "zur ersten Zeile der Datei springen"
+msgstr "Zur ersten Zeile der Datei springen"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "zur letzten Zeile der Datei springen"
+msgstr "Zur letzten Zeile der Datei springen"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "zur passenden Klammer springen"
+msgstr "Zur passenden Klammer springen"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr "eine Zeile hochrollen, ohne den Cursor zu bewegen"
+msgstr "Eine Zeile hochrollen, ohne den Cursor zu bewegen"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr "eine Zeile hinunterrollen, ohne den Cursor zu bewegen"
+msgstr "Eine Zeile hinunterrollen, ohne den Cursor zu bewegen"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
-msgstr "zum vorhergehenden Dateipuffer umschalten"
+msgstr "Zum vorhergehenden Dateipuffer umschalten"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
-msgstr "zum folgenden Dateipuffer umschalten"
+msgstr "Zum folgenden Dateipuffer umschalten"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr "nächstes Zeichen direkt (nicht interpretiert) einfügen"
+msgstr "Nächstes Zeichen direkt (nicht interpretiert) einfügen"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "einen Tabulator an der Cursorposition einfügen"
+msgstr "Einen Tabulator an der Cursorposition einfügen"
 
 #: src/global.c:581
 msgid "Insert a newline at the cursor position"
-msgstr "einen Zeilenumbruch an der Cursorposition einfügen"
+msgstr "Einen Zeilenumbruch an der Cursorposition einfügen"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Zeichen an der Cursorposition löschen"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Zeichen links vom Cursor löschen"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "vom Cursor bis zum Dateiende ausschneiden"
+msgstr "Vom Cursor bis zum Dateiende ausschneiden"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
-msgstr "die gesamte Datei ausrichten"
+msgstr "Die gesamte Datei ausrichten"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
-msgstr "die Zahl der Wörter, Zeilen und Zeichen zählen"
+msgstr "Die Wörter, Zeilen und Zeichen zählen"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Bildschirm auffrischen (neu zeichnen)"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
-"den Editor in den Hintergrund schieben (wenn „suspend“ angeschaltet ist)"
+"Den Editor in den Hintergrund schieben (wenn „suspend“ angeschaltet ist)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Unterscheidung von Groß- und Kleinschreibung bei Suche umschalten"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "die Richtung der Suche umkehren"
+msgstr "Die Richtung der Suche umkehren"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Benutzung regulärer Ausdrücke umschalten"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "den vorhergehenden Suchen-/Ersetzen-Begriff hervorholen"
+msgstr "Den vorhergehenden Suchen-/Ersetzen-Begriff hervorholen"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "den nächsten Suchen-/Ersetzen-Begriff hervorholen"
+msgstr "Den nächsten Suchen-/Ersetzen-Begriff hervorholen"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
-msgstr "zum Dateibrowser"
+msgstr "Zum Dateibrowser gehen"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Schreiben im DOS-Format umschalten"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Schreiben im Mac-Format umschalten"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Anhängen umschalten"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr "vorn Anfügen umschalten"
+msgstr "Vorn Anfügen umschalten"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Sicherung existierender Dateien beim Speichern umschalten"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
-msgstr "externen Befehl ausführen"
+msgstr "Externen Befehl ausführen"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Benutzung eines neuen Puffers umschalten"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
-msgstr "den Dateibrowser beenden"
+msgstr "Den Dateibrowser beenden"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
-msgstr "zur ersten Datei der Liste springen"
+msgstr "Zur ersten Datei der Liste springen"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
-msgstr "zur letzten Datei der Liste springen"
+msgstr "Zur letzten Datei der Liste springen"
 
-#: src/global.c:641
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "Zur vorigen Datei der Liste springen"
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "zur nächsten Datei der Liste springen"
+msgstr "Zur nächsten Datei der Liste springen"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Zu Verzeichnis gehen"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Den Linter aufrufen (wenn verfügbar)"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Zur vorhergehenden Linter-Meldung gehen"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Zur nächsten Linter-Meldung gehen"
 
 #: src/global.c:642
-msgid "Go to the previous file in the list"
-msgstr "zur vorigen Datei der Liste springen"
+msgid "Invoke formatter, if available"
+msgstr "Den Formatierer aufrufen (wenn verfügbar)"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "gehe zu Verzeichnis"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Hilfe"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Schließen"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Abbrechen"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Speichern"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Gehe zu Verz."
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Ausschneiden"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Ausrichten"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Datei öffnen"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Rechtschr."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Ausschneiden"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Zum Linter"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Ausr.rückgängig"
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Formatierer"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Ausschn. rückgängig"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "GROSS/klein"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Reg. Ausdruck"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Rückwärts"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Keine Ersetzung"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Cursor"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Rechtschr."
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Seite zurück"
 
-#: src/global.c:771
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Seite vor"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Erste Zeile"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Letzte Zeile"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Zu Klammer"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Text markieren"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Kopieren"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Einrücken"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Ausrücken"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Wiederholen"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Vorwärts"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Zurück"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Nächstes Wort"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Vorwärts"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Vorheriges Wort"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Zeile zurück"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Zeile vor"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Nächstes Wort"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Pos 1"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Ende"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Andere Klammer finden"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Anf des Abs."
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Ende des Abs."
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Hochrollen"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Herunterrollen"
 
-#: src/global.c:856
-msgid "Previous File"
-msgstr "Vorherige Datei"
-
 #: src/global.c:858
+msgid "Prev File"
+msgstr "Vorh. Datei"
+
+#: src/global.c:860
 msgid "Next File"
 msgstr "Nächste Datei"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Direkte Eingabe"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Direkt"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Rücktaste"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "AusschnBisEnde"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Wortanzahl"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "In den Hintergrund"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Verl. zurück"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Verlauf vor"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Zu Text"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS-Format"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac-Format"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Anhängen"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Vorn Anfügen"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Sicherungsdatei"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Befehl ausführen"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "In Dateien"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Erste Datei"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Letzte Datei"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Lintmld. zurück"
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "Lintmld. vor"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Hilfe-Modus"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Cursorposition ständig anzeigen"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Verwendung einer Zeile mehr zum Editieren"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Sanftes Rollen"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Überlange Zeilen fließend umbrechen"
+
+#: src/global.c:1237
 msgid "Whitespace display"
-msgstr "Weißraumanzeige"
+msgstr "Leerzeichenanzeige"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Farbige Syntaxhervorhebung"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
-msgstr "Intell. Pos1-Taste"
+msgstr "Intelligente Pos1-Taste"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
-msgstr "Automatischer Einzug"
+msgstr "Automatische Einrückung"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Bis Ende ausschneiden"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Lange Zeilen umbrechen"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Ãœberlange Zeilen hart umbrechen"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Umwandlungen eingegebener Tabulatoren in Leerzeichen"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
-msgstr "Sicherungskopien"
+msgstr "Sicherungsdateien"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Mehrere Dateipuffer"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Mausunterstützung"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Keine Umwandlung aus DOS/Mac-Format"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
-msgstr "in den Hintergrund"
-
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Lange Zeilen fließend umbrechen"
+msgstr "In den Hintergrund"
 
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -982,18 +1083,18 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"Hilfetext für das Suchkommando\n"
+"Hilfetext für den Suchbefehl\n"
 "\n"
 " Geben Sie die Wörter oder Buchstaben ein, nach denen Sie suchen möchten, "
-"und drücken Sie die Eingabetaste.  Wenn eine Übereinstimmung für den "
+"und drücken Sie die Eingabetaste. Wenn eine Übereinstimmung für den "
 "eingegebenen Text gefunden wird, dann wird die Anzeige zur nächsten "
 "Fundstelle bewegt.\n"
 "\n"
 " Die vorhergehende Suchzeichenkette wird in eckigen Klammern nach der Such-"
-"Aufforderung angezeigt. Drücken der Eingabetaste ohne Eingabe irgenwelchen "
+"Aufforderung angezeigt. Drücken der Eingabetaste ohne Eingabe irgendwelchen "
 "Textes führt die vorhergehende Suche durch.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1001,13 +1102,13 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
-"Wenn Sie Text markiert haben und dann Suchen, um zu Ersetzen, werden nur "
+"Wenn Sie Text markiert haben und dann suchen, um zu ersetzen, werden nur "
 "Treffer in der ausgewählten Region ersetzt.\n"
 "\n"
 " Die folgenden Funktionstasten sind im Suchmodus verfügbar:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1021,13 +1122,13 @@ msgstr ""
 "Hilfetext für „Zu Zeile“\n"
 "\n"
 " Geben Sie die Nummer der gewünschten Zeile ein und drücken Sie die "
-"Eingabetaste. Gibt es weniger Zeilen im Text, so springt nano zur letzten "
+"Eingabetaste. Gibt es weniger Zeilen im Text, so springt Nano zur letzten "
 "Zeile der Datei.\n"
 "\n"
 " Die folgenden Funktionstasten sind im Zu-Zeile-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1044,14 +1145,14 @@ msgstr ""
 " Geben Sie den Namen einer Datei ein, die an der momentanen Cursorposition "
 "in den momentanen Dateipuffer eingefügt werden soll.\n"
 "\n"
-" Wenn Sie nano mit Unterstützung für mehrere Dateipuffer compiliert haben "
-"und diese Funktion mit den Kommandozeilenoptionen -F oder --multibuffer, mit "
+" Wenn Sie Nano mit Unterstützung für mehrere Dateipuffer compiliert haben "
+"und diese Funktion mit den Befehlszeilenoptionen -F oder --multibuffer, mit "
 "der Tastenkombination Meta-F oder mittels einer nanorc-Datei eingeschaltet "
 "haben, so wird die Einfügeoperation die Datei in einen separaten Puffer "
 "laden. (Benutzen Sie Meta-< und >, um zwischen den Dateipuffern "
 "umzuschalten.)  "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1066,7 +1167,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Datei-Einfügen-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1083,18 +1184,19 @@ msgid ""
 msgstr ""
 "Hilfetext für „Datei schreiben“\n"
 "\n"
-" Geben Sie den Namen ein, unter dem Sie die momentane Datei speichern wollen "
-"und drücken Sie die Eingabetaste.\n"
+" Geben Sie den Namen ein, unter dem Sie die momentane Datei speichern "
+"wollen, und drücken Sie die Eingabetaste.\n"
 "\n"
 " Wenn Sie Text markiert haben, so werden Sie gefragt, ob Sie nur den "
 "ausgewählten Teil des Textes in eine separate Datei schreiben wollen. Um die "
-"Gefahr, eine Datei mit einem Teil von ihr zu überschreiben, zu minimieren, "
-"ist der aktuelle Dateiname in diesem Modus nicht die Vorgabe.\n"
+"Gefahr zu minimieren, dass eine Datei mit einem Teil von ihr selbst "
+"überschrieben wird, ist der aktuelle Dateiname in diesem Modus nicht die "
+"Vorgabe.\n"
 "\n"
 " Die folgenden Funktionstasten sind im Datei-Schreiben-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1107,7 +1209,7 @@ msgid ""
 " The following function keys are available in the file browser:\n"
 "\n"
 msgstr ""
-"Hilfetext für den Dateiwähler\n"
+"Hilfetext für den Dateibrowser\n"
 "\n"
 " Mit dem Dateiwähler kann die Verzeichnisstruktur visuell durchsucht werden, "
 "um eine Datei für Lese- und Schreiboperationen auszuwählen. Sie können die "
@@ -1116,10 +1218,10 @@ msgstr ""
 "auszuwählen. Um sich eine Ebene aufwärts zu bewegen, wählen Sie das "
 "Verzeichnis namens „..“ ganz oben in der Dateiliste.\n"
 "\n"
-" Die folgenden Funktionstasten sind im Dateiwähler verfügbar:\n"
+" Die folgenden Funktionstasten sind im Dateibrowser verfügbar:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1132,28 +1234,27 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"Hilfetext für das Suchkommando des Dateiwählers\n"
+"Hilfetext für den Suchbefehl des Dateibrowsers\n"
 "\n"
-" Geben Sie die Wörter oder Buchstaben ein, nach denen Sie suchen möchten, "
-"und drücken Sie die Eingabetaste.  Wenn eine Übereinstimmung für den "
-"eingegebenen Text gefunden wird, dann wird die Anzeige zur nächsten "
-"Fundstelle bewegt.\n"
+" Geben Sie die Wörter oder Zeichen ein, nach denen Sie suchen möchten, und "
+"drücken Sie die Eingabetaste. Wenn eine Übereinstimmung für den eingegebenen "
+"Text gefunden wird, dann wird die Anzeige zur nächsten Fundstelle bewegt.\n"
 "\n"
 " Die vorhergehende Suchzeichenkette wird in eckigen Klammern nach der Such-"
-"Aufforderung angezeigt. Drücken der Eingabetaste ohne Eingabe irgenwelchen "
+"Aufforderung angezeigt. Drücken der Eingabetaste ohne Eingabe irgendwelchen "
 "Textes führt die vorhergehende Suche durch.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-" Die folgenden Funktionstasten sind im Suchkommando-Modus des Dateiwählers "
+" Die folgenden Funktionstasten sind im Suchbefehl-Modus des Dateibrowsers "
 "verfügbar:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1165,7 +1266,7 @@ msgid ""
 " The following function keys are available in Browser Go To Directory mode:\n"
 "\n"
 msgstr ""
-"Hilfetext für den Gehe-zu-Verzeichnis im Dateiwähler\n"
+"Hilfetext für Gehe-zu-Verzeichnis im Dateibrowser\n"
 "\n"
 " Geben Sie den Namen des Verzeichnisses ein, das Sie durchsuchen wollen.\n"
 "\n"
@@ -1174,10 +1275,10 @@ msgstr ""
 "automatisch vervollständigen zu lassen.\n"
 "\n"
 " Die folgenden Funktionstasten sind im Gehe-zu-Verzeichnis-Modus des "
-"Dateiwählers verfügbar:\n"
+"Dateibrowsers verfügbar:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1201,7 +1302,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind in der Rechtschreibprüfung verfügbar:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1222,7 +1323,7 @@ msgstr ""
 " Die folgenden Funktionstasten sind im Befehl-Ausführen-Modus verfügbar:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1233,7 +1334,7 @@ msgid ""
 "showing the file being edited.  The status line is the third line from the "
 "bottom and shows important messages.  "
 msgstr ""
-"Haupt-Hilfe für nano\n"
+"Haupt-Hilfe für Nano\n"
 "\n"
 " Nano wurde konzipiert, die Funktionalität und die Benutzerfreundlichkeit "
 "des UW-Pico-Texteditors zu imitieren.  Es gibt vier Hauptbereiche: Die "
@@ -1242,7 +1343,7 @@ msgstr ""
 "Hauptfenster enthält die zu bearbeitende Datei.  Die Statuszeile (die dritte "
 "Zeile von unten) zeigt wichtige Meldungen.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1253,15 +1354,15 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 "Die untersten zwei Zeilen listen die meistgebrauchten Tastenkombinationen "
-"von nano auf.\n"
+"von Nano auf.\n"
 "\n"
 " Tastenkombinationen werden wie folgt abgekürzt: Kombinationen mit der Strg-"
 "Taste werden mit einem ^ ausgedrückt und können auch eingegeben werden, "
 "indem Esc zwei Mal gedrückt wird. Escape-Sequenzen werden mit dem Meta-"
-"Symbol (M) angegeben und können je nach Tastatureinstellung mit Esc, Alt "
-"oder Meta eingegeben werden, abhängig von Ihrer Tastatureinstellung.  "
+"Symbol (M) angegeben und können mit Esc, Alt oder Meta eingegeben werden, "
+"abhängig von Ihrer Tastatureinstellung.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1270,20 +1371,20 @@ msgid ""
 "\n"
 msgstr ""
 "Zudem kann durch zweimaliges Drücken von Esc und anschließender Eingabe "
-"einer dreistelliger Zahl von 000 bis 255 das Zeichen mit dem entsprechenden "
-"Wert eingegeben werden.  Die folgenden Tasten(kombinationen) sind im "
+"einer dreistelligen Zahl von 000 bis 255 das Zeichen mit dem entsprechenden "
+"Wert eingegeben werden. Die folgenden Tasten(-kombinationen) sind im "
 "Hauptfenster verfügbar. Alternative Tasten stehen in Klammern:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "aktivieren/deaktivieren"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Taste unzulässig im Nur-Lese-Modus"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1292,7 +1393,7 @@ msgstr ""
 "\n"
 "Puffer in %s geschrieben\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1301,7 +1402,7 @@ msgstr ""
 "\n"
 "Puffer nicht in %s geschrieben: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1310,11 +1411,11 @@ msgstr ""
 "\n"
 "Puffer nicht geschrieben: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
-msgstr "Fenstergröße ist zu klein für Nano...\n"
+msgstr "Fenster ist zu klein für Nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1323,251 +1424,257 @@ msgstr ""
 "Aufruf: nano [OPTIONEN] [[+ZEILE,SPALTE] Datei]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Option\t\tlange GNU-Option\t\tBedeutung\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Option\t\tBedeutung\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "diese Meldung anzeigen"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+ZEILE,SPALTE"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "bei Zeile ZEILE, Spalte SPALTE beginnen"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
-msgstr "intelligente Pos1-Taste aktivieren"
+msgstr "Intelligente Pos1-Taste aktivieren"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
-msgstr "existierende Dateien beim Speichern sichern"
+msgstr "Existierende Dateien beim Speichern sichern"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
-msgstr "-C <verz>"
+msgstr "-C <Verz>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
-msgstr "--backupdir=<verz>"
+msgstr "--backupdir=<Verz>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
-msgstr "Verzeichnis, um Backupdateien zu schreiben"
+msgstr "Verzeichnis zum Speichern von Sicherungsdateien"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Fettdruck anstelle von inversem Text benutzen"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
-msgstr "eingegebebene Tabulatoren in Leerzeichen umwandeln"
+msgstr "Eingegebebene Tabulatoren in Leerzeichen umwandeln"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Benutzung mehrerer Dateipuffer aktivieren"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Sperrdateien benutzen (nach Art von Vim)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "Geschichte der Suchen-/Ersetzen-Begriffe mitschreiben und lesen"
+msgstr "Verlauf der Suchen-/Ersetzen-Begriffe mitschreiben und lesen"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
-msgstr "die nanorc-Dateien ignorieren"
+msgstr "Die nanorc-Dateien ignorieren"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Verwirrung um Zehnertastatur lösen"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
-msgstr "keine Zeilenvorschübe an die Enden von Dateien anhängen"
+msgstr "Keine Zeilenvorschübe an die Enden von Dateien anhängen"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
-msgstr "keine Umwandlung aus DOS/Mac-Format"
+msgstr "Keine Umwandlung aus DOS/Mac-Format"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
-msgstr "eine Zeile mehr zum Editieren verwenden"
+msgstr "Eine Zeile mehr zum Editieren verwenden"
+
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Cursorposition aufzeichnen und lesen"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "-Q <str>"
-msgstr "-Q <zkette>"
+msgstr "-Q <Zeichenkette>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
-msgstr "--quotestr=<zkette>"
+msgstr "--quotestr=<Zeichenkette>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Zitatzeichen"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
-msgstr "eingeschränkter Modus"
+msgstr "Eingeschränkter Modus"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr "zeilenweise rollen (statt halb-bildschirm-weise)"
+msgstr "Zeilenweise rollen (statt halb-bildschirm-weise)"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
-msgstr "-T <#spalten>"
+msgstr "-T <#Spalten>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=<#spalten>"
+msgstr "--tabsize=<#Spalten>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
-msgstr "Tabulator-Größe auf #spalten setzen"
+msgstr "Tabulatorbreite auf #Spalten setzen"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
-msgstr "schnelles Löschen der Statuszeile durchführen"
+msgstr "Schnelles Löschen der Statuszeile durchführen"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Versionsinfo ausgeben und beenden"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Wortgrenzen genauer erkennen"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
-msgstr "-Y <zkette>"
+msgstr "-Y <Zeichenkette>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
-msgstr "--syntax=<zkette>"
+msgstr "--syntax=<Zeichenkette>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
-msgstr "zu benutzende Syntaxdefinition für Einfärben"
+msgstr "Zu benutzende Syntaxdefinition für Einfärben"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Cursorposition ständig anzeigen"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Vertauschung von Rücktaste/Entf beheben"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Diese Hilfe anzeigen"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Neue Zeilen automatisch einrücken"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Vom Cursor bis zum Zeilenende ausschneiden"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Symbolischen Links nicht folgen, sondern überschreiben"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Benutzung der Maus aktivieren"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Datei nicht lesen (nur schreiben)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
-msgstr "-o <verz>"
+msgstr "-o <Verz>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
-msgstr "--operatingdir=<verz>"
+msgstr "--operatingdir=<Verz>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Arbeitsverzeichnis setzen"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Tasten XON (^Q) und XOFF (^S) beibehalten"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Startprobleme wie Fehler in den RC-Dateien stillschweigend ignorieren"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
-msgstr "-r <#spalten>"
+msgstr "-r <#Spalten>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
-msgstr "--fill=<#spalten>"
+msgstr "--fill=<#Spalten>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Umbruchpunkt bei #spalten setzen"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Harten Umbruchpunkt bei #Spalten setzen"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
-msgstr "-s <prog>"
+msgstr "-s <Prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
-msgstr "--speller=<prog>"
+msgstr "--speller=<Prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Alternatives Rechtschreibprüfungsprogramm"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Beim Beenden ohne Rückfrage speichern"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Allgemeine Rückgängig-Function aktivieren [EXPERIMENTELL]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
-msgstr "Nur-Lese-Modus (keine Veränderungen möglich)"
+msgstr "Nur-Lesen-Modus (keine Veränderungen möglich)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Lange Zeilen nicht in neue Zeilen umbrechen"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Lange Zeilen nicht hart umbrechen"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
-msgstr "die zwei Hilfe-Zeilen nicht anzeigen"
+msgstr "Die zwei Hilfe-Zeilen nicht anzeigen"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Schieben in den Hintergrund (anhalten und zurück zur Shell) aktivieren"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "fließenden Zeilenumbruch aktivieren"
+msgstr "Fließenden Zeilenumbruch aktivieren"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignoriert, für Kompatibilität zu Pico)"
-
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano Version %s (compiliert um %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU Nano Version %s\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWWW: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1576,153 +1683,180 @@ msgstr ""
 "\n"
 " Kompilierte Optionen:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
-msgstr "Tut mir leid, diese Funktion wird nicht unterstützt"
+msgstr "Die Unterstützung für diese Funktion wurde leider deaktiviert"
+
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Kein Dateiname"
 
-#: src/nano.c:1044
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Veränderten Puffer speichern („Nein“ VERWIRFT DIE ÄNDERUNGEN) ? "
+msgstr "Veränderten Puffer speichern („Nein“ VERWIRFT DIE ÄNDERUNGEN)? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr "Konnte Standardeingabe nicht erneut von Tastatur öffnen, sorry\n"
+msgstr ""
+"Standardeingabe konnte leider nicht erneut mit der Tastatur geöffnet "
+"werden.\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr "Lese von Standardeingabe, ^C zum Abbrechen\n"
+msgstr "Von Standardeingabe wird gelesen, ^C zum Abbrechen\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP oder SIGTERM empfangen\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Benutzen Sie „fg“, um zu nano zurückzukehren.\n"
+msgstr "Benutzen Sie „fg“, um zu Nano zurückzukehren.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "aktiviert"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Unbekannter Befehl"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignoriert, murmel murmel"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoriert, murmel murmel"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "Angeforderte Tabulatorweite „%s“ ungültig"
+msgstr "Angeforderte Tabulatorbreite „%s“ ist ungültig."
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "Angeforderte Füllgröße „%s“ ungültig"
+msgstr "Angeforderte Füllgröße „%s“ ist ungültig."
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Benutzen Sie „%s -h“ für eine Liste verfügbarer Optionen.\n"
 
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Nein"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Fehler in %s in Zeile %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument „%s“ hat nicht beendetes \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Zeichenketten für reguläre Ausdrücke müssen mit \" anfangen und enden"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Ungültiger regulärer Ausdruck „%s“: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Fehlender Syntaxname"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "Die Syntax „none“ ist reserviert"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Die Syntax „default“ darf keine Erweiterungen haben"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Fehlender Schlüsselname"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "Tastenkürzel müssen mit „^“, „M“ oder „F“ beginnen"
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Schlüsselname ist zu kurz"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Schlüsselnamen müssen mit „^“, „M“ oder „F“ beginnen"
+
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "Die an die Taste zu bindende Funktion muss angegeben werden"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr "Die an die Taste zu bindene Funktion muss angegeben werden"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
+"Ein Menü (oder „all“) muss angegeben werden, um Tasten zu binden/zu lösen"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Das an die Taste zu bindene Menü (oder „all“) muss angegeben werden"
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "„%s“ kann nicht auf eine Funktion gebunden werden"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Konnte „%s“ nicht auf eine Funktion binden"
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "„%s“ kann nicht auf ein Menü gebunden werden"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:528
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Konnte „%s“ nicht auf ein Menü binden"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Funktion »%s« existiert im Menü »%s« nicht"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:543
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "Tut mir Leid, keystr „%s“ ist keine legale Zuordnung"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Taste „%s“ kann leider nicht neu zugewiesen werden."
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Fehler beim Erweitern von %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1737,137 +1871,200 @@ msgstr ""
 "und „black“ (schwarz), mit dem optionalen Präfix „bright“ (hell)\n"
 "für Vordergrundfarben."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
-msgstr "Kann keine Farbdirektive hinzufügen, ohne einen Syntaxbefehl zu haben"
+msgstr ""
+"Farbdirektive kann nicht hinzugefügt werden, ohne einen Syntaxbefehl zu "
+"haben."
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Fehlender Farbname"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Hintergrundfarbe „%s“ kann nicht hell („bright“) sein"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Fehlender regulärer Ausdruck"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ erfordert ein entsprechendes „end=“"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Hintergrundfarbe „%s“ kann nicht hell („bright“) sein"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
-"Kann keinen reg. Ausdruck für Header hinzufügen, ohne einen Syntaxbefehl zu "
-"haben"
+"Regulärer Ausdruck für Header kann nicht hinzugefügt werden, ohne einen "
+"Syntaxbefehl zu haben."
+
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+"Magischer regulärer Ausdruck kann nicht hinzugefügt werden, ohne einen "
+"Syntaxbefehl zu haben."
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Fehlender Name für magische Zeichenkette"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr ""
+"Linter kann nicht hinzugefügt werden, ohne einen Syntaxbefehl zu haben."
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Fehlender Linter-Name"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr ""
+"Formatierer kann nicht hinzugefügt werden, ohne einen Syntaxbefehl zu haben."
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Formatierer-Befehl fehlt"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Schwerwiegender Fehler: keine Tassten an Funktion „%s“ gebunden"
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr ""
+"Schwerwiegender Fehler: keine Tasten an Funktion „%s“ gebunden. Wird "
+"beendet.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Beende. Bitte starten Sie nano bei Bedarf mit der Option „-I“, wenn Sie Ihre "
-"nanorc-Einstellungen anpassen wollen\n"
+"Bitte starten Sie nano bei Bedarf mit der Option „-I“, um Ihre nanorc-"
+"Einstellungen anzupassen\n"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Zu erweiternde Syntax „%s“ konnte nicht gefunden werden."
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Befehl „%s“ nicht in eingebundener Datei erlaubt"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntax „%s“ hat keine Farbbefehle"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Befehl „%s“ nicht verstanden"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Fehlendes Flag"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Fehlende Option"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Option „%s“ erfordert ein Argument"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Option ist keine gültige Multibyte-Zeichenkette"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Nicht-Leerraum-Zeichen erforderlich"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Zwei einspaltige Zeichen erforderlich"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "kann Flag „%s“ nicht löschen"
+msgid "Cannot unset option \"%s\""
+msgstr "Option „%s“ kann nicht zurückgesetzt werden"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Unbekanntes Flag „%s“"
+msgid "Unknown option \"%s\""
+msgstr "Unbekannte Option „%s“"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
-msgstr "Kann mein Heimatverzeichnis nicht finden!  Autsch!"
+msgstr "Heimatverzeichnis kann nicht gefunden werden! Autsch!"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Drücken Sie die Eingabetaste, um mit dem Starten von nano fortzufahren.\n"
 
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "„%.*s%s“ nicht gefunden"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [GROSS/klein]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [reg. Ausdruck]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Rückwärts]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (zu ersetzen) in Auswahl"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (zu ersetzen)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Fundstelle ersetzen?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
-msgstr "Ersetzen mit"
+msgstr "Ersetzen durch"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
-msgstr[0] "eine Ersetzung vorgenommen"
+msgstr[0] "%lu Ersetzung vorgenommen"
 msgstr[1] "%lu Ersetzungen vorgenommen"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Zeilennummer, Spaltennummer eingeben"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Ungültige Zeilen- oder Spaltennummer"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Keine Klammer"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Keine passende Klammer"
 
@@ -1879,595 +2076,282 @@ msgstr "Markierung gesetzt"
 msgid "Mark Unset"
 msgstr "Markierung entfernt"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Nichts im Rückgängig-Puffer!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
-"Interner Fehler: kann Zeile %d nicht finden. Bitte speichern Sie Ihre Arbeit"
+"Interner Fehler: Zeile %d kann nicht gefunden werden. Bitte speichern Sie "
+"Ihre Arbeit."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "Text hinzu"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "Text löschen"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "Zeilenumbruch"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "Zeile verbinden"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "Text ausschneiden"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "Text ausschneiden zurücknehmen"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "Zeilenvorschub"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "Text einfügen"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "Text ersetzen"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Interner Fehler: unbekannter Typ. Bitte speichern Sie Ihre Arbeit"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Interner Fehler: Unbekannter Typ. Bitte speichern Sie Ihre Arbeit."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
-msgstr "Operation rückgangig gemacht (%s)"
+msgstr "Operation rückgängig gemacht (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Nichts zu wiederholen!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
-"Interner Fehler: Vorbereitung für Wiederholen fehlgeschlagen. Bitte "
-"speichern Sie Ihre Arbeit"
+"Interner Fehler: „Wiederholen“ kann nicht aufgesetzt werden. Bitte speichern "
+"Sie Ihre Arbeit."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Operation wiederholt (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Konnte kein Pipe durchführen"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Pipe konnte nicht erstellt werden"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
-msgstr "Konnte kein Fork durchführen"
+msgstr "Fork konnte nicht durchgeführt werden"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
-"Interner Fehler: kann Zurücknehmen des Ausschneidens nicht aufsetzen. Bitte "
-"speichern Sie Ihre Arbeit"
+"Interner Fehler: Zurücknehmen des Ausschneidens kann nicht aufgesetzt "
+"werden. Bitte speichern Sie Ihre Arbeit."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Interner Fehler: Unbekannter Typ. Bitte speichern Sie Ihre Arbeit"
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Ungültiges Zitatzeichen %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
-msgstr "Kann Absatzausrichtung jetzt rückgängig machen"
+msgstr "Absatzausrichtung kann jetzt rückgängig gemacht werden!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Ersetzung editieren"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Konnte keine Pipe erstellen"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "Erstelle Liste falsch geschriebener Wörter, bitte warten..."
+msgstr "Liste falsch geschriebener Wörter wird erstellt, bitte warten..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
-msgstr "Konnte Größe des Pipe-Puffers nicht bestimmen"
+msgstr "Größe des Pipe-Puffers konnte nicht bestimmt werden"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Fehler beim Aufruf von „spell“"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Fehler beim Aufruf von „sort -f“"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Fehler beim Aufruf von „uniq“"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Rechtschreibprüfung abgeschlossen"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fehler beim Aufruf von „%s“"
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Rechtschreibprüfung wird aufgerufen, bitte warten"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Rechtschreibprüfung fehlgeschlagen: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Rechtschreibprüfung fehlgeschlagen: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Kein Linter für diesen Dateitype definiert"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Geänderten Puffer vor dem Linter-Aufruf speichern?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Linter wird aufgerufen, bitte warten"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Keine verarbeitbaren Zeilen vom Befehl erhalten: %s"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+"Diese Meldung ist für nicht geöffnete Datei %s, in neuem Puffer öffnen?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Bei letzter Meldung"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Bei erster Meldung"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Fehler: kein Formatierer definiert"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Abgeschlossen"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Formatierer wird aufgerufen, bitte warten"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Formatierung abgeschlossen"
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sWörter: %lu  Zeilen: %ld  Zeichen: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "In Auswahl:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Direkte Eingabe"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
-msgstr "nano hat keinen Speicher mehr!"
+msgstr "Nano hat keinen Speicher mehr!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Unicode-Eingabe"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Verändert"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Ansehen"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "Verz.:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Datei:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Warnung: Datei wird geändert, die nicht gesperrt ist, Verzeichnis-Rechte "
+"prüfen?"
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "Zeile %ld/%ld (%d%%), Spalte %lu/%lu (%d%%), Zeichen %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
-msgstr "Der nano-Text-Editor"
+msgstr "Der Nano-Text-Editor"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "Version"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Entwickelt von:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Speziellen Dank an:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "die zahlreichen Ãœbersetzer und das TP"
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Für ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
-msgstr "und alle Nichtgenannten..."
+msgstr "und alle Nichtgenannten …"
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Danke für die Benutzung von nano!"
 
-#~ msgid "Error writing backup file %s: File owner mismatch"
-#~ msgstr ""
-#~ "Fehler beim Schreiben der Sicherungskopie %s: Besitzer stimmt nicht "
-#~ "überein"
-
-#~ msgid "line split"
-#~ msgstr "Zeile aufteilen"
-
-#~ msgid "line cut"
-#~ msgstr "Zeile ausschneiden"
-
-#~ msgid "Space"
-#~ msgstr "Space"
-
-#~ msgid "Come on, be reasonable"
-#~ msgstr "Komm schon, sei vernünftig"
-
-#~ msgid "Prepending to %s failed: %s"
-#~ msgstr "Vorne an %s anfügen fehlgeschlagen: %s"
-
-#~ msgid "Invoke the help menu"
-#~ msgstr "Hilfe-Menü anzeigen"
-
-#~ msgid "Search for text within the editor"
-#~ msgstr "Im Editor nach Text suchen"
-
-#~ msgid "Replace text within the editor"
-#~ msgstr "Text im Editor ersetzen"
-
-#~ msgid "Find matching bracket"
-#~ msgstr "Passende Klammer finden"
-
-#~ msgid "Make the current search/replace case (in)sensitive"
-#~ msgstr ""
-#~ "Groß- und Kleinschreibung bei aktueller Suche oder Ersetzen (nicht) "
-#~ "berücksichtigen"
-
-#~ msgid "Make the current search/replace go backwards"
-#~ msgstr "Aktuelle Suche oder Ersetzen rückwärts gehen lassen"
-
-#~ msgid "Prepend to the current file"
-#~ msgstr "An momentane Datei vorne anfügen"
-
-#~ msgid "Back up original file when saving"
-#~ msgstr "Original beim Abspeichern sichern"
-
-#~ msgid "Insert into new buffer"
-#~ msgstr "In neuen Puffer einfügen"
-
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "Spalten auffüllen (Zeilenumbruch bei) #Spalten"
-
-#~ msgid "Duplicate syntax name %s"
-#~ msgstr "Doppelter Syntaxname %s"
-
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "Konnte temporäre Datei nicht erzeugen: %s"
-
-#~ msgid "Refusing zero-length regex match"
-#~ msgstr "Treffer mit Länge 0 bei regulärem Ausdruck abgelehnt"
-
-#~ msgid "Find other bracket"
-#~ msgstr "Andere Klammer finden"
-
-#~ msgid "Direction"
-#~ msgstr "Richtung"
-
-#~ msgid "Up"
-#~ msgstr "Hoch"
-
-#~ msgid "+LINE"
-#~ msgstr "+ZEILE"
-
-#~ msgid "Do regular expression searches"
-#~ msgstr "Suche mit regulären Ausdrücken durchführen"
-
-#~ msgid "Verbatim input"
-#~ msgstr "Direkte Eingabe"
-
-#~ msgid "Search Cancelled"
-#~ msgstr "Suche abgebrochen"
-
-#~ msgid "Replace Cancelled"
-#~ msgstr "Ersetzung abgebrochen"
-
-#~ msgid "Aborted"
-#~ msgstr "Abgebrochen"
-
-#~ msgid "add_to_cutbuffer() called with inptr->data = %s\n"
-#~ msgstr "add_to_cutbuffer() aufgerufen mit inptr->data = %s\n"
-
-#~ msgid "Blew away cutbuffer =)\n"
-#~ msgstr "Inhalt der Zwischenablage verworfen\n"
-
-#~ msgid "filename is %s\n"
-#~ msgstr "Dateiname ist %s\n"
-
-#~ msgid "%s: free'd a node, YAY!\n"
-#~ msgstr "%s: Knoten freigegeben, JO!\n"
-
-#~ msgid "%s: free'd last node.\n"
-#~ msgstr "%s: letzter Knoten freigegeben.\n"
-
-#~ msgid "Could not read %s for backup: %s"
-#~ msgstr "Konnte %s nicht für die Sicherungskopie lesen: %s"
-
-#~ msgid "Couldn't write backup: %s"
-#~ msgstr "Konnte Sicherungskopie nicht schreiben: %s"
-
-#~ msgid "Backing up %s to %s\n"
-#~ msgstr "Fertige Sicherungskopie von %s auf %s an\n"
-
-#~ msgid "Could not set permissions %o on backup %s: %s"
-#~ msgstr "Konnte Rechte %o für Sicherungskopie %s nicht setzen: %s"
-
-#~ msgid "Could not set owner %d/group %d on backup %s: %s"
-#~ msgstr ""
-#~ "Konnte Besitzer %d/Gruppe %d für Sicherungskopie %s nicht setzen: %s"
-
-#~ msgid "Could not set access/modification time on backup %s: %s"
-#~ msgstr ""
-#~ "Konnte Zugriffs-/Änderungszeit für Sicherungskopie %s nicht setzen: %s"
-
-#~ msgid "Could not open file for writing: %s"
-#~ msgstr "Konnte nicht in Datei schreiben: %s"
-
-#~ msgid "Wrote >%s\n"
-#~ msgstr "Schrieb >%s\n"
-
-#~ msgid "Could not close %s: %s"
-#~ msgstr "Konnte %s nicht schließen: %s"
-
-#~ msgid "Could not reopen %s: %s"
-#~ msgstr "Konnte %s nicht erneut öffnen: %s"
-
-#~ msgid "Could not open %s for prepend: %s"
-#~ msgstr "Konnte %s nicht zum vorn Anfügen öffnen: %s"
-
-#~ msgid "Could not open %s for writing: %s"
-#~ msgstr "Konnte %s nicht zum Schreiben öffnen: %s"
-
-#~ msgid "Could not set permissions %o on %s: %s"
-#~ msgstr "Konnte Rechte %o für %s nicht setzen: %s"
-
-#~ msgid "Goto Cancelled"
-#~ msgstr "„Gehe zu“ abgebrochen"
-
-#~ msgid "Unable to open ~/.nano_history file, %s"
-#~ msgstr "Kann Datei ~/.nano_history nicht öffnen, %s"
-
-#~ msgid "Unable to write ~/.nano_history file, %s"
-#~ msgstr "Kann Datei ~/.nano_history nicht öffnen, %s"
-
-#~ msgid "Backing up file"
-#~ msgstr "Lege Sicherungskopie der Datei an"
-
-#~ msgid "Unjustify after a justify"
-#~ msgstr "Absatzausrichtung rückgängig machen"
-
-#~ msgid "Move up one line"
-#~ msgstr "Zur vorhergehenden Zeile springen"
-
-#~ msgid "Move down one line"
-#~ msgstr "Zur folgenden Zeile springen"
-
-#~ msgid "Search backwards"
-#~ msgstr "Suche rückwärts"
-
-#~ msgid "Open previously loaded file"
-#~ msgstr "Vorige geladene Datei öffnen"
-
-#~ msgid "Open next loaded file"
-#~ msgstr "Nächste geladene Datei öffnen"
-
-#~ msgid "Down"
-#~ msgstr "Runter"
-
-#~ msgid "Use alternate keypad routines"
-#~ msgstr "Alternative Routinen für Nummernblock benutzen"
-
-#~ msgid "-T [num]"
-#~ msgstr "-T [anzahl]"
-
-#~ msgid "current->data now = \"%s\"\n"
-#~ msgstr "current->data jetzt = „%s“\n"
-
-#~ msgid "After, data = \"%s\"\n"
-#~ msgstr "Nachher, data = „%s“\n"
-
-#~ msgid "Spell checking failed: unable to write temp file!"
-#~ msgstr ""
-#~ "Rechtschreibprüfung fehlgeschlagen: konnte nicht in temporäre Datei "
-#~ "schreiben"
-
-#~ msgid "Cannot resize top win"
-#~ msgstr "Kann die Größe des oberen Fensters nicht verändern"
-
-#~ msgid "Cannot move top win"
-#~ msgstr "Kann oberes Fenster nicht verschieben"
-
-#~ msgid "Cannot resize edit win"
-#~ msgstr "Kann Größe des Bearbeitungsfensters nicht verändern"
-
-#~ msgid "Cannot move edit win"
-#~ msgstr "Kann Bearbeitungsfenster nicht verschieben"
-
-#~ msgid "Cannot resize bottom win"
-#~ msgstr "Kann Größe des unteren Fensters nicht verändern"
-
-#~ msgid "Cannot move bottom win"
-#~ msgstr "Kann unteres Fenster nicht verschieben"
-
-#~ msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
 #~ msgstr ""
-#~ "NumLock-Problem entdeckt. Tastenblock funktioniert bei ausgeschaltetem "
-#~ "NumLock nicht"
-
-#~ msgid "Tab size is too small for nano...\n"
-#~ msgstr "Tabulatorweite ist zu klein für Nano...\n"
-
-#~ msgid "Main: set up windows\n"
-#~ msgstr "Hauptprogramm: Fenster konfigurieren\n"
-
-#~ msgid "Main: bottom win\n"
-#~ msgstr "Hauptprogramm: unteres Fenster\n"
-
-#~ msgid "Main: open file\n"
-#~ msgstr "Hauptprogramm: Datei öffnen\n"
-
-#~ msgid "AHA!  %c (%d)\n"
-#~ msgstr "Aha!  %c (%d)\n"
-
-#~ msgid "I got Alt-O-%c! (%d)\n"
-#~ msgstr "Erhielt Alt-O-%c! (%d)\n"
-
-#~ msgid "I got Alt-[-1-%c! (%d)\n"
-#~ msgstr "Erhielt Alt-[-1-%c! (%d)\n"
-
-#~ msgid "I got Alt-[-2-%c! (%d)\n"
-#~ msgstr "Erhielt Alt-[-2-%c! (%d)\n"
-
-#~ msgid "I got Alt-[-%c! (%d)\n"
-#~ msgstr "Erhielt Alt-[-%c! (%d)\n"
-
-#~ msgid "I got Alt-%c! (%d)\n"
-#~ msgstr "Erhielt Alt-%c! (%d)\n"
-
-#~ msgid "I got %c (%d)!\n"
-#~ msgstr "Erhielt %c (%d)!\n"
-
-#~ msgid "Adding new syntax after 1st\n"
-#~ msgstr "Füge neue Syntax nach der ersten hinzu\n"
-
-#~ msgid "Starting a new syntax type\n"
-#~ msgstr "Beginne einen neuen Syntaxtyp\n"
-
-#~ msgid "Starting a new colorstring for fg %d bg %d\n"
-#~ msgstr "Beginne eine neue Farbzeichenkette für fg %d bg %d\n"
-
-#~ msgid "Adding new entry for fg %d bg %d\n"
-#~ msgstr "Füge neuen Eintrag für fg %d bg %d hinzu\n"
-
-#~ msgid "%s: Read a comment\n"
-#~ msgstr "%s: Kommentar lesen\n"
-
-#~ msgid "%s: Parsing option %s\n"
-#~ msgstr "%s: Option %s lesen\n"
-
-#~ msgid "set flag %d!\n"
-#~ msgstr "setze Flag %d!\n"
-
-#~ msgid "Errors found in .nanorc file"
-#~ msgstr "Fehler in .nanorc-Datei gefunden"
-
-#~ msgid "Unable to open ~/.nanorc file, %s"
-#~ msgstr "Kann Datei ~/.nanorc nicht öffnen, %s"
-
-#~ msgid "\"%s...\" not found"
-#~ msgstr "„%s...“ nicht gefunden"
-
-#~ msgid "Invalid regex \"%s\""
-#~ msgstr "Ungültiger regulärer Ausdrücke „%s“"
-
-#~ msgid "Replace failed: unknown subexpression!"
-#~ msgstr "Ersetzung gescheitert: unbekannter Unterausdruck"
-
-#~ msgid "actual_x for xplus=%d returns %d\n"
-#~ msgstr "actual_x für xplus=%d gab %d zurück\n"
-
-#~ msgid "Aha! '%c' (%d)\n"
-#~ msgstr "Aha! ‚%c‘ (%d)\n"
-
-#~ msgid "input '%c' (%d)\n"
-#~ msgstr "Eingabe ‚%c‘ (%d)\n"
-
-#~ msgid "  File: ..."
-#~ msgstr "  Datei: ..."
-
-#~ msgid "   DIR: ..."
-#~ msgstr "   Verz.: ..."
-
-#~ msgid "Moved to (%d, %d) in edit buffer\n"
-#~ msgstr "Nach (%d, %d) im Bearbeitungspuffer verschoben\n"
-
-#~ msgid "I got \"%s\"\n"
-#~ msgstr "Erhielt „%s“\n"
-
-#~ msgid "Dumping file buffer to stderr...\n"
-#~ msgstr "Gebe Datei Puffer nach stderr aus...\n"
-
-#~ msgid "Dumping cutbuffer to stderr...\n"
-#~ msgstr "Gebe Inhalt der Zwischenablage nach stderr aus...\n"
-
-#~ msgid "Dumping a buffer to stderr...\n"
-#~ msgstr "Gebe einen Puffer nach stderr aus...\n"
-
-#~ msgid "Generic error"
-#~ msgstr "Allgemeiner Fehler"
-
-#~ msgid "Can't visit parent in restricted mode"
-#~ msgstr "Kann im eingeschränkten Modus nicht nach oben wechseln"
-
-#~ msgid "Press return to continue\n"
-#~ msgstr "Drücken Sie die Eingabetaste zum Fortfahren\n"
-
-#~ msgid "string val=%s\n"
-#~ msgstr "Zeichenkette Wert=%s\n"
-
-#~ msgid "For end part, beginning = \"%s\"\n"
-#~ msgstr "Für End-Teil, Anfang = „%s“\n"
-
-#~ msgid "current->data = \"%s\"\n"
-#~ msgstr "current->data = „%s“\n"
-
-#~ msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
-#~ msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
-
-#~ msgid "read_line: not on first line and prev is NULL"
-#~ msgstr "read_line: nicht in der ersten Zeile und prev ist NULL"
-
-# Punctuation: 
-#~ msgid "'\")}]>"
-#~ msgstr "'\")}]>"
-
-#~ msgid "Replaced 1 occurrence"
-#~ msgstr "1 Ersetzung vorgenommen"
-
-#~ msgid "Replace with [%s]"
-#~ msgstr "Ersetzen mit [%s]"
-
-#~ msgid "nano: realloc: out of memory!"
-#~ msgstr "nano: realloc: Kein Speicher verfügbar!"
-
-#~ msgid "nano: calloc: out of memory!"
-#~ msgstr "nano: calloc: Kein Speicher verfügbar!"
-
-#~ msgid "Match! (%d chars) \"%s\"\n"
-#~ msgstr "Treffer! (%d Zeichen) „%s“\n"
-
-#~ msgid "paintlen (%d) = eo (%d) - so (%d)\n"
-#~ msgstr "paintlen (%d) = eo (%d) - so (%d)\n"
-
-#~ msgid "paintlen (%d) = COLS (%d) - k (%d), - rm.so (%d) - 1\n"
-#~ msgstr "paintlen (%d) = COLS (%d) - k (%d), - rm.so (%d) - 1\n"
-
-#~ msgid "start = %d, smatch = %d, ematch = %d\n"
-#~ msgstr "start = %d, smatch = %d, ematch = %d\n"
-
-#~ msgid "Backwards search"
-#~ msgstr "Suche rückwärts"
-
-#~ msgid "Goto"
-#~ msgstr "Zu Zeile"
-
-#~ msgid "check_wrap called with inptr->data=\"%s\"\n"
-#~ msgstr "check_wrap aufgerufen mit inptr->data=„%s“\n"
+#~ "Interner Fehler: Zeile %ld kann nicht gefunden werden. Bitte speichern "
+#~ "Sie Ihre Arbeit."
diff --git a/po/eo.gmo b/po/eo.gmo
new file mode 100644
index 0000000..9a68315
--- /dev/null
+++ b/po/eo.gmo
diff --git a/po/eo.po b/po/eo.po
new file mode 100644
index 0000000..d99dcb6
--- /dev/null
+++ b/po/eo.po
@@ -0,0 +1,2356 @@
+# Esperanto translations for GNU nano.
+# Copyright (C) 2015 Free Software Foundation, Inc.
+# This file is distributed under the same license as the nano package.
+#
+# “Haben Sie einen Investor brauchen?�
+#
+# Benno Schulenberg <benno@vertaalt.nl>, 2010, 2011, 2013, 2014, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: nano 2.3.99pre4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 11:03+0100\n"
+"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
+"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
+"Language: eo\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.0\n"
+
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
+msgid "Go To Directory"
+msgstr "Iri dosierujon"
+
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
+msgid "Cancelled"
+msgstr "Rezignita"
+
+#: src/browser.c:246 src/browser.c:293
+#, c-format
+msgid "Can't go outside of %s in restricted mode"
+msgstr "Ne eblas iri ekstere de %s en limigita re�imo"
+
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Eraro dum legado de %s: %s"
+
+#: src/browser.c:283
+msgid "Can't move up a directory"
+msgstr "Ne eblas iri al supra dosierujo"
+
+#. TRANSLATORS: Try to keep this at most 7
+#. * characters.
+#: src/browser.c:626 src/browser.c:635
+msgid "(dir)"
+msgstr "(ujo)"
+
+#. TRANSLATORS: Try to keep this at most 12
+#. * characters.
+#: src/browser.c:632
+msgid "(parent dir)"
+msgstr "(patra ujo)"
+
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
+msgid "Search"
+msgstr "Serĉi"
+
+#: src/browser.c:812 src/search.c:382
+msgid "Search Wrapped"
+msgstr "Serĉado ĉirkaŭiris"
+
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
+msgid "This is the only occurrence"
+msgstr "Ĉi tiu estas la ununura aperaĵo"
+
+#: src/browser.c:915 src/search.c:569
+msgid "No current search pattern"
+msgstr "Mankas ankoraŭ serĉendaĵo"
+
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"Malsukcesis eltrovi mian identecon por rigla dosiero (getpwuid() fiaskis)"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Malsukcesis eltrovi komputilretnomon por rigla dosiero: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Eraro dum skribado de rigla dosiero %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Eraro dum forigo de rigla dosiero %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Eraro dum malfermo de rigla dosiero %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "Eraro dum legado de rigla dosiero %s: nesufiĉaj datumoj legi�is"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr "Dosiero %s jam redakti�as (por %s kun %s, PID %d); ĉu daŭrigi?"
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Eraro dum skribado de rigla dosiero: dosierujo '%s' ne ekzistas"
+
+#: src/files.c:339
+#, c-format
+msgid "Can't insert file from outside of %s"
+msgstr "Ne eblas enmeti dosieron el ekstere de %s"
+
+#: src/files.c:467
+msgid "No more open file buffers"
+msgstr "Ne ekzistas pliaj malfermaj bufroj"
+
+#: src/files.c:484
+#, c-format
+msgid "Switched to %s"
+msgstr "Åœaltita al %s"
+
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
+msgid "New Buffer"
+msgstr "Nova bufro"
+
+#: src/files.c:874
+#, c-format
+msgid "Read %lu line (Converted from DOS and Mac format)"
+msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
+msgstr[0] "Legi�is %lu linio (konvertita el DOS- kaj Mac-aran�o)"
+msgstr[1] "Legi�is %lu linioj (konvertita el DOS- kaj Mac-aran�o)"
+
+#: src/files.c:879
+#, c-format
+msgid ""
+"Read %lu line (Converted from DOS and Mac format - Warning: No write "
+"permission)"
+msgid_plural ""
+"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+"permission)"
+msgstr[0] ""
+"Legi�is %lu linio (konvertita el DOS- kaj Mac-aran�o -- Averto: skribrajto "
+"mankas)"
+msgstr[1] ""
+"Legi�is %lu linioj (konvertita el DOS- kaj Mac-aran�o -- Averto: skribrajto "
+"mankas)"
+
+#: src/files.c:885
+#, c-format
+msgid "Read %lu line (Converted from Mac format)"
+msgid_plural "Read %lu lines (Converted from Mac format)"
+msgstr[0] "Legi�is %lu linio (konvertita el Mac-aran�o)"
+msgstr[1] "Legi�is %lu linioj (konvertitaj el Mac-aran�o)"
+
+#: src/files.c:889
+#, c-format
+msgid ""
+"Read %lu line (Converted from Mac format - Warning: No write permission)"
+msgid_plural ""
+"Read %lu lines (Converted from Mac format - Warning: No write permission)"
+msgstr[0] ""
+"Legi�is %lu linio (konvertita el Mac-aran�o -- Averto: skribrajto mankas)"
+msgstr[1] ""
+"Legi�is %lu linioj (konvertitaj el Mac-aran�o -- Averto: skribrajto mankas)"
+
+#: src/files.c:895
+#, c-format
+msgid "Read %lu line (Converted from DOS format)"
+msgid_plural "Read %lu lines (Converted from DOS format)"
+msgstr[0] "Legi�is %lu linio (konvertita el DOS-aran�o)"
+msgstr[1] "Legi�is %lu linioj (konvertitaj el DOS-aran�o)"
+
+#: src/files.c:899
+#, c-format
+msgid ""
+"Read %lu line (Converted from DOS format - Warning: No write permission)"
+msgid_plural ""
+"Read %lu lines (Converted from DOS format - Warning: No write permission)"
+msgstr[0] ""
+"Legi�is %lu linio (konvertita el DOS-aran�o -- Averto: skribrajto mankas)"
+msgstr[1] ""
+"Legi�is %lu linioj (konvertitaj el DOS-aran�o -- Averto: skribrajto mankas)"
+
+#: src/files.c:905
+#, c-format
+msgid "Read %lu line"
+msgid_plural "Read %lu lines"
+msgstr[0] "Legi�is %lu linio"
+msgstr[1] "Legi�is %lu linioj"
+
+#: src/files.c:908
+#, c-format
+msgid "Read %lu line ( Warning: No write permission)"
+msgid_plural "Read %lu lines (Warning: No write permission)"
+msgstr[0] "Legi�is %lu linio (Averto: skribrajto mankas)"
+msgstr[1] "Legi�is %lu linioj (Averto: skribrajto mankas)"
+
+#: src/files.c:943 src/files.c:980
+msgid "Reading File"
+msgstr "Legado de dosiero"
+
+#: src/files.c:950
+msgid "New File"
+msgstr "Nova dosiero"
+
+#: src/files.c:953
+#, c-format
+msgid "\"%s\" not found"
+msgstr "\"%s\" ne trovatas"
+
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
+#, c-format
+msgid "\"%s\" is a directory"
+msgstr "\"%s\" estas dosierujo"
+
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
+#, c-format
+msgid "\"%s\" is a device file"
+msgstr "\"%s\" estas aparato"
+
+#: src/files.c:1060
+#, c-format
+msgid "Command to execute in new buffer [from %s] "
+msgstr "Rulenda komando en nova bufro [el %s] "
+
+#: src/files.c:1062
+#, c-format
+msgid "Command to execute [from %s] "
+msgstr "Rulenda komando [el %s] "
+
+#: src/files.c:1069
+#, c-format
+msgid "File to insert into new buffer [from %s] "
+msgstr "Enmetenda dosiero en nova bufro [el %s] "
+
+#: src/files.c:1071
+#, c-format
+msgid "File to insert [from %s] "
+msgstr "Enmetenda dosiero [el %s] "
+
+#: src/files.c:1320
+msgid "Key invalid in non-multibuffer mode"
+msgstr "Klavo nur validas en multbufra moduso"
+
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr "Malsukcesis skribi savkopion; ĉu tamen konservi? (N se vi ne certas) "
+
+#: src/files.c:1746
+#, c-format
+msgid "Can't write outside of %s"
+msgstr "Ne eblas skribi ekstere de %s"
+
+#: src/files.c:1761
+msgid "Cannot prepend or append to a symlink with --nofollow set"
+msgstr "Kun \"--nofollow\" ne eblas antaÅ­glui nek postglui al simbola ligilo"
+
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
+#, c-format
+msgid "Error writing backup file %s: %s"
+msgstr "Eraro dum skribado de savkopio %s: %s"
+
+#: src/files.c:1844 src/nano.c:719
+msgid "Too many backup files?"
+msgstr "Ĉu troaj savkopioj?"
+
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
+#, c-format
+msgid "Error writing %s: %s"
+msgstr "Eraro dum skribado de %s: %s"
+
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
+#, c-format
+msgid "Error writing temp file: %s"
+msgstr "Eraro dum skribado de portempa dosiero: %s"
+
+#: src/files.c:2173
+#, c-format
+msgid "Wrote %lu line"
+msgid_plural "Wrote %lu lines"
+msgstr[0] "Skribi�is %lu linio"
+msgstr[1] "Skribi�is %lu linioj"
+
+#: src/files.c:2278
+msgid " [DOS Format]"
+msgstr " [DOS-aran�o]"
+
+#: src/files.c:2279
+msgid " [Mac Format]"
+msgstr " [Mac-aran�o]"
+
+#: src/files.c:2281
+msgid " [Backup]"
+msgstr " [savkopii]"
+
+#: src/files.c:2289
+msgid "Prepend Selection to File"
+msgstr "Antaŭglui markaĵon al dosiero"
+
+#: src/files.c:2290
+msgid "Append Selection to File"
+msgstr "Postglui markaĵon al dosiero"
+
+#: src/files.c:2291
+msgid "Write Selection to File"
+msgstr "Konservi markaĵon en dosiero"
+
+#: src/files.c:2294
+msgid "File Name to Prepend to"
+msgstr "Nomo de dosiero al kiu antaÅ­glui"
+
+#: src/files.c:2295
+msgid "File Name to Append to"
+msgstr "Nomo de dosiero al kiu postglui"
+
+#: src/files.c:2296
+msgid "File Name to Write"
+msgstr "Nomo de skribota dosiero"
+
+#: src/files.c:2427
+msgid "File exists, OVERWRITE ? "
+msgstr "Dosiero jam ekzistas; ĉu ANSTATAŬIGI? "
+
+#: src/files.c:2436
+msgid "Save file under DIFFERENT NAME ? "
+msgstr "Ĉu konservi ALINOME? "
+
+#: src/files.c:2450
+msgid "File was modified since you opened it, continue saving ? "
+msgstr "Dosiero modifi�is post malfermo; ĉu tamen surskribi �in? "
+
+#: src/files.c:2882
+msgid "(more)"
+msgstr "(plu)"
+
+#: src/files.c:2974
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue\n"
+msgstr ""
+"\n"
+"Premu \"Enter\" por daÅ­rigi.\n"
+
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Malsukcesis krei dosierujon %s: %s\n"
+"Ĉi tiu dosierujo bezonatas por konservi/relegi serĉan historion kaj kursoran "
+"pozicion.\n"
+
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"Vojo %s ne estas dosierujo sed devas esti.\n"
+"'Nano' ne kapablos konservi/relegi serĉan historion nek kursorajn "
+"poziciojn.\n"
+
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Trovi�is olda historia dosiero (%s);\n"
+"dum movo al preferata loko (%s)\n"
+"okazis eraro: %s"
+
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Trovi�is olda historia dosiero (%s)\n"
+"kiu nun movi�is al preferata loko (%s).\n"
+"(Vidu la 'nano-FAQ' por informo pri ĉi tiu �an�o.)"
+
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Fini"
+
+#: src/global.c:478
+msgid "Close"
+msgstr "Fermi"
+
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Alglui"
+
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Malrektigi"
+
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
+msgid "WhereIs Next"
+msgstr "Serĉi sekvan"
+
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
+msgid "Where Is"
+msgstr "Serĉi"
+
+#: src/global.c:493
+msgid "Replace"
+msgstr "AnstataÅ­igi"
+
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Iri linion"
+
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Linio supren"
+
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Linio suben"
+
+#: src/global.c:497
+msgid "Read File"
+msgstr "Enmeti"
+
+#: src/global.c:499
+msgid "FullJstify"
+msgstr "Rektigi ĉion"
+
+#: src/global.c:501
+msgid "Refresh"
+msgstr "Remontri"
+
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
+msgid "Justify the current paragraph"
+msgstr "Rektigi la nunan alineon"
+
+#: src/global.c:509
+msgid "Cancel the current function"
+msgstr "Rezigni la nunan operacion"
+
+#: src/global.c:510
+msgid "Display this help text"
+msgstr "Montri ĉi tiun helptekston"
+
+#: src/global.c:513
+msgid "Close the current file buffer / Exit from nano"
+msgstr "Fermi la nunan bufron / Eliri el 'nano'"
+
+#: src/global.c:515
+msgid "Exit from nano"
+msgstr "Eliri el 'nano'"
+
+#: src/global.c:519
+msgid "Write the current file to disk"
+msgstr "Konservi la nunan dosieron sur disko"
+
+#: src/global.c:521
+msgid "Insert another file into the current one"
+msgstr "Enmeti alian dosieron en la nuna bufro"
+
+#: src/global.c:523
+msgid "Search for a string or a regular expression"
+msgstr "Serĉi signoĉenon aŭ regulesprimon"
+
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Serĉi parton de dosiernomo"
+
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Iri unu pa�o supren"
+
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Iri unu pa�o suben"
+
+#: src/global.c:531
+msgid "Cut the current line and store it in the cutbuffer"
+msgstr "Eltondi la nunan linion kaj konservi �in en tondbufro"
+
+#: src/global.c:533
+msgid "Uncut from the cutbuffer into the current line"
+msgstr "Glui tekstaĵon el la tondbufro en la nuna linio"
+
+#: src/global.c:534
+msgid "Display the position of the cursor"
+msgstr "Montri la pozicion de la kursoro"
+
+#: src/global.c:536
+msgid "Invoke the spell checker, if available"
+msgstr "Ruli literumilon (se disponeblas)"
+
+#: src/global.c:538
+msgid "Replace a string or a regular expression"
+msgstr "Anstataŭigi signoĉenon aŭ regulesprimon"
+
+#: src/global.c:539
+msgid "Go to line and column number"
+msgstr "Iri al linionumero (kaj kolumnonumero)"
+
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Marki tekston ekde la kursora pozicio"
+
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Ripeti lastan serĉon"
+
+#: src/global.c:544
+msgid "Copy the current line and store it in the cutbuffer"
+msgstr "Kopii la nunan linion kaj konservi �in en tondbufro"
+
+#: src/global.c:545
+msgid "Indent the current line"
+msgstr "De�ovi enen la nunan linion"
+
+#: src/global.c:546
+msgid "Unindent the current line"
+msgstr "De�ovi eksteren la nunan linion"
+
+#: src/global.c:547
+msgid "Undo the last operation"
+msgstr "Malfari la lastan operacion"
+
+#: src/global.c:548
+msgid "Redo the last undone operation"
+msgstr "Refari la lastan malfaratan operacion"
+
+#: src/global.c:550
+msgid "Go forward one character"
+msgstr "Iri unu signon antaÅ­en"
+
+#: src/global.c:551
+msgid "Go back one character"
+msgstr "Iri unu signon malantaÅ­en"
+
+#: src/global.c:553
+msgid "Go forward one word"
+msgstr "Iri unu vorton antaÅ­en"
+
+#: src/global.c:554
+msgid "Go back one word"
+msgstr "Iri unu vorton malantaÅ­en"
+
+#: src/global.c:556
+msgid "Go to previous line"
+msgstr "Iri al la supra linio"
+
+#: src/global.c:557
+msgid "Go to next line"
+msgstr "Iri al la suba linio"
+
+#: src/global.c:558
+msgid "Go to beginning of current line"
+msgstr "Iri al la komenco de la nuna linio"
+
+#: src/global.c:559
+msgid "Go to end of current line"
+msgstr "Iri al la fino de la nuna linio"
+
+#: src/global.c:562
+msgid "Go to beginning of paragraph; then of previous paragraph"
+msgstr "Iri al komenco de alineo; poste al �i de antaŭa alineo"
+
+#: src/global.c:564
+msgid "Go just beyond end of paragraph; then of next paragraph"
+msgstr "Iri al postfino de alineo; poste al �i de posta alineo"
+
+#: src/global.c:566
+msgid "Go to the first line of the file"
+msgstr "Iri al la unua linio de la dosiero"
+
+#: src/global.c:567
+msgid "Go to the last line of the file"
+msgstr "Iri al la lasta linio de la dosiero"
+
+#: src/global.c:569
+msgid "Go to the matching bracket"
+msgstr "Iri al para krampo"
+
+#: src/global.c:571
+msgid "Scroll up one line without scrolling the cursor"
+msgstr "Rulumi unu linion supren sen movi la kursoron"
+
+#: src/global.c:573
+msgid "Scroll down one line without scrolling the cursor"
+msgstr "Rulumi unu linion suben sen movi la kursoron"
+
+#: src/global.c:576
+msgid "Switch to the previous file buffer"
+msgstr "Åœalti al malsekva dosierbufro"
+
+#: src/global.c:577
+msgid "Switch to the next file buffer"
+msgstr "Åœalti al sekva dosierbufro"
+
+#: src/global.c:579
+msgid "Insert the next keystroke verbatim"
+msgstr "Enmeti la tujsekvan klavon tielkiel"
+
+#: src/global.c:580
+msgid "Insert a tab at the cursor position"
+msgstr "Enmeti tabon je la kursora pozicio"
+
+#: src/global.c:581
+msgid "Insert a newline at the cursor position"
+msgstr "Enmeti novlinion je la kursora pozicio"
+
+#: src/global.c:582
+msgid "Delete the character under the cursor"
+msgstr "Forigi la signon sub la kursoro"
+
+#: src/global.c:584
+msgid "Delete the character to the left of the cursor"
+msgstr "Forigi la signon maldekstran de la kursoro"
+
+#: src/global.c:587
+msgid "Cut from the cursor position to the end of the file"
+msgstr "Forigi ĉion ekde de la kursoro �is la dosierfino"
+
+#: src/global.c:590
+msgid "Justify the entire file"
+msgstr "Rektigi la tutan dosieron"
+
+#: src/global.c:594
+msgid "Count the number of words, lines, and characters"
+msgstr "Nombri la vortojn, liniojn, kaj signojn"
+
+#: src/global.c:597
+msgid "Refresh (redraw) the current screen"
+msgstr "Aktualigi (redesegni) la nunan ekranon"
+
+#: src/global.c:599
+msgid "Suspend the editor (if suspend is enabled)"
+msgstr "Paŭzigi la redaktilon (se paŭzigebleco en�altitas)"
+
+#: src/global.c:602
+msgid "Toggle the case sensitivity of the search"
+msgstr "Ŝalti la usklecdistingon de serĉo"
+
+#: src/global.c:604
+msgid "Reverse the direction of the search"
+msgstr "Mali la direkton de serĉo"
+
+#: src/global.c:608
+msgid "Toggle the use of regular expressions"
+msgstr "Åœalti la uzon de regulesprimoj"
+
+#: src/global.c:612
+msgid "Recall the previous search/replace string"
+msgstr "Repreni la antaŭan serĉitan signoĉenon"
+
+#: src/global.c:614
+msgid "Recall the next search/replace string"
+msgstr "Repreni la postan serĉitan signoĉenon"
+
+#: src/global.c:617
+msgid "Go to file browser"
+msgstr "Iri al dosieresplorilo"
+
+#: src/global.c:620
+msgid "Toggle the use of DOS format"
+msgstr "Ŝalti la uzon de DOS-aran�o"
+
+#: src/global.c:621
+msgid "Toggle the use of Mac format"
+msgstr "Ŝalti la uzon de Mac-aran�o"
+
+#: src/global.c:622
+msgid "Toggle appending"
+msgstr "Åœalti postgluon"
+
+#: src/global.c:623
+msgid "Toggle prepending"
+msgstr "Åœalti antaÅ­gluon"
+
+#: src/global.c:624
+msgid "Toggle backing up of the original file"
+msgstr "Åœalti fari savkopion de redaktota dosiero"
+
+#: src/global.c:625
+msgid "Execute external command"
+msgstr "Ruli eksteran komandon"
+
+#: src/global.c:628
+msgid "Toggle the use of a new buffer"
+msgstr "Åœalti la uzon de nova bufro"
+
+#: src/global.c:631
+msgid "Exit from the file browser"
+msgstr "Eliri el dosieresplorilo"
+
+#: src/global.c:632
+msgid "Go to the first file in the list"
+msgstr "Iri al la unua dosiero en la listo"
+
+#: src/global.c:633
+msgid "Go to the last file in the list"
+msgstr "Iri al la lasta dosiero en la listo"
+
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "Iri al la malsekva dosiero en la listo"
+
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Iri al la sekva dosiero en la listo"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Iri al indikota dosierujo"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Ruli sintaks-kontrolilon (se disponeblas)"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Iri al la antaŭa mesa�o de la kontrolilo"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Iri al la sekva mesa�o de la kontrolilo"
+
+#: src/global.c:642
+msgid "Invoke formatter, if available"
+msgstr "Ruli aran�ilon (se disponeblas)"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Helpo"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Rezigni"
+
+#: src/global.c:678
+msgid "Write Out"
+msgstr "Konservi"
+
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Iri dosierujon"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Eltondi"
+
+#: src/global.c:728
+msgid "Justify"
+msgstr "Rektigi"
+
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Literumo"
+
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Trakombi"
+
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Aran�ilo"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Usklece"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Regulesprime"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "MalantaÅ­en"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Ne anstataÅ­igi"
+
+#: src/global.c:770
+msgid "Cur Pos"
+msgstr "Pozicio"
+
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Pa�o supren"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Pa�o suben"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Unua linio"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Lasta linio"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Al krampo"
+
+#: src/global.c:797
+msgid "Mark Text"
+msgstr "Mark�alto"
+
+#: src/global.c:800
+msgid "Copy Text"
+msgstr "Kopii tekston"
+
+#: src/global.c:803
+msgid "Indent Text"
+msgstr "De�ovi enen"
+
+#: src/global.c:805
+msgid "Unindent Text"
+msgstr "De�ovi eksteren"
+
+#: src/global.c:808
+msgid "Undo"
+msgstr "Malfari"
+
+#: src/global.c:810
+msgid "Redo"
+msgstr "Refari"
+
+#: src/global.c:814 src/global.c:820
+msgid "Back"
+msgstr "MalantaÅ­en"
+
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "AntaÅ­en"
+
+#: src/global.c:827
+msgid "Prev Word"
+msgstr "AntaÅ­a vorto"
+
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Posta vorto"
+
+#: src/global.c:833
+msgid "Home"
+msgstr "Linikomencen"
+
+#: src/global.c:835
+msgid "End"
+msgstr "Linifinen"
+
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Alineo-eken"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Alineo-finen"
+
+#: src/global.c:851
+msgid "Scroll Up"
+msgstr "Rulumi supren"
+
+#: src/global.c:853
+msgid "Scroll Down"
+msgstr "Rulumi suben"
+
+#: src/global.c:858
+msgid "Prev File"
+msgstr "Malsekvan"
+
+#: src/global.c:860
+msgid "Next File"
+msgstr "Sekvan"
+
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Konforme"
+
+#: src/global.c:872
+msgid "Tab"
+msgstr "«Tabo»"
+
+#: src/global.c:874
+msgid "Enter"
+msgstr "«Enigo»"
+
+#: src/global.c:876
+msgid "Delete"
+msgstr "«Forigo»"
+
+#: src/global.c:878
+msgid "Backspace"
+msgstr "«Retropa�o»"
+
+#: src/global.c:888
+msgid "CutTillEnd"
+msgstr "Tondi reston"
+
+#: src/global.c:898
+msgid "Word Count"
+msgstr "Nombri vortojn"
+
+#: src/global.c:905
+msgid "Suspend"
+msgstr "PaÅ­zigi"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Pli olda"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Malpli olda"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Serĉi"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS-aran�o"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac-aran�o"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Postglui"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "AntaÅ­glui"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Savkopii"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Ruli komandon"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Dosierlisto"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Unua dosiero"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Lasta dosiero"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Antaŭa mesa�o"
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "Sekva mesa�o"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
+msgid "Help mode"
+msgstr "Helpaj linioj"
+
+#: src/global.c:1229
+msgid "Constant cursor position display"
+msgstr "DaÅ­ra montro de kursora pozicio"
+
+#: src/global.c:1231
+msgid "Use of one more line for editing"
+msgstr "Uzi unu plian linion por redakti"
+
+#: src/global.c:1233
+msgid "Smooth scrolling"
+msgstr "Rulumi linie"
+
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Ĉirkaŭfluigo de tro longaj linioj"
+
+#: src/global.c:1237
+msgid "Whitespace display"
+msgstr "Montri blankan spacon"
+
+#: src/global.c:1239
+msgid "Color syntax highlighting"
+msgstr "Kolore montri sintakson"
+
+#: src/global.c:1241
+msgid "Smart home key"
+msgstr "Inteligenta klavo «Komencen»"
+
+#: src/global.c:1243
+msgid "Auto indent"
+msgstr "Aŭtomate de�ovi"
+
+#: src/global.c:1245
+msgid "Cut to end"
+msgstr "Tondi ekde kursoro �is linifino"
+
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Faldi longajn liniojn (enmeti linifinon)"
+
+#: src/global.c:1249
+msgid "Conversion of typed tabs to spaces"
+msgstr "Konverti tajpatajn tabojn al spacoj"
+
+#: src/global.c:1251
+msgid "Backup files"
+msgstr "Fari savkopion de redaktota dosiero"
+
+#: src/global.c:1253
+msgid "Multiple file buffers"
+msgstr "Pluraj dosierbufroj"
+
+#: src/global.c:1255
+msgid "Mouse support"
+msgstr "Subteno de muso"
+
+#: src/global.c:1257
+msgid "No conversion from DOS/Mac format"
+msgstr "Ne konverti el DOS-/Mac-aran�o"
+
+#: src/global.c:1259
+msgid "Suspension"
+msgstr "PaÅ­zigebleco"
+
+#: src/help.c:205
+msgid ""
+"Search Command Help Text\n"
+"\n"
+" Enter the words or characters you would like to search for, and then press "
+"Enter.  If there is a match for the text you entered, the screen will be "
+"updated to the location of the nearest match for the search string.\n"
+"\n"
+" The previous search string will be shown in brackets after the search "
+"prompt.  Hitting Enter without entering any text will perform the previous "
+"search.  "
+msgstr ""
+"Serĉa helpteksto\n"
+"\n"
+" Enigu la vortojn aŭ signojn kiujn vi volas trovi, kaj premu «Enigo».  Se "
+"ekzistas kongruo por la teksto kiun vi enigis, la ekrano aktuali�os al la "
+"loko de la unue trovata kongruo.\n"
+"\n"
+" La antaŭa serĉendaĵo montri�as inter krampoj post la serĉa invito -- premo "
+"de «Enigo» sen enigi iun ajn tekston kontinuigos tiun antaŭan serĉon.  "
+
+#: src/help.c:214
+msgid ""
+"If you have selected text with the mark and then search to replace, only "
+"matches in the selected text will be replaced.\n"
+"\n"
+" The following function keys are available in Search mode:\n"
+"\n"
+msgstr ""
+"Se vi markis tekston kaj tiam serĉas por anstataŭigi, nur kongruoj en la "
+"markita teksto anstataŭi�os.\n"
+"\n"
+" La subaj klavkomandoj disponeblas en serĉa moduso:\n"
+"\n"
+
+#: src/help.c:220
+msgid ""
+"Go To Line Help Text\n"
+"\n"
+" Enter the line number that you wish to go to and hit Enter.  If there are "
+"fewer lines of text than the number you entered, you will be brought to the "
+"last line of the file.\n"
+"\n"
+" The following function keys are available in Go To Line mode:\n"
+"\n"
+msgstr ""
+"Helpteksto por iri al specifa linio\n"
+"\n"
+" Enigu la numeron de la linio al kiu vi volas iri, kaj premu «Enigo».  Se "
+"ekzistas malpli linioj da teksto ol la numero kiun vi enigis, la fino de la "
+"dosiero estos montrata.\n"
+"\n"
+" La subaj klavkomandoj disponeblas dum «Iri linion»:\n"
+"\n"
+
+#: src/help.c:229
+msgid ""
+"Insert File Help Text\n"
+"\n"
+" Type in the name of a file to be inserted into the current file buffer at "
+"the current cursor location.\n"
+"\n"
+" If you have compiled nano with multiple file buffer support, and enable "
+"multiple file buffers with the -F or --multibuffer command line flags, the "
+"Meta-F toggle, or a nanorc file, inserting a file will cause it to be loaded "
+"into a separate buffer (use Meta-< and > to switch between file buffers).  "
+msgstr ""
+"Helpteksto por enmeti dosieron\n"
+"\n"
+" Tajpu la nomon de la dosiero kiu enmetendas en la nuna dosierbufro je la "
+"nuna kursora pozicio.\n"
+"\n"
+" Se vi kompilis 'nano' kun subteno por pluraj dosierbufroj, kaj se vi "
+"ebligis multbufran moduson (per opcio '-F' aÅ­ '--multibuffer', per 'nanorc', "
+"aŭ per �alto Meta-F), enmeti dosieron �argos �in en aparta bufro.  Uzu Meta-"
+"< kaj Meta-> por �alti inter bufroj.  "
+
+#: src/help.c:238
+msgid ""
+"If you need another blank buffer, do not enter any filename, or type in a "
+"nonexistent filename at the prompt and press Enter.\n"
+"\n"
+" The following function keys are available in Insert File mode:\n"
+"\n"
+msgstr ""
+"Se vi bezonas novan, vakan bufron, ne enigu nomon (aÅ­ enigu neekzistantan "
+"nomon) kaj premu «Enigo».\n"
+"\n"
+" La subaj klavkomandoj disponeblas dum «Enmeti dosieron»:\n"
+"\n"
+
+#: src/help.c:244
+msgid ""
+"Write File Help Text\n"
+"\n"
+" Type the name that you wish to save the current file as and press Enter to "
+"save the file.\n"
+"\n"
+" If you have selected text with the mark, you will be prompted to save only "
+"the selected portion to a separate file.  To reduce the chance of "
+"overwriting the current file with just a portion of it, the current filename "
+"is not the default in this mode.\n"
+"\n"
+" The following function keys are available in Write File mode:\n"
+"\n"
+msgstr ""
+"Helpteksto por konservi dosieron\n"
+"\n"
+" Tajpu la nomon sub kiu konservi la nunan dosierbufron, kaj premu «Enigo».\n"
+"\n"
+" Se vi markis tekston, vi inviti�os konservi nur la markitan tekston.  Por "
+"limigi la �ancon de surskribi la nunan dosieron kun nur parton de tiu, la "
+"nuna dosiernomo ne estas la defaŭlto en ĉi tiu moduso.\n"
+"\n"
+" La subaj klavkomandoj disponeblas dum «Konservi dosieron»:\n"
+"\n"
+
+#: src/help.c:258
+msgid ""
+"File Browser Help Text\n"
+"\n"
+" The file browser is used to visually browse the directory structure to "
+"select a file for reading or writing.  You may use the arrow keys or Page Up/"
+"Down to browse through the files, and S or Enter to choose the selected file "
+"or enter the selected directory.  To move up one level, select the directory "
+"called \"..\" at the top of the file list.\n"
+"\n"
+" The following function keys are available in the file browser:\n"
+"\n"
+msgstr ""
+"Helpteksto por dosieresplorilo\n"
+"\n"
+" La dosieresplorilo uzeblas por esplori la arbo de dosierujoj por elekti "
+"dosieron por legi aŭ skribi.  Vi povas uzi la sagoklavojn aŭ «pa�on supren/"
+"suben» por foliumi tra la dosieroj, kaj «S» aŭ «Enigo» por elekti la "
+"indikatan dosieron aÅ­ eniri la indikatan dosierujon.  Por iri unu nivelon "
+"supren, elektu la dosierujon «..» je la supro de la listo.\n"
+"\n"
+" La subaj klavkomandoj disponeblas en la dosieresplorilo:\n"
+"\n"
+
+#: src/help.c:271
+msgid ""
+"Browser Search Command Help Text\n"
+"\n"
+" Enter the words or characters you would like to search for, and then press "
+"Enter.  If there is a match for the text you entered, the screen will be "
+"updated to the location of the nearest match for the search string.\n"
+"\n"
+" The previous search string will be shown in brackets after the search "
+"prompt.  Hitting Enter without entering any text will perform the previous "
+"search.\n"
+"\n"
+msgstr ""
+"Helpteksto por serĉi dosieron\n"
+"\n"
+" Enigu la vortojn aŭ signojn kiujn vi volas trovi, kaj premu «Enigo».  Se "
+"ekzistas kongruo por la teksto kiun vi enigis, la ekrano aktuali�os al la "
+"loko de la unue trovata kongruo.\n"
+"\n"
+" La antaŭa serĉendaĵo montri�as inter krampoj post la serĉa invito -- premi "
+"«Enigo» sen enigi iun ajn tekston, kontinuigos tiun antaŭan serĉon.\n"
+"\n"
+
+#: src/help.c:280
+msgid ""
+" The following function keys are available in Browser Search mode:\n"
+"\n"
+msgstr ""
+" La subaj klavkomandoj disponeblas dum «Serĉi dosieron»:\n"
+"\n"
+
+#: src/help.c:284
+msgid ""
+"Browser Go To Directory Help Text\n"
+"\n"
+" Enter the name of the directory you would like to browse to.\n"
+"\n"
+" If tab completion has not been disabled, you can use the Tab key to "
+"(attempt to) automatically complete the directory name.\n"
+"\n"
+" The following function keys are available in Browser Go To Directory mode:\n"
+"\n"
+msgstr ""
+"Helpteksto por iri al dosierujo\n"
+"\n"
+" Enigu la nomon de la dosierujo kiun vi volas viziti.\n"
+"\n"
+" Se kompletigo-per-tabo ne mal�altitas, eblas uzi la taban klavon por "
+"(provi) aÅ­tomate kompletigi la nomon de la dosierujo.\n"
+"\n"
+" La subaj klavkomandoj disponeblas dum «Iri dosierujon»:\n"
+"\n"
+
+#: src/help.c:297
+msgid ""
+"Spell Check Help Text\n"
+"\n"
+" The spell checker checks the spelling of all text in the current file.  "
+"When an unknown word is encountered, it is highlighted and a replacement can "
+"be edited.  It will then prompt to replace every instance of the given "
+"misspelled word in the current file, or, if you have selected text with the "
+"mark, in the selected text.\n"
+"\n"
+" The following function keys are available in Spell Check mode:\n"
+"\n"
+msgstr ""
+"Helpteksto por literuma kontrolo\n"
+"\n"
+" La literumilo kontrolas la ortografion de la tuta teksto en la nuna "
+"dosierbufro.  Kiam nekonata vorto renkonti�as, ĉi tiu emfazi�as kaj eblas "
+"redakti anstataŭigon.  Poste, la literumilo demandas ĉu anstataŭigi la "
+"misliterumatan vorton en la tuta nuna dosiero, aÅ­, se vi markis tekston, en "
+"la markita teksto.\n"
+"\n"
+" La subaj klavkomandoj disponeblas dum «Literuma kontrolo»:\n"
+"\n"
+
+#: src/help.c:312
+msgid ""
+"Execute Command Help Text\n"
+"\n"
+" This mode allows you to insert the output of a command run by the shell "
+"into the current buffer (or a new buffer in multiple file buffer mode).  If "
+"you need another blank buffer, do not enter any command.\n"
+"\n"
+" The following function keys are available in Execute Command mode:\n"
+"\n"
+msgstr ""
+"Helpteksto por ruli komandon\n"
+"\n"
+" Ĉi tiu moduso permesas enmeti eligon de �ela komando en la nuna dosierbufro "
+"(aÅ­ en nova bufro en multbufra moduso).  Se vi bezonas novan, vakan bufron, "
+"ne enigu komandon.\n"
+"\n"
+" La subaj klavkomandoj disponeblas dum «Ruli komandon»:\n"
+"\n"
+
+#: src/help.c:325
+msgid ""
+"Main nano help text\n"
+"\n"
+" The nano editor is designed to emulate the functionality and ease-of-use of "
+"the UW Pico text editor.  There are four main sections of the editor.  The "
+"top line shows the program version, the current filename being edited, and "
+"whether or not the file has been modified.  Next is the main editor window "
+"showing the file being edited.  The status line is the third line from the "
+"bottom and shows important messages.  "
+msgstr ""
+"Ĉefa helpteksto de 'nano'\n"
+"\n"
+" La redaktilo 'nano' estas dizajnita por imiti la funkciojn kaj uzfacilecon "
+"de la 'UW Pico' tekstredaktilo.  La redaktila ekrano konsistas el kvar "
+"sekcioj.  La supra linio montras la programversion, la nomon de la redaktata "
+"dosiero, kaj ĉu la dosiero modifi�is.  Sube sekvas la ĉefa fenestro, kiu "
+"montras la redaktatan dosieron.  La tria linio ekde la fundo estas la stata "
+"linio, kiu montras gravajn mesa�ojn.  "
+
+#: src/help.c:335
+msgid ""
+"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 and can be entered either by using the Control "
+"(Ctrl) key or pressing the Escape (Esc) key twice.  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.  "
+msgstr ""
+"La du fundaj linioj montras la plej uzatajn klavkomandojn de la redaktilo.\n"
+"\n"
+" La notmaniero por klavkomandoj estas tiel: kombinoj kun Stir-klavo "
+"montri�as per \"^\" kaj eblas enigi ilin premtenante klavon \"Ctrl\", aŭ "
+"premante antaŭe dufoje klavon \"Esc\"; kombinoj kun Alt-klavo montri�as per "
+"\"M-\" kaj eblas enigi ilin premtenante klavon \"Alt\" aÅ­ \"Meta\", aÅ­ "
+"premante antaÅ­e unufoje klavon \"Esc\".  "
+
+#: src/help.c:344
+msgid ""
+"Also, pressing Esc twice and then typing a three-digit decimal number from "
+"000 to 255 will enter the character with the corresponding value.  The "
+"following keystrokes are available in the main editor window.  Alternative "
+"keys are shown in parentheses:\n"
+"\n"
+msgstr ""
+"AnkaÅ­, premante dufoje \"Esc\" kaj poste tajpante triciferan dekuman nombron "
+"(de 000 al 255) enmetos la signon de tiu kodo.\n"
+"\n"
+" La subaj klavkomandoj disponeblas en la ĉefa redaktila fenestro; "
+"alternativaj kombinoj montri�as inter krampoj:\n"
+"\n"
+
+#: src/help.c:376 src/help.c:448
+msgid "enable/disable"
+msgstr " (�alto)"
+
+#: src/nano.c:601
+msgid "Key invalid in view mode"
+msgstr "Klavo ne validas en rigarda re�imo"
+
+#: src/nano.c:713
+#, c-format
+msgid ""
+"\n"
+"Buffer written to %s\n"
+msgstr ""
+"\n"
+"Bufro skribi�is al %s\n"
+
+#: src/nano.c:715
+#, c-format
+msgid ""
+"\n"
+"Buffer not written to %s: %s\n"
+msgstr ""
+"\n"
+"Bufro ne skribi�is al %s: %s\n"
+
+#: src/nano.c:718
+#, c-format
+msgid ""
+"\n"
+"Buffer not written: %s\n"
+msgstr ""
+"\n"
+"Bufro ne skribi�is: %s\n"
+
+#: src/nano.c:743
+msgid "Window size is too small for nano...\n"
+msgstr "Fenestro estas tro malgranda por 'nano'...\n"
+
+#: src/nano.c:836
+#, c-format
+msgid ""
+"Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
+"\n"
+msgstr ""
+"Uzmaniero:  nano [OPCIO...] [[+LINIO,KOLUMNO] DOSIERO...]\n"
+"\n"
+
+#: src/nano.c:839
+#, c-format
+msgid "Option\t\tGNU long option\t\tMeaning\n"
+msgstr "Opcio\t\tLonga GNU-a opcio\t  Signifo\n"
+
+#: src/nano.c:841
+#, c-format
+msgid "Option\t\tMeaning\n"
+msgstr "Opcio\t\t  Signifo\n"
+
+#: src/nano.c:844
+msgid "+LINE,COLUMN"
+msgstr "+LINIO,KOLUMNO"
+
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
+msgid "Start at line LINE, column COLUMN"
+msgstr "komenci en ĉi tiu LINIO (kaj KOLUMNO)"
+
+#: src/nano.c:849
+msgid "Enable smart home key"
+msgstr "estigi klavon «Komencen» inteligenta"
+
+#: src/nano.c:850
+msgid "Save backups of existing files"
+msgstr "fari savkopion de ekzistanta dosiero"
+
+#: src/nano.c:851
+msgid "-C <dir>"
+msgstr "-C <ujo>"
+
+#: src/nano.c:851
+msgid "--backupdir=<dir>"
+msgstr "--backupdir=<ujo>"
+
+#: src/nano.c:852
+msgid "Directory for saving unique backup files"
+msgstr "dosierujo por konservi unikajn savkopiojn"
+
+#: src/nano.c:855
+msgid "Use bold instead of reverse video text"
+msgstr "uzi grasan anstataÅ­ negativan tekston"
+
+#: src/nano.c:858
+msgid "Convert typed tabs to spaces"
+msgstr "konverti tajpatajn tabojn al spacoj"
+
+#: src/nano.c:861
+msgid "Enable multiple file buffers"
+msgstr "ebligi uzon de pluraj dosierbufroj"
+
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "uzi riglajn dosierojn (kiel je 'vim')"
+
+#: src/nano.c:869
+msgid "Log & read search/replace string history"
+msgstr "memori historion de serĉitaj signoĉenoj"
+
+#: src/nano.c:873
+msgid "Don't look at nanorc files"
+msgstr "ignori 'nanorc'-dosierojn"
+
+#: src/nano.c:876
+msgid "Fix numeric keypad key confusion problem"
+msgstr "fliki konfuzon je cifera klavareto"
+
+#: src/nano.c:878
+msgid "Don't add newlines to the ends of files"
+msgstr "ne aldoni novlinion al fino de dosiero"
+
+#: src/nano.c:881
+msgid "Don't convert files from DOS/Mac format"
+msgstr "ne konverti el DOS-/Mac-aran�o"
+
+#: src/nano.c:883
+msgid "Use one more line for editing"
+msgstr "uzi unu plian linion por redakti"
+
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "konservi kaj restaÅ­ri kursoran pozicion"
+
+#: src/nano.c:889
+msgid "-Q <str>"
+msgstr "-Q <ĉeno>"
+
+#: src/nano.c:889
+msgid "--quotestr=<str>"
+msgstr "--quotestr=<ĉeno>"
+
+#: src/nano.c:890
+msgid "Quoting string"
+msgstr "signoĉeno de rekonendaj citiloj"
+
+#: src/nano.c:892
+msgid "Restricted mode"
+msgstr "limigita re�imo"
+
+#: src/nano.c:895
+msgid "Scroll by line instead of half-screen"
+msgstr "rulumi po linio anstataÅ­ po duon-ekrano"
+
+#: src/nano.c:897
+msgid "-T <#cols>"
+msgstr "-T <nombro>"
+
+#: src/nano.c:897
+msgid "--tabsize=<#cols>"
+msgstr "--tabsize=<nombro>"
+
+#: src/nano.c:898
+msgid "Set width of a tab to #cols columns"
+msgstr "uzenda lar�o de tabo"
+
+#: src/nano.c:900
+msgid "Do quick statusbar blanking"
+msgstr "vi�i statlinio tuj post sekva klavtu�o"
+
+#: src/nano.c:903
+msgid "Print version information and exit"
+msgstr "montri programversion kaj fini"
+
+#: src/nano.c:906
+msgid "Detect word boundaries more accurately"
+msgstr "detekti vortlimojn pli akurate"
+
+#: src/nano.c:909
+msgid "-Y <str>"
+msgstr "-Y <nomo>"
+
+#: src/nano.c:909
+msgid "--syntax=<str>"
+msgstr "--syntax=<nomo>"
+
+#: src/nano.c:910
+msgid "Syntax definition to use for coloring"
+msgstr "uzenda sintaksdifino por kolorigi"
+
+#: src/nano.c:912
+msgid "Constantly show cursor position"
+msgstr "daÅ­re montri kursoran pozicion"
+
+#: src/nano.c:914
+msgid "Fix Backspace/Delete confusion problem"
+msgstr "fliki konfuzon pri «Retropa�o»/«Forigo»"
+
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "montri ĉi tiun helptekston kaj fini"
+
+#: src/nano.c:918
+msgid "Automatically indent new lines"
+msgstr "aŭtomate de�ovi novajn liniojn"
+
+#: src/nano.c:919
+msgid "Cut from cursor to end of line"
+msgstr "forigi ekde de la kursoro �is liniofino"
+
+#: src/nano.c:922
+msgid "Don't follow symbolic links, overwrite"
+msgstr "ne sekvi simbolajn ligilojn; anstataÅ­igi"
+
+#: src/nano.c:924
+msgid "Enable the use of the mouse"
+msgstr "ebligi uzon de muso"
+
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "ne legi dosieron (nur skribi �in)"
+
+#: src/nano.c:928
+msgid "-o <dir>"
+msgstr "-o <ujo>"
+
+#: src/nano.c:928
+msgid "--operatingdir=<dir>"
+msgstr "--operatingdir=<ujo>"
+
+#: src/nano.c:929
+msgid "Set operating directory"
+msgstr "uzenda kuranta dosierujo"
+
+#: src/nano.c:932
+msgid "Preserve XON (^Q) and XOFF (^S) keys"
+msgstr "ebligi klavojn ^Q (XON) kaj ^S (XOFF)"
+
+#: src/nano.c:935
+msgid "Silently ignore startup issues like rc file errors"
+msgstr "silente ignori lanĉajn problemetojn"
+
+#: src/nano.c:938
+msgid "-r <#cols>"
+msgstr "-r <nombro>"
+
+#: src/nano.c:938
+msgid "--fill=<#cols>"
+msgstr "--fill=<nombro>"
+
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "uzenda lar�o por faldi/rektigi"
+
+#: src/nano.c:942
+msgid "-s <prog>"
+msgstr "-s <programo>"
+
+#: src/nano.c:942
+msgid "--speller=<prog>"
+msgstr "--speller=<programo>"
+
+#: src/nano.c:943
+msgid "Enable alternate speller"
+msgstr "uzenda alternativa literumilo"
+
+#: src/nano.c:946
+msgid "Auto save on exit, don't prompt"
+msgstr "aÅ­tomate konservi je fino, sen demandi"
+
+#: src/nano.c:947
+msgid "View mode (read-only)"
+msgstr "rigarda re�imo (ne eblas redakti)"
+
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "ne faldi longajn liniojn"
+
+#: src/nano.c:951
+msgid "Don't show the two help lines"
+msgstr "ne montri la du helpajn liniojn"
+
+#: src/nano.c:952
+msgid "Enable suspension"
+msgstr "ebligi paÅ­zigo"
+
+#: src/nano.c:954
+msgid "Enable soft line wrapping"
+msgstr "ĉirkaŭfluigi longajn liniojn"
+
+#: src/nano.c:963
+#, c-format
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano, versio %s\n"
+
+#: src/nano.c:966
+#, c-format
+msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
+msgstr " Retpo�to: <nano@nano-editor.org>    TTT: http://www.nano-editor.org/"
+
+#: src/nano.c:967
+#, c-format
+msgid ""
+"\n"
+" Compiled options:"
+msgstr ""
+"\n"
+" Kompilaj opcioj:"
+
+#: src/nano.c:1096
+msgid "Sorry, support for this function has been disabled"
+msgstr "Subteno de ĉi tiu funkcio malebli�is"
+
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Vaka dosiernomo"
+
+#: src/nano.c:1136
+msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+msgstr "Ĉu konservi modifitan bufron? (\"N\" DETRUOS ŜANĜOJN) "
+
+#: src/nano.c:1189
+msgid "Couldn't reopen stdin from keyboard, sorry\n"
+msgstr "Maleblas remalfermi klavaron kiel ĉefenigujon\n"
+
+#: src/nano.c:1213
+#, c-format
+msgid "Reading from stdin, ^C to abort\n"
+msgstr "Legado el ĉefenigujo; ^C por ĉesigi\n"
+
+#: src/nano.c:1279
+msgid "Received SIGHUP or SIGTERM\n"
+msgstr "Ricevitas SIGHUP aÅ­ SIGTERM\n"
+
+#: src/nano.c:1301
+#, c-format
+msgid "Use \"fg\" to return to nano.\n"
+msgstr "Uzu \"fg\" por reveni al 'nano'.\n"
+
+#: src/nano.c:1481
+msgid "enabled"
+msgstr "(en�altitas)"
+
+#: src/nano.c:1481
+msgid "disabled"
+msgstr "(mal�altitas)"
+
+#: src/nano.c:1635 src/winio.c:1283
+msgid "Unknown Command"
+msgstr "Nekonata komando"
+
+#: src/nano.c:1747
+msgid "XON ignored, mumble mumble"
+msgstr "Mmm-mmm, XON ignoratas"
+
+#: src/nano.c:1752
+msgid "XOFF ignored, mumble mumble"
+msgstr "Mmm-mmm, XOFF ignoratas"
+
+#: src/nano.c:2310 src/rcfile.c:1325
+#, c-format
+msgid "Requested tab size \"%s\" is invalid"
+msgstr "Petata tablar�o \"%s\" ne validas"
+
+#: src/nano.c:2374 src/rcfile.c:1250
+#, c-format
+msgid "Requested fill size \"%s\" is invalid"
+msgstr "Petata faldlar�o \"%s\" ne validas"
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Tajpu '%s -h' por vidi liston de eblaj opcioj.\n"
+
+#. TRANSLATORS: For the next three strings, if possible, specify
+#. * the single-byte shortcuts for both your language and English.
+#. * For example, in French: "OoYy" for "Oui".
+#: src/prompt.c:1055
+msgid "Yy"
+msgstr "JjYy"
+
+#: src/prompt.c:1056
+msgid "Nn"
+msgstr "NnNn"
+
+# Tute, All.
+# "Ĉiujn" ne eblas, ĉar plurbitokajn klavojn 'nano' ĉi tie ne komprenas.
+#: src/prompt.c:1057
+msgid "Aa"
+msgstr "TtCcAa"
+
+#: src/prompt.c:1071
+msgid "Yes"
+msgstr "Jes"
+
+#: src/prompt.c:1076
+msgid "All"
+msgstr "Tute"
+
+#: src/prompt.c:1081
+msgid "No"
+msgstr "Ne"
+
+#: src/rcfile.c:137
+#, c-format
+msgid "Error in %s on line %lu: "
+msgstr "Eraro en %s en linio %lu: "
+
+#: src/rcfile.c:196
+#, c-format
+msgid "Argument '%s' has an unterminated \""
+msgstr "Argumento '%s' havas senparan citilon \""
+
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
+msgid "Regex strings must begin and end with a \" character"
+msgstr "Regulesprimaj signoĉenoj devas komenci kaj fini kun citilo \""
+
+#: src/rcfile.c:249 src/search.c:62
+#, c-format
+msgid "Bad regex \"%s\": %s"
+msgstr "Malbonas regulesprimo \"%s\": %s"
+
+#: src/rcfile.c:269
+msgid "Missing syntax name"
+msgstr "Mankas nomo de sintakso"
+
+#: src/rcfile.c:340
+msgid "The \"none\" syntax is reserved"
+msgstr "Sintakso \"none\" estas rezervita"
+
+#: src/rcfile.c:347
+msgid "The \"default\" syntax must take no extensions"
+msgstr "Sintakso \"default\" ne permesas finaĵojn"
+
+#: src/rcfile.c:433
+msgid "Missing key name"
+msgstr "Mankas nomo de klavo"
+
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Klavnomo tro mallongas"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Klavnomo devas komenci kun '^', 'M', aÅ­ 'F'"
+
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "Mankas funkcio al kiu ligi klavon"
+
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr "Mankas menuo (aÅ­ 'all') en kiu ligi/malligi la klavon"
+
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Ĉeno '%s' ne estas nomo de funkcio"
+
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Ĉeno '%s' ne estas nomo de menuo"
+
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Funkcio '%s' ne ekzistas en menuo '%s'"
+
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Ne eblas religi klavĉenon '%s'"
+
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Eraro dum malvolvo de %s: %s"
+
+#: src/rcfile.c:672
+#, c-format
+msgid ""
+"Color \"%s\" not understood.\n"
+"Valid colors are \"green\", \"red\", \"blue\",\n"
+"\"white\", \"yellow\", \"cyan\", \"magenta\" and\n"
+"\"black\", with the optional prefix \"bright\"\n"
+"for foreground colors."
+msgstr ""
+"Koloro '%s' ne rekoni�as.\n"
+"Validaj nomoj de koloroj estas: 'red' (ru�a), 'green' (verda), "
+"'blue' (blua),\n"
+"'magenta' (fuksina), 'yellow' (flava), 'cyan' (cejana), 'black' (nigra) kaj\n"
+"'white' (blanka), kun la ebla prefikso 'bright' (hela) por malfonaj koloroj."
+
+#: src/rcfile.c:694
+msgid "Cannot add a color command without a syntax command"
+msgstr "Ne eblas aldoni komandon 'color' sen komando 'syntax'"
+
+#: src/rcfile.c:699
+msgid "Missing color name"
+msgstr "Mankas nomo de koloro"
+
+#: src/rcfile.c:709 src/rcfile.c:870
+msgid "Missing regex string"
+msgstr "Mankas regulesprima signoĉeno"
+
+#: src/rcfile.c:785
+msgid "\"start=\" requires a corresponding \"end=\""
+msgstr "\"start=\" bezonas paran \"end=\""
+
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Fona koloro \"%s\" ne povas esti hela"
+
+#: src/rcfile.c:865
+msgid "Cannot add a header regex without a syntax command"
+msgstr "Ne eblas aldoni regulesprimon por kaplinio sen komando 'syntax'"
+
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Ne eblas aldoni regulesprimon por magia signoĉeno sen komando 'syntax'"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Mankas nomo de magia signoĉeno"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "Ne eblas aldoni komandon por 'linter' sen komando 'syntax'"
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Mankas programnomo post 'linter'"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "Ne eblas aldoni komandon por 'formatter' sen komando 'syntax'"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Mankas programnomo post 'formatter'"
+
+#: src/rcfile.c:1045
+#, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "Neignorebla eraro: neniu klavo ligita al funkcio \"%s\".  Eliro.\n"
+
+#: src/rcfile.c:1047
+#, c-format
+msgid ""
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
+msgstr "Se necesas, uzu 'nano -I' por �ustigi la agordojn en 'nanorc'.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Ne trovi�as sintakso '%s' por pliampleksigi"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Komando \"%s\" ne permesatas en inkluda dosiero"
+
+#: src/rcfile.c:1149 src/rcfile.c:1350
+#, c-format
+msgid "Syntax \"%s\" has no color commands"
+msgstr "Sintakso \"%s\" ne havas kolorajn komandojn"
+
+#: src/rcfile.c:1171
+#, c-format
+msgid "Command \"%s\" not understood"
+msgstr "Komando \"%s\" ne estas komprenata"
+
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Mankas opcio"
+
+#: src/rcfile.c:1208
+#, c-format
+msgid "Option \"%s\" requires an argument"
+msgstr "Opcio \"%s\" bezonas argumenton"
+
+#: src/rcfile.c:1226
+msgid "Option is not a valid multibyte string"
+msgstr "Opcia argumento ne estas valida plurbitoka signoĉeno"
+
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
+msgid "Non-blank characters required"
+msgstr "Neblankaj signoj bezonatas"
+
+#: src/rcfile.c:1273
+msgid "Two single-column characters required"
+msgstr "Du unukolumnaj signoj bezonatas"
+
+#: src/rcfile.c:1339
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Ne eblas mal�alti opcion \"%s\""
+
+#: src/rcfile.c:1345
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Nekonata opcio \"%s\""
+
+#: src/rcfile.c:1404
+msgid "I can't find my home directory!  Wah!"
+msgstr "Malsukcesis trovi hejman dosierujon.  Ve!"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Premu \"Enter\" por daŭrigi la lanĉon de 'nano'.\n"
+
+#: src/search.c:96
+#, c-format
+msgid "\"%.*s%s\" not found"
+msgstr "\"%.*s%s\" ne trovatas"
+
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [usklecdistinge]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [regulesprime]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [malantaÅ­en]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
+msgid " (to replace) in selection"
+msgstr " (por anstataŭigi) en markaĵo"
+
+#: src/search.c:199
+msgid " (to replace)"
+msgstr " (por anstataÅ­igi)"
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
+msgid "Replace this instance?"
+msgstr "Anstataŭigi ĉi tiun aperaĵon?"
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
+msgid "Replace with"
+msgstr "AnstataÅ­igi per"
+
+#: src/search.c:986
+#, c-format
+msgid "Replaced %lu occurrence"
+msgid_plural "Replaced %lu occurrences"
+msgstr[0] "Anstataŭi�is %lu aperaĵo"
+msgstr[1] "Anstataŭi�is %lu aperaĵoj"
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
+msgid "Enter line number, column number"
+msgstr "Enigu linionumeron, kolumnonumeron"
+
+#: src/search.c:1054
+msgid "Invalid line or column number"
+msgstr "Ne validas numero de linio aÅ­ kolumno"
+
+#: src/search.c:1207
+msgid "Not a bracket"
+msgstr "Ne estas krampo"
+
+#: src/search.c:1274
+msgid "No matching bracket"
+msgstr "Ne ekzistas para krampo"
+
+#: src/text.c:54
+msgid "Mark Set"
+msgstr "Markado en�altitas"
+
+#: src/text.c:58
+msgid "Mark Unset"
+msgstr "Mal�altitas"
+
+#: src/text.c:439
+msgid "Nothing in undo buffer!"
+msgstr "Nenio por malfari!"
+
+#: src/text.c:445 src/text.c:590
+#, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "**Programeraro**: ne eblas kongrui linion %d.  Konservu vian laboron."
+
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
+msgid "text add"
+msgstr "teksta aldono"
+
+#: src/text.c:467 src/text.c:612
+msgid "text delete"
+msgstr "teksta forigo"
+
+#: src/text.c:491 src/text.c:641
+msgid "line join"
+msgstr "linikunigo"
+
+#: src/text.c:505 src/text.c:657
+msgid "text cut"
+msgstr "teksta eltondo"
+
+#: src/text.c:510 src/text.c:661
+msgid "text uncut"
+msgstr "teksta algluo"
+
+#: src/text.c:515 src/text.c:623
+msgid "line break"
+msgstr "linifaldo"
+
+#: src/text.c:528 src/text.c:672
+msgid "text insert"
+msgstr "teksta enmeto"
+
+#: src/text.c:549 src/text.c:665
+msgid "text replace"
+msgstr "teksta anstataÅ­igo"
+
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "**Programeraro**: nekonata tipo.  Konservu vian laboron."
+
+#: src/text.c:561
+#, c-format
+msgid "Undid action (%s)"
+msgstr "Malfari�is ago (%s)"
+
+#: src/text.c:580
+msgid "Nothing to re-do!"
+msgstr "Nenio por refari!"
+
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "**Programeraro**: ne eblas prepari refaron.  Konservu vian laboron."
+
+#: src/text.c:684
+#, c-format
+msgid "Redid action (%s)"
+msgstr "Refari�is ago (%s)"
+
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Malsukcesis krei dukton"
+
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
+msgid "Could not fork"
+msgstr "Malsukcesis krei novan procezon"
+
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
+msgstr "**Programeraro**: ne eblas prepari maltondon.  Konservu vian laboron."
+
+#: src/text.c:1806
+#, c-format
+msgid "Bad quote string %s: %s"
+msgstr "Signoĉeno de citiloj %s ne validas: %s"
+
+#: src/text.c:2207
+msgid "Can now UnJustify!"
+msgstr "Nun eblas malrektigi!"
+
+#: src/text.c:2404
+msgid "Edit a replacement"
+msgstr "Redakti anstataÅ­igon"
+
+#: src/text.c:2492
+msgid "Creating misspelled word list, please wait..."
+msgstr "Kreado de listo de misliterumataj vortoj; bonvolu atendi..."
+
+#: src/text.c:2584 src/text.c:3022
+msgid "Could not get size of pipe buffer"
+msgstr "Ne eblas scii grandon de dukta bufro"
+
+#: src/text.c:2635
+msgid "Error invoking \"spell\""
+msgstr "Eraro dum lanĉo de 'spell'"
+
+#: src/text.c:2638
+msgid "Error invoking \"sort -f\""
+msgstr "Eraro dum lanĉo de 'sort -f'"
+
+#: src/text.c:2641
+msgid "Error invoking \"uniq\""
+msgstr "Eraro dum lanĉo de 'uniq'"
+
+#: src/text.c:2696 src/text.c:2907
+msgid "Finished checking spelling"
+msgstr "Fini�is literuma kontrolo"
+
+#: src/text.c:2759 src/text.c:3340
+#, c-format
+msgid "Error invoking \"%s\""
+msgstr "Eraro dum lanĉo de '%s'"
+
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Ekruli�as literumilo; bonvolu atendi..."
+
+#: src/text.c:2902
+#, c-format
+msgid "Spell checking failed: %s"
+msgstr "Literuma kontrolo malsukcesis: %s"
+
+#: src/text.c:2904
+#, c-format
+msgid "Spell checking failed: %s: %s"
+msgstr "Literuma kontrolo malsukcesis: %s: %s"
+
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Ne defini�is sintaks-kontrolilo por ĉi tiu tipo de dosiero"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Ĉu konservi modifitan bufron antaŭ la kontrolo?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Ekruli�as sintaks-kontrolilo; bonvolu atendi..."
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Ricevi�is nul analizeblaj linioj de la komando «%s»"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+"Ĉi tiu mesa�o estas por malferma dosiero %s; ĉu malfermi �in en nova bufro?"
+
+# La sekvaj mesa�oj komencas en traduko per minusklo,
+# ĉar ili estas komandlinia helpteksto, kaj tiel normalas.
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Ĉi tiu estas la lasta mesa�o"
+
+# La sekvaj mesa�oj komencas en traduko per minusklo,
+# ĉar ili estas komandlinia helpteksto, kaj tiel normalas.
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Ĉi tiu estas la unua mesa�o"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Eraro: neniu 'formatter' defini�is"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Pretas"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Ekruli�as aran�ilo; bonvolu atendi..."
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Pretas la aran�ado"
+
+#: src/text.c:3438
+#, c-format
+msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgstr "%sVortoj: %lu  Linioj: %ld  Literoj: %lu"
+
+#: src/text.c:3439
+msgid "In Selection:  "
+msgstr "En markaĵo:  "
+
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Konforma enigo"
+
+#: src/utils.c:410 src/utils.c:422
+msgid "nano is out of memory!"
+msgstr "Mankas sufiĉa memoro por 'nano'!"
+
+#. TRANSLATORS: This is displayed during the input of a
+#. * six-digit hexadecimal Unicode character code.
+#: src/winio.c:1583
+msgid "Unicode Input"
+msgstr "Enigo de Unikodo"
+
+#: src/winio.c:2142 src/winio.c:2146
+msgid "Modified"
+msgstr "Ŝan�ita"
+
+#: src/winio.c:2143
+msgid "View"
+msgstr "Nur rigardi"
+
+#: src/winio.c:2157
+msgid "DIR:"
+msgstr "DOSIERUJO:"
+
+#: src/winio.c:2164
+msgid "File:"
+msgstr "Dosiero:"
+
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Averto: modifi�as dosiero kiu ne rigli�is; ĉu kontroli dosierujajn permesojn?"
+
+#: src/winio.c:3377
+#, c-format
+msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
+msgstr "linio %ld/%ld (%d%%), kolumno %lu/%lu (%d%%), litero %lu/%lu (%d%%)"
+
+#: src/winio.c:3507
+msgid "The nano text editor"
+msgstr "La tekstredaktilo 'nano'"
+
+#: src/winio.c:3508
+msgid "version"
+msgstr "versio"
+
+#: src/winio.c:3509
+msgid "Brought to you by:"
+msgstr "Prezentita al vi per:"
+
+#: src/winio.c:3510
+msgid "Special thanks to:"
+msgstr "Specialan dankon al:"
+
+#: src/winio.c:3511
+msgid "The Free Software Foundation"
+msgstr "la “Free Software Foundation�"
+
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "la multaj tradukantoj kaj la TP"
+
+#: src/winio.c:3513
+msgid "For ncurses:"
+msgstr "por 'ncurses':"
+
+#: src/winio.c:3514
+msgid "and anyone else we forgot..."
+msgstr "kaj iuj ajn kiujn ni forgesis..."
+
+#: src/winio.c:3515
+msgid "Thank you for using nano!"
+msgstr "Dankon pro via uzo de 'nano'!"
+
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "**Programeraro**: ne eblas kongrui linion %ld.  Konservu vian laboron."
+
+#~ msgid " GNU nano version %s (compiled %s, %s)\n"
+#~ msgstr " GNU nano  versio %s  (kompilita %s, %s)\n"
+
+#~ msgid "line wrap"
+#~ msgstr "linifaldo"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "ebligi �eneralan malfaron [PROVA]"
+
+#~ msgid "Insert File"
+#~ msgstr "Enmeti dosieron"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Iri al la supra pa�o"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Al para krampo"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Faldi longajn liniojn"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Ĉirkaŭfluo de longaj linioj"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(ignoritaj, por kongruo kun 'Pico')"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Mankas menuo (aÅ­ \"all\") al kiu ligi klavon"
+
+#~ msgid "Missing flag"
+#~ msgstr "Mankas flago"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Malsukcesis krei dukton"
+
+#~ msgid "Error writing backup file %s: File owner mismatch"
+#~ msgstr "Eraro dum skribado de savkopio %s: alia posedanto"
diff --git a/po/es.gmo b/po/es.gmo
index 9df945b..5aa6fa6 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 5214250..88dee0e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,1011 +1,1089 @@
-# translation of nano-1.9.99pre0.es.po to Spanish
-# Mensajes en español para GNU nano.
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# $Id: es.po,v 1.127 2002/10/26 19:56:43 jordi Exp $
+# Mensajes en español para GNU nano.
+# Copyright (C) 2015 Free Software Foundation, Inc.
+# This file is distributed under the same license as the nano package.
 #
 # Jordi Mallach <jordi@sindominio.net>, 2000, 2001, 2002.
-# Ricardo Cárdenes <ricardo@conysis.com>, 2002, 2003, 2004, 2005.
+# Ricardo Cárdenes <ricardo@conysis.com>, 2002, 2003, 2004, 2005.
 # Ricardo Javier Cardenes Medina <rcardenes@not.iac.es>, 2006.
+# Jorge González <aloriel@gmail.com>, 2013.
+# Benno Schulenberg <benno@vertaalt.nl>, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano-1.9.99pre0\n"
+"Project-Id-Version: nano-2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2006-08-30 23:38+0100\n"
-"Last-Translator: Ricardo Javier Cardenes Medina <rcardenes@not.iac.es>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-21 09:52+0100\n"
+"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
+"Language-Team: Spanish <es@tp.org.es>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n!=1;\n"
-"X-Generator: KBabel 1.11.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.0\n"
 
-# a un. sv
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
-msgstr "Ir a un Directorio"
+msgstr "Ir a un directorio"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "No se puede ir fuera de %s en modo restringido"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
-msgstr "Error leyendo '%s': %s"
+msgstr "Error leyendo «%s»: %s"
 
-# No se puede. sv
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "No se puede ascender de directorio"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(dir padre)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Buscar"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Mayúsc/Minúsc]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [ExpReg]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Hacia Atrás]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
-msgstr "Búsqueda Recomenzada"
+msgstr "Búsqueda recomenzada"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
-msgstr "Ésta es la única coincidencia"
+msgstr "Ésta es la única coincidencia"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
-msgstr "No hay patrón de búsqueda"
+msgstr "No hay patrón de búsqueda"
+
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"No se pudo determinar mi identidad para el fichero de bloqueo (falló "
+"getpwuid())"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr ""
+"No se pudo determinar el nombre del equipo para el fichero de bloqueo: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Error al escribir el fichero temporal «%s»: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Error al eliminar el fichero de bloqueo «%s»: %s"
 
-# queda raro no usar ni "un" ni "el" antes de fichero. sv
-#: src/files.c:125
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Error al abrir el fichero de bloqueo «%s»: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+"Error al leer el fichero de bloqueo «%s»: se han leído insuficientes datos"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+"Se está editando el fichero «%s» (usuario %s con %s, PID %d); ¿continuar?"
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Error al escribir el fichero de bloqueo: directorio «%s» no existe"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "No se puede insertar un fichero desde fuera de %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
-msgstr "No hay más ficheros abiertos"
+msgstr "No hay más ficheros abiertos"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Se ha cambiado a %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
-msgstr "Nuevo Búfer"
+msgstr "Búfer nuevo"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
-msgstr[0] "%lu línea leída (convertida desde formatos DOS y Mac)"
-msgstr[1] "%lu líneas leídas (convertidas desde formatos DOS y Mac)"
+msgstr[0] "%lu línea leída (convertida desde formatos DOS y Mac)"
+msgstr[1] "%lu líneas leídas (convertidas desde formatos DOS y Mac)"
 
-#: src/files.c:638
-#, fuzzy, c-format
+#: src/files.c:879
+#, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
 "permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
 "permission)"
-msgstr[0] "%lu línea leída (convertida desde formatos DOS y Mac)"
-msgstr[1] "%lu líneas leídas (convertidas desde formatos DOS y Mac)"
+msgstr[0] ""
+"%lu línea leída (convertida desde formatos DOS y Mac; aviso: no hay permiso "
+"de escritura)"
+msgstr[1] ""
+"%lu líneas leídas (convertidas desde formatos DOS y Mac; aviso: no hay "
+"permiso de escritura)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
-msgstr[0] "%lu línea leída (convertida desde formato Mac)"
-msgstr[1] "%lu líneas leídas (convertidas desde formato Mac)"
+msgstr[0] "%lu línea leída (convertida desde formato Mac)"
+msgstr[1] "%lu líneas leídas (convertidas desde formato Mac)"
 
-#: src/files.c:648
-#, fuzzy, c-format
+#: src/files.c:889
+#, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "%lu línea leída (convertida desde formato Mac)"
-msgstr[1] "%lu líneas leídas (convertidas desde formato Mac)"
+msgstr[0] ""
+"%lu línea leída (convertida desde formato Mac; aviso: no hay permiso de "
+"escritura)"
+msgstr[1] ""
+"%lu líneas leídas (convertidas desde formato Mac; aviso: no hay permiso de "
+"escritura)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
-msgstr[0] "%lu línea leída (convertida desde formato DOS)"
-msgstr[1] "%lu líneas leídas (convertidas desde formato DOS)"
+msgstr[0] "%lu línea leída (convertida desde formato DOS)"
+msgstr[1] "%lu líneas leídas (convertidas desde formato DOS)"
 
-#: src/files.c:658
-#, fuzzy, c-format
+#: src/files.c:899
+#, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "%lu línea leída (convertida desde formato DOS)"
-msgstr[1] "%lu líneas leídas (convertidas desde formato DOS)"
+msgstr[0] ""
+"%lu línea leída (convertida desde formato DOS; aviso: no hay permiso de "
+"escritura)"
+msgstr[1] ""
+"%lu líneas leídas (convertidas desde formato DOS; aviso: no hay permiso de "
+"escritura)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
-msgstr[0] "%lu línea leída"
-msgstr[1] "%lu líneas leídas"
+msgstr[0] "%lu línea leída"
+msgstr[1] "%lu líneas leídas"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%lu línea leída (aviso: no hay permiso de escritura)"
+msgstr[1] "%lu líneas leídas (aviso: no hay permiso de escritura)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
-msgstr "Leyendo Fichero"
+msgstr "Leyendo fichero"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
-msgstr "Nuevo Fichero"
+msgstr "Nuevo fichero"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
-msgstr "\"%s\" no encontrado"
+msgstr "No se encontró «%s»"
 
-# Aquí pegaría poner "El fichero...", como en el mensaje siguiente. sv
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+# Aquí pegaría poner "El fichero...", como en el mensaje siguiente. sv
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
-msgstr "El fichero \"%s\" es un directorio"
+msgstr "«%s» es un directorio"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
-msgstr "El fichero \"%s\" es un dispositivo"
+msgstr "«%s» es un fichero de dispositivo"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
-msgstr "Orden a ejecutar en el nuevo búfer [desde %s] "
+msgstr "Comando que ejecutar en el nuevo búfer [desde %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
-msgstr "Orden a ejecutar [desde %s]"
+msgstr "Comando que ejecutar [desde %s]"
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
-msgstr "Fichero a insertar en el nuevo búfer [desde %s] "
+msgstr "Fichero que insertar en el nuevo búfer [desde %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
-msgstr "Fichero a insertar [desde %s] "
+msgstr "Fichero que insertar [desde %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
-msgstr "Tecla ilegal en modo no-multibuffer"
+msgstr "Tecla ilegal en modo no-multibúfer"
+
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"Fallo al escribir el fichero de respaldo, ¿continuar guardándolo? (responda "
+"N si no está seguro)"
 
-#: src/files.c:1486
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "No se puede escribir fuera de %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
-"No puedo añadir al principio o final a un enlace simbólico con --nofollow "
+"No se pudo añadir al principio o final a un enlace simbólico con --nofollow "
 "activo"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
-#, fuzzy, c-format
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
+#, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Error escribiendo en fichero temporal: %s"
+msgstr "Error al escribir el fichero de respaldo «%s»: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
-msgstr "Demasiados ficheros de respaldo?"
+msgstr "¿Demasiados ficheros de respaldo?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
-msgstr "Error guardando '%s': %s"
+msgstr "Error al escirbir «%s»: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr "Error escribiendo en fichero temporal: %s"
+msgstr "Error al escribir en el fichero temporal: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
-msgstr[0] "Escrita línea %lu"
-msgstr[1] "%lu líneas escritas"
+msgstr[0] "%lu línea escrita"
+msgstr[1] "%lu líneas escritas"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Respaldo]"
 
-# Como antes, me suena raro que antes de Fichero no haya "un" o "el". sv
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
-msgstr "Anteponer selección al fichero"
+msgstr "Anteponer selección al fichero"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "Añadir selección al fichero"
+msgstr "Añadir selección al fichero"
 
-# a el -> al. jm
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
-msgstr "Escribir selección al fichero"
+msgstr "Escribir selección al fichero"
 
-# de -> del. sv
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Nombre del fichero al que anteponer"
 
-# de -> del. sv
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
-msgstr "Nombre del fichero al que añadir"
+msgstr "Nombre del fichero al que añadir"
 
-# ídem. sv
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Nombre del fichero a escribir"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
-msgstr "El fichero existe, ¿ SOBREESCRIBIR ?"
+msgstr "El fichero existe, ¿SOBREESCRIBIR?"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
-msgstr "¿ Guardar el fichero con un NOMBRE DIFERENTE ? "
+msgstr "¿Guardar el fichero con un NOMBRE DIFERENTE?"
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
+"Se ha modificado el fichero desde que lo abrió, ¿continuar guardándolo?"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
-msgstr "(más)"
+msgstr "(más)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Pulsa intro para continuar iniciando nano\n"
+"Pulse Intro para continuar\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Reemplazar"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"No se puede crear el directorio «%s»: %s\n"
+"Se necesita para guardar/cargar el histórico de búsquedas o la posición del "
+"cursor.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "No sustituir"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"La ruta «%s» no es un directorio y debe serlo.\n"
+"Nano no podrá cargar ni guardar el histórico de búsquedas ni las posiciones "
+"del cursor.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "May/Min"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Se detectó un antiguo fichero de histórico de nano (%s) que se intentó "
+"mover\n"
+"a la ubicación preferida (%s) pero se encontró un error: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Hacia Atrás"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Se detectó un antiguo fichero de histórico de nano (%s) que se movió\n"
+"a la ubicación preferida (%s).\n"
+"(Consulte las P+F de nano acerca de este cambio.)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "ExpReg"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Salir"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "HistóricoPrev"
+#: src/global.c:478
+msgid "Close"
+msgstr "Cerrar"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "HistSig"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Pegar texto"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Ir a texto"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Desjustificar"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
-msgstr "DóndeEstá Sig"
+msgstr "Siguiente"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Primer Fich"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Último Fich"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "A ficheros"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Formato DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Formato Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Añadir"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Anteponer"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Respaldar fich"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Ejecutar orden"
-
-# a un. sv
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Ir a un dir"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Ver ayuda"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Salir"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Buscar"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Pág Ant"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Pág Sig"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Prim. lín."
+#: src/global.c:493
+msgid "Replace"
+msgstr "Reemplazar"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Última línea"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Ir a línea"
 
-#: src/global.c:487
-#, fuzzy
-msgid "Suspend"
-msgstr "Suspensión"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Línea anterior"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Ini de Pár"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Línea siguiente"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Fin de Pár"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Leer fichero"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "JustifTodo"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
-msgstr "Refrescar"
-
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Inserte fichero"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Ir a Línea"
-
-#: src/global.c:500
-msgid "Justify the current paragraph"
-msgstr "Justificar el párrafo actual"
+msgstr "Actualizar"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:507
+msgid "Justify the current paragraph"
+msgstr "Justificar el párrafo actual"
+
+#: src/global.c:509
 msgid "Cancel the current function"
-msgstr "Cancelar la función actual"
+msgstr "Cancelar la función actual"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Mostrar esta ayuda"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Cerrar el fichero mostrado / Salir de nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Salir de nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Escribir el fichero actual a disco"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Insertar otro fichero en el actual"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "Buscar una cadena o expresión regular"
+msgstr "Buscar una cadena o expresión regular"
 
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Moverse a la página anterior"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Buscar una cadena"
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Moverse a la página siguiente"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Ir a la pantalla anterior"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Ir a la siguiente pantalla"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "Cortar la línea actual y guardarla en el cutbuffer"
+msgstr "Cortar la línea actual y guardarla en el cutbuffer"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "Pegar el cutbuffer en la línea actual"
+msgstr "Pegar el cutbuffer en la línea actual"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
-msgstr "Mostrar la posición del cursor"
+msgstr "Mostrar la posición del cursor"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
-msgstr "Invocar el corrector ortográfico (si está disponible)"
+msgstr "Invocar el corrector ortográfico (si está disponible)"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "Reemplazar una cadena o expresión regular"
+msgstr "Reemplazar una cadena o expresión regular"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
-msgstr "Ir a una línea y columna"
+msgstr "Ir a una línea y columna"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Marcar texto en la posición actual del cursor"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Marcar texto desde la posición actual del cursor"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr "Repetir la última búsqueda"
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Repetir la última búsqueda"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Copiar la línea actual y guardarla en el cutbuffer"
+msgstr "Copiar la línea actual y guardarla en el cutbuffer"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
-msgstr "Sangrar la línea actual"
+msgstr "Sangrar la línea actual"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "Quitar sangrado a la línea actual"
+msgstr "Quitar sangrado a la línea actual"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr ""
+msgstr "Deshacer la última operación"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "Rehacer la última operación deshecha"
 
-#: src/global.c:543
-#, fuzzy
+#: src/global.c:550
 msgid "Go forward one character"
-msgstr "Moverse hacia adelante un carácter"
+msgstr "Ir hacia adelante un carácter"
 
-#: src/global.c:544
-#, fuzzy
+#: src/global.c:551
 msgid "Go back one character"
-msgstr "Moverse hacia atrás un carácter"
+msgstr "Ir hacia atrás un carácter"
 
-#: src/global.c:546
-#, fuzzy
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "Moverse hacia adelante una palabra"
+msgstr "Ir hacia adelante una palabra"
 
-#: src/global.c:547
-#, fuzzy
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "Moverse una palabra atrás"
+msgstr "Ir hacia atrás una palabra"
 
-#: src/global.c:549
-#, fuzzy
+#: src/global.c:556
 msgid "Go to previous line"
-msgstr "Moverse a la línea anterior"
+msgstr "Ir a la línea anterior"
 
-#: src/global.c:550
-#, fuzzy
+#: src/global.c:557
 msgid "Go to next line"
-msgstr "Moverse a la línea siguiente"
+msgstr "Ir a la siguiente línea"
 
-#: src/global.c:551
-#, fuzzy
+#: src/global.c:558
 msgid "Go to beginning of current line"
-msgstr "Moverse al principio de la línea actual"
+msgstr "Ir al principio de la línea actual"
 
-#: src/global.c:552
-#, fuzzy
+#: src/global.c:559
 msgid "Go to end of current line"
-msgstr "Moverse al final de la línea actual"
+msgstr "Ir al final de la línea actual"
 
-#: src/global.c:555
-#, fuzzy
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "Moverse al principio del párrafo actual"
+msgstr "Ir al principio del párrafo; después al del párrafo anterior"
 
-#: src/global.c:557
-#, fuzzy
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Moverse al final del párrafo actual"
+msgstr "Ir al final del párrafo; después al del párrafo siguiente"
 
-#: src/global.c:560
-#, fuzzy
+#: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "Mover a la primera línea del fichero"
+msgstr "Ir a la primera línea del fichero"
 
-#: src/global.c:562
-#, fuzzy
+#: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "Mover a la última línea del fichero"
+msgstr "Ir a la última línea del fichero"
 
-#: src/global.c:564
-#, fuzzy
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "Mover a la llave correspondiente"
+msgstr "Ir a la llave correspondiente"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr "Desplazar el texto una línea arriba sin mover el cursor"
+msgstr "Desplazar el texto una línea arriba sin mover el cursor"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr "Desplazar el texto una línea abajo sin mover el cursor"
+msgstr "Desplazar el texto una línea abajo sin mover el cursor"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
-msgstr "Cambiar al búfer de fichero anterior"
+msgstr "Cambiar al búfer de fichero anterior"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
-msgstr "Cambiar al siguiente búfer de fichero"
+msgstr "Cambiar al siguiente búfer de fichero"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr "Insertar la próxima pulsación literalmente"
+msgstr "Insertar la próxima pulsación literalmente"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "Insertar un carácter de tabulación en la posición del cursor"
+msgstr "Insertar un carácter de tabulación en la posición del cursor"
 
 #: src/global.c:581
 msgid "Insert a newline at the cursor position"
-msgstr "Insertar un retorno de carro en la posición del cursor"
+msgstr "Insertar un retorno de carro en la posición del cursor"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
-msgstr "Borrar el carácter bajo el cursor"
+msgstr "Borrar el carácter bajo el cursor"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
-msgstr "Borrar el carácter a la izquierda del cursor"
+msgstr "Borrar el carácter a la izquierda del cursor"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Cortar desde el cursor hasta el final de línea"
+msgstr "Cortar desde el cursor hasta el final de línea"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Justificar el fichero completo"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
-msgstr "Contar el número de palabras, líneas y caracteres"
+msgstr "Contar el número de palabras, líneas y caracteres"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Redibujar la pantalla actual"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "Suspender el editor (si suspender está activado)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr "Cambiar la importancia de mayús./minús. en la búsqueda"
+msgstr "Cambiar la importancia de mayús./minús. en la búsqueda"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "Cambiar la dirección de búsqueda"
+msgstr "Cambiar la dirección de búsqueda"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Cambiar el uso de expresiones regulares"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "Recupera la cadena previa de búsqueda/reemplazo"
+msgstr "Recuperar la cadena previa de búsqueda/reemplazo"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "Recupera la siguiente cadena de búsqueda/reemplazo"
+msgstr "Recuperar la siguiente cadena de búsqueda/reemplazo"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Ir al navegador de ficheros"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "Conmuta el uso de formato DOS"
+msgstr "Conmutar el uso de formato DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "Conmuta el uso de formato Mac"
+msgstr "Conmutar el uso de formato Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
-msgstr "Conmuta añadir texto"
+msgstr "Conmutar el añadir texto"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr "Conmuta prefijar texto"
+msgstr "Conmutar el prefijar texto"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
-msgstr "Conmuta creación de ficheros de respaldo"
+msgstr "Conmutar la creación de ficheros de respaldo"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
-msgstr "Ejecutar orden externa"
+msgstr "Ejecutar una orden externa"
 
-# Ídem de ídem. Te dejo que revises los que siguen.
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "Conmuta el uso de nuevo búfer"
+msgstr "Conmutar el uso de nuevo búfer"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Salir del navegador de ficheros"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Ir al primer fichero de la lista"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
-msgstr "Ir al último fichero de la lista"
+msgstr "Ir al último fichero de la lista"
 
-#: src/global.c:641
-#, fuzzy
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "Ir al fichero anterior en la lista"
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "Ir al último fichero de la lista"
+msgstr "Ir al siguiente fichero en la lista"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Ir a un directorio"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Invocar el corrector de sintaxis (si está disponible)"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Ir al mensaje anterior del corrector"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Ir al siguiente mensaje del corrector"
 
 #: src/global.c:642
-#, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Ir al primer fichero de la lista"
+msgid "Invoke formatter, if available"
+msgstr "Invocar el arreglador (si está disponible)"
 
-# a un. sv
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Ir a un Directorio"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Ver ayuda"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Cerrar"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Cancelar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Guardar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "A un directorio"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Cortar texto"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Justificar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Leer Fich"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Ortografía"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "CortarTxt"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Corrector"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Desjustificar"
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Arreglador"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "PegarTxt"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Mayús/minús"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Exp. regular"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Hacia atrás"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "No sustituir"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
-msgstr "Pos actual"
+msgstr "Posición"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Ortografía"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Página ant."
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Página sig."
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Primera línea"
 
-#: src/global.c:771
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Última línea"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "A llave"
+
+#: src/global.c:797
 msgid "Mark Text"
-msgstr "MarcarTxt"
+msgstr "Marcar texto"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
-msgstr "CopiarTxt"
+msgstr "Copiar texto"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
-msgstr "SangrarTxt"
+msgstr "Sangrar texto"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "DesangrarTxt"
+msgstr "Desangrar texto"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
-msgstr ""
+msgstr "Deshacer"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
-msgstr ""
+msgstr "Rehacer"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Adelante"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
-msgstr "Atrás"
+msgstr "Atrás"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Palabra siguiente"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Adelante"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Palabra anterior"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Línea Ant"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Línea siguiente"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Palabra siguiente"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Inicio"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Fin"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Buscar la otra llave"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Ini de pár."
 
-#: src/global.c:848
-msgid "Scroll Up"
-msgstr "DesplArriba"
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Fin de pár."
 
 #: src/global.c:851
+msgid "Scroll Up"
+msgstr "Despl arriba"
+
+#: src/global.c:853
 msgid "Scroll Down"
-msgstr "DesplAbajo"
+msgstr "Despl abajo"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "Fichero anterior"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Fichero siguiente"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+msgid "Verbatim"
 msgstr "Entrada literal"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
 # Intro (?). sv
 # O introducir, no encuentro el contexto...
-# Ok, es Intro (pero no se usa, parece, reportaré el bug) jm
-#: src/global.c:870
+# Ok, es Intro (pero no se usa, parece, reportaré el bug) jm
+#: src/global.c:874
 msgid "Enter"
 msgstr "Intro"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Suprimir"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Borrar"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "CortarHastaFinal"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
-msgstr "Contar Palabras"
+msgstr "Contar palabras"
+
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Suspender"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Previo histórico"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Sig. histórico"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Ir a texto"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Formato DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Formato Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Añadir"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Anteponer"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Respaldar fichero"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Ejecutar orden"
 
-#: src/global.c:1367
+#: src/global.c:961
+msgid "To Files"
+msgstr "A ficheros"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Primer fichero"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Último fichero"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Mensaje anterior"
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "Mensaje siguiente"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
-msgstr "Modo ayuda"
+msgstr "Modo de ayuda"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
-msgstr "Posición del cursor constante"
+msgstr "Muestra constante de la posición del cursor"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
-msgstr "Uso de una línea más para editar"
+msgstr "Uso de una línea más para editar"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Desplazamiento suave"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Suave ajuste de líneas largas"
+
+#: src/global.c:1237
 msgid "Whitespace display"
-msgstr "Mostrar blancos"
+msgstr "Muestra de blancos"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Coloreado de sintaxis"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
-msgstr "Tecla 'smart home'"
+msgstr "Sagaz tecla «Home»"
 
-# En español se dice sangrar. Es un término tipográfico que se usa
-# desde hace mucho, pero que la gente olvida por influencia del inglés. sv
-#: src/global.c:1381
+# En español se dice sangrar. Es un término tipográfico que se usa
+# desde hace mucho, pero que la gente olvida por influencia del inglés. sv
+#: src/global.c:1243
 msgid "Auto indent"
-msgstr "Auto sangrar"
+msgstr "Auto-sangrado"
 
-# de la línea. sv
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
-msgstr "Cortar hasta el final"
+msgstr "Cortado desde el cursor hasta el final de línea"
 
-# Uf. A ver si alguien encuentra una palabra para decir eso... sv
-# Esto creo que ya lo pregunté en la lista, a parte de en muchos otros
-# sitios y nadie encontró nada convincente. jm
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Ajuste de líneas largas"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Rígido ajuste de líneas largas"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
-msgstr "Conversión de las pulsaciones de tabulador a espacios"
+msgstr "Conversión de pulsaciones de tabulador a espacios"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
-msgstr "Respaldar ficheros"
+msgstr "Respaldado de ficheros"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
-msgstr "Múltiples búfers de ficheros"
+msgstr "Múltiples búferes de fichero"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
-msgstr "Soporte para ratón"
+msgstr "Soporte para ratón"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "No convertir desde el formato DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
-msgstr "Suspensión"
+msgstr "Suspensión"
 
-# Uf. A ver si alguien encuentra una palabra para decir eso... sv
-# Esto creo que ya lo pregunté en la lista, a parte de en muchos otros
-# sitios y nadie encontró nada convincente. jm
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Ajuste de líneas largas"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1017,17 +1095,17 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"Texto de ayuda de la orden Búsqueda\n"
+"Texto de ayuda de la orden Búsqueda\n"
 "\n"
-" Introduzca las palabras o caracteres que quiera buscar y pulse intro. Si "
-"hay una coincidencia para el texto introducido, la pantalla se actualizará "
-"en el lugar donde esté la coincidencia más cercana de la cadena buscada.\n"
+" Introduzca las palabras o caracteres que quiera buscar y pulse Intro. Si "
+"hay una coincidencia para el texto introducido, la pantalla se actualizará "
+"en el lugar donde esté la coincidencia más cercana de la cadena buscada.\n"
 "\n"
-" Se mostrará la cadena de texto de la búsqueda anterior entre corchetes tras "
-"el indicador. Si pulsa intro sin introducir texto repetirá la última "
-"búsqueda."
+" Se mostrará la cadena de texto de la búsqueda anterior entre corchetes tras "
+"el indicador. Si pulsa Intro sin introducir texto repetirá la última "
+"búsqueda."
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1035,13 +1113,13 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
-"Si ha escogido texto con el marcador y luego hace búsqueda con reemplazo, "
-"sólo se modificarán las coincidencias dentro del texto seleccionado.\n"
+"Si ha escogido texto con el marcador y luego hace búsqueda con reemplazo, "
+"sólo se modificarán las coincidencias dentro del texto seleccionado.\n"
 "\n"
-" Dispone de las siguientes teclas de función en modo Búsqueda:\n"
+" Dispone de las siguientes teclas de función en modo Búsqueda:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1052,16 +1130,16 @@ msgid ""
 " The following function keys are available in Go To Line mode:\n"
 "\n"
 msgstr ""
-"Texto de ayuda de Ir a Línea\n"
+"Texto de ayuda de Ir a Línea\n"
 "\n"
-" Introduce el número de la línea a la que quieres ir y pulsa Intro. Si hay "
-"menos líneas de texto que el número que has introducido, el cursor se moverá "
-"a la última línea del fichero.\n"
+" Introduce el número de la línea a la que quieres ir y pulsa Intro. Si hay "
+"menos líneas de texto que el número que has introducido, el cursor se moverá "
+"a la última línea del fichero.\n"
 "\n"
-" Se dispone de las siguientes teclas de función en el modo Ir a Línea:\n"
+" Se dispone de las siguientes teclas de función en el modo Ir a Línea:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1075,15 +1153,15 @@ msgid ""
 msgstr ""
 "Texto de ayuda de Insertar Fichero\n"
 "\n"
-" Escriba el nombre del fichero a insertar en el búfer, en la posición actual "
+" Escriba el nombre del fichero a insertar en el búfer, en la posición actual "
 "del cursor.\n"
 "\n"
-" Si ha compilado nano con soporte para múltiples búfer y habilita los búfer "
-"múltiples con las opciones -F o --multibuffer, con la combinación Meta-F o "
-"usando un fichero nanorc, el fichero será insertado en un búfer diferente "
-"(use Meta-< y > para cambiar de búfers de fichero)."
+" Si ha compilado nano con soporte para múltiples búfer y habilita los búfer "
+"múltiples con las opciones -F o --multibuffer, con la combinación Meta-F o "
+"usando un fichero nanorc, el fichero será insertado en un búfer diferente "
+"(use Meta-< y > para cambiar de búfers de fichero)."
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1091,13 +1169,13 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
-"Si necesitase otro búfer vacío, no escriba ningún nombre de fichero o en su "
+"Si necesitase otro búfer vacío, no escriba ningún nombre de fichero o en su "
 "lugar el nombre de un fichero que no exista y pulse Intro.\n"
 "\n"
-" Dispone de las siguientes teclas de función en el modo Insertar Fichero:\n"
+" Dispone de las siguientes teclas de función en el modo Insertar Fichero:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1112,20 +1190,20 @@ msgid ""
 " The following function keys are available in Write File mode:\n"
 "\n"
 msgstr ""
-"Texto de ayuda de Guardar Fichero\n"
+"Texto de ayuda de Guardar fichero\n"
 "\n"
-" Escriba el nombre con el que quiera guardar el fichero actual y pulse intro "
-"para salvarlo.\n"
+"Escriba el nombre con el que quiera guardar el fichero actual y pulse Intro "
+"para guardarlo.\n"
 "\n"
-" Si ha escogido texto marcándolo, se le preguntará si quiere guardar sólo la "
-"porción marcada a un fichero diferente. Para reducir la posibilidad de "
-"sobreescribir el fichero actual con sólo una parte, el nombre del fichero "
+"Si ha escogido texto marcándolo, se le preguntará si quiere guardar sólo la "
+"porción marcada a un fichero diferente. Para reducir la posibilidad de "
+"sobreescribir el fichero actual con sólo una parte, el nombre del fichero "
 "actual no es el predeterminado en este modo.\n"
 "\n"
-" Dispone de las siguientes teclas de función en el modo Guardar Fichero:\n"
+"Dispone de las siguientes teclas de función en el modo Guardar fichero:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1138,20 +1216,19 @@ msgid ""
 " The following function keys are available in the file browser:\n"
 "\n"
 msgstr ""
-"Texto de ayuda del Navegador de Ficheros\n"
+"Texto de ayuda del Navegador de ficheros\n"
 "\n"
-" El navegador de ficheros se utiliza para navegar visualmente la estructura "
+"El navegador de ficheros se utiliza para navegar visualmente la estructura "
 "del directorio para seleccionar un fichero para lectura o escritura. Puedes "
-"usar los cursores o Re/Av Pág para navegar por los ficheros y S o Intro para "
+"usar los cursores o Re/Av Pág para navegar por los ficheros y S o Intro para "
 "elegir el fichero seleccionado o entrar en el directorio solicitado. Para "
 "subir un nivel, selecciona el directorio \"..\" en la parte superior de la "
 "lista de ficheros.\n"
 "\n"
-" Se dispone de las siguientes teclas de función en el navegador de "
-"ficheros:\n"
+"Se dispone de las siguientes teclas de función en el navegador de ficheros:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1164,26 +1241,26 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"Texto de ayuda de la orden Búsqueda\n"
+"Texto de ayuda de la orden Búsqueda\n"
 "\n"
-" Introduzca las palabras o caracteres que quiera buscar y pulse intro.  Si "
-"hay una coincidencia para el texto introducido, la pantalla se actualizará "
-"en el lugar donde esté la coincidencia más cercana de la cadena buscada.\n"
+" Introduzca las palabras o caracteres que quiera buscar y pulse Intro. Si "
+"hay una coincidencia para el texto introducido, la pantalla se actualizará "
+"en el lugar donde esté la coincidencia más cercana de la cadena buscada.\n"
 "\n"
-" Se mostrará entre corchetes la cadena de texto de la búsqueda anterior tras "
-"el indicador. Si pulsa intro sin introducir texto repetirá la última "
-"búsqueda.\n"
+" Se mostrará entre corchetes la cadena de texto de la búsqueda anterior tras "
+"el indicador. Si pulsa Intro sin introducir texto repetirá la última "
+"búsqueda.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-" Se dispone de las siguientes teclas de función en el modo Búsqueda:\n"
+" Se dispone de las siguientes teclas de función en el modo Búsqueda:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1199,14 +1276,14 @@ msgstr ""
 "\n"
 " Introduzca el nombre del directorio por el que quiera navegar.\n"
 "\n"
-" Si el completado con el tabulador no está inactivo, puede usar la tecla TAB "
-"para (intentar) completar automáticamente el nombre del directorio.\n"
+" Si el completado con el tabulador no está inactivo, puede usar la tecla TAB "
+"para (intentar) completar automáticamente el nombre del directorio.\n"
 "\n"
-" Se dispone de las siguientes teclas de función en el modo Ir a Directorio "
+" Se dispone de las siguientes teclas de función en el modo Ir a Directorio "
 "del Navegador:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1219,20 +1296,19 @@ msgid ""
 " The following function keys are available in Spell Check mode:\n"
 "\n"
 msgstr ""
-"Texto de ayuda del Corrector de ortografía\n"
+"Texto de ayuda del Corrector de ortografía\n"
 "\n"
-" El Corrector de ortografía comprueba la ortografía de todo el texto en el "
+" El Corrector de ortografía comprueba la ortografía de todo el texto en el "
 "fichero actual. Cuando se encuentra una palabra desconocida, queda marcada y "
-"se puede proporcionar un sustituto. Después preguntará si se quiere "
+"se puede proporcionar un sustituto. Después preguntará si se quiere "
 "reemplazar todas las coincidencias de esa palabra mal escrita en el fichero "
-"actual o, si ha seleccionado un texto, dentro de la selecció.\n"
+"actual o, si ha seleccionado un texto, dentro de la selecció.\n"
 "\n"
 " Dispone de las siguientes funciones adicionales en el modo Corrector de "
-"ortografía:\n"
+"ortografía:\n"
 "\n"
 
-#: src/help.c:343
-#, fuzzy
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1243,15 +1319,16 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-"Texto de ayuda de Orden Externa\n"
+"Texto de ayuda de ejecución de comandos\n"
 "\n"
-" Este modo le permite insertar en el búfer actual (o en uno nuevo en modo "
-"multibúfer) la salida de una orden ejecutada por el intérprete. Si necesita "
-"un búfer vacío, no introduzca ninguna orden.\n"
+"Este modo le permite insertar la salida del comando ejecutado en una consola "
+"en el búfer actual (o en búfer nuevo en modo multibúfer). Si necesita otro "
+"búfer vacío no introduzca ningún comando.\n"
+"\n"
+"Las siguientes teclas de función están disponibles en este modo:\n"
 "\n"
-" En este modo dispone de las siguientes funciones adicionales:\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1264,15 +1341,15 @@ msgid ""
 msgstr ""
 "Texto de ayuda principal de nano\n"
 "\n"
-" El editor nano está diseñado para emular la funcionalidad y sencillez de "
+" El editor nano está diseñado para emular la funcionalidad y sencillez de "
 "uso del editor de texto UW Pico. El editor cuenta con cuatro secciones "
-"principales. La línea superior muestra la versión del programa, el nombre "
-"del fichero que se está editando, y si ha sido modificado o no. La siguiente "
-"es la ventana principal del editor que muestra lo que está siendo editado. "
-"La línea de estado es la tercera empezando por abajo y muestra mensajes "
+"principales. La línea superior muestra la versión del programa, el nombre "
+"del fichero que se está editando, y si ha sido modificado o no. La siguiente "
+"es la ventana principal del editor que muestra lo que está siendo editado. "
+"La línea de estado es la tercera empezando por abajo y muestra mensajes "
 "importantes. "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1282,17 +1359,17 @@ msgid ""
 "notated with the Meta (M-) symbol and can be entered using either the Esc, "
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
-"Las dos últimas líneas muestran los atajos usados más a menudo en el "
+"Las dos últimas líneas muestran los atajos usados más a menudo en el "
 "editor \n"
 "\n"
-" La notación para los atajos es como sigue: las secuencias con la tecla "
+" La notación para los atajos es como sigue: las secuencias con la tecla "
 "Control se indican con un circunflejo (^) y se pueden introducir tanto "
 "pulsando la tecla de Control (Ctrl) como pulsando dos veces la de Escape "
-"(Esc). Las secuencias con la tecla de Escape se indican con el símbolo Meta "
+"(Esc). Las secuencias con la tecla de Escape se indican con el símbolo Meta "
 "(M-) y se pueden introducir con las teclas Esc, Alt o Meta, dependiendo de "
-"su configuración de teclado. "
+"su configuración de teclado. "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1300,21 +1377,21 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
-"Además, si pulsa dos veces Esc y escribe después un código decimal de tres "
-"dígitos entre 000 y 255, introducirá el carácter de valor correspondiente. "
+"Además, si pulsa dos veces Esc y escribe después un código decimal de tres "
+"dígitos entre 000 y 255, introducirá el carácter de valor correspondiente. "
 "Dispone de las siguientes pulsaciones en la ventana principal del editor. "
-"Las pulsaciones alternativas se muestran entre paréntesis:\n"
+"Las pulsaciones alternativas se muestran entre paréntesis:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
-msgstr "habilitar/deshabilitar"
+msgstr " activar/desactivar"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
-msgstr "Tecla ilegal en modo vistualización"
+msgstr "Tecla no es válida en modo de visualización"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1323,286 +1400,293 @@ msgstr ""
 "\n"
 "Buffer escrito en %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 "\n"
-"No se ha escrito el búfer a %s: %s\n"
+"No se ha escrito el búfer a %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 "\n"
-"No se ha escrito el búfer: %s\n"
+"No se ha escrito el búfer: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
-msgstr "La ventana es demasiado pequeña para Nano...\n"
+msgstr "La ventana es demasiado pequeña para nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
-"Uso: nano [OPCIONES] [[+LÍNEA,COLUMNA] FICHERO]...\n"
+"Uso: nano [OPCIONES] [[+L�NEA,COLUMNA] FICHERO]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr "Opción\t\tOpción larga\t\tSignificado\n"
+msgstr "Opción\t\tOpción larga\t\tSignificado\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
-msgstr "Opción\t\tSignificado\n"
-
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Mostrar este mensaje"
+msgstr "Opción\t\tSignificado\n"
 
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
-msgstr "+LÍNEA,COLUMNA"
+msgstr "+L�NEA,COLUMNA"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
-msgstr "Comenzar en la línea número LÍNEA, y columna COLUMNA"
+msgstr "Comenzar en la línea número L�NEA, y columna COLUMNA"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
-msgstr "Habilitar tecla 'smart home'"
+msgstr "Habilitar una sagaz tecla «Home»"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Guardar respaldo de los ficheros existentes"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:831
+# The "unique" is unnecessary and confusing.  --  benno
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
-msgstr "Directorio donde guardar ficheros de respaldo únicos"
+msgstr "Directorio donde guardar ficheros de respaldo"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Usar negrita en lugar de texto inverso"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Convertir tabulaciones a espacios al escribir"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
-msgstr "Habilitar múltiples búfer de ficheros"
+msgstr "Habilitar múltiples búferes de fichero"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Usar ficheros de bloqueo (estilo vim)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "Registrar y leer el histórico de cadenas de búsqueda/reemplazo"
+msgstr "Registrar y leer el histórico de cadenas de búsqueda/reemplazo"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "No leer los ficheros nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
-msgstr "Arreglar el problema de confusión del teclado numérico"
+msgstr "Arreglar el problema de confusión del teclado numérico"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
-msgstr "No añadir avances de línea al final de los ficheros"
+msgstr "No añadir avances de línea al final de los ficheros"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "No convertir los ficheros desde el formato DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
-msgstr "Usar una línea más para edición"
+msgstr "Usar una línea más para edición"
 
-#: src/nano.c:860
+# The original is poor.  --  benno
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Guardar y restaurar la posición del cursor"
+
+#: src/nano.c:889
 msgid "-Q <str>"
-msgstr "-Q <cad>"
+msgstr "-Q <cadena>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
-msgstr "--quotestr=<cad>"
+msgstr "--quotestr=<cadena>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Marcador de cita"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Modo restringido"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "Desplazarse línea a línea en lugar de media pantalla"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
-msgstr "-T <núm>"
+msgstr "-T <número>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=<núm>"
+msgstr "--tabsize=<número>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
-msgstr "Fijar el ancho de tab a núm columnas"
+msgstr "Fijar el ancho de tab a <número> columnas"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
-msgstr "Borrado rápido de la barra de estado"
+msgstr "Borrado rápido de la barra de estado"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
-msgstr "Imprimir información sobre la versión y salir"
+msgstr "Mostrar información sobre la versión y salir"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
-msgstr "Detectar límite entre palabras más detalladamente"
+msgstr "Detectar límite entre palabras más detalladamente"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
-msgstr "-Y <cad>"
+msgstr "-Y <cadena>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<cadena>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
-msgstr "Definición de sintaxis a usar para coloreado"
+msgstr "Definición de sintaxis a usar para coloreado"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
-msgstr "Mostrar constantemente la posición del cursor"
+msgstr "Mostrar constantemente la posición del cursor"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
-msgstr "Arreglar el problema de confusión Retroceso/Suprimir"
+msgstr "Arreglar el problema de confusión Retroceso/Suprimir"
+
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Mostrar este texto de ayuda y salir"
 
-#: src/nano.c:888
+#: src/nano.c:918
 msgid "Automatically indent new lines"
-msgstr "Indentar automáticamente nuevas líneas"
+msgstr "Sangrar automáticamente nuevas líneas"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "Cortar desde el cursor al final de línea"
+msgstr "Cortar desde el cursor al final de línea"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
-msgstr "No seguir enlaces simbólicos, sobreescribirlos"
+msgstr "No seguir enlaces simbólicos, sobreescribirlos"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
-msgstr "Habilitar el uso del ratón"
+msgstr "Habilitar el uso del ratón"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "No leer el fichero (sólo escribirlo)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
-msgstr "Establecer el directorio de operación"
+msgstr "Establecer el directorio de operación"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Conservar teclas XON (^Q) y XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "Ignorar silenciosamente problemillas de inicio"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
-msgstr "-r <núm>"
+msgstr "-r <número>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
-msgstr "--fill=<núm>"
+msgstr "--fill=<número>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Fijar el límite de ajuste de líneas en núm columnas"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Fijar el límite de ajuste en <número> columnas"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
-msgstr "-s <prog>"
+msgstr "-s <programa>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
-msgstr "--speller=<prog>"
+msgstr "--speller=<programa>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
-msgstr "Habilitar corrector alternativo"
+msgstr "Habilitar un corrector ortográfico alternativo"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "Autosalvar al salir, no preguntar"
-
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
+msgstr "Guardar automáticamente al salir, sin preguntar"
 
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
-msgstr "Modo visualización (sólo lectura)"
+msgstr "Modo de visualización (sólo lectura)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "No wrapear líneas largas"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "No rígidamente ajustar líneas largas"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
-msgstr "No mostrar las dos líneas de ayuda"
+msgstr "No mostrar las dos líneas de ayuda"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
-msgstr "Habilitar suspensión"
+msgstr "Habilitar suspensión"
 
 # Uf. A ver si alguien encuentra una palabra para decir eso... sv
-# Esto creo que ya lo pregunté en la lista, a parte de en muchos otros
-# sitios y nadie encontró nada convincente. jm
-#: src/nano.c:924
-#, fuzzy
+# Esto creo que ya lo pregunté en la lista, a parte de en muchos otros
+# sitios y nadie encontró nada convincente. jm
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "Ajuste de líneas largas"
+msgstr "Habilitar ajuste de línea suave"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(se ignora, está por compatibilidad con Pico)"
-
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano versión %s (compilado %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano, versión %s\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Correo: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1611,156 +1695,179 @@ msgstr ""
 "\n"
 " Opciones compiladas:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
-msgstr "Lo siento, se ha deshabilitado el soporte de esta función"
+msgstr "Lo siento, se ha deshabilitado el soporte de esta función"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Sin nombre de fichero"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
-"¿ Salvar el búfer modificado (RESPONDER \"No\" DESTRUIRÁ LOS CAMBIOS) ?"
+"¿Guardar el búfer modificado (RESPONDER \"No\" DESTRUIR� LOS CAMBIOS)? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "No se pudo reabrir stdin desde el teclado\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Leyendo de stdin, ^C para abortar\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recibido SIGHUP o SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Use \"fg\" para volver a nano \n"
+msgstr "Use «fg» para volver a nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "habilitado"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Orden desconocida"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "Se ignora XON, mmh mmh"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "Se ignora XOFF, mmh mmh"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "El tamaño de tabulador \"%s\" no es válido"
+msgstr "El tamaño «%s» de tabulador no es válido"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "El tamaño de llenado \"%s\" no es válido"
+msgstr "El tamaño «%s» de llenado no es válido"
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Teclea «%s -h» para una lista de opciones.\n"
 
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
-msgstr "Tt"
+msgstr "TtAa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
-msgstr "Sí"
+msgstr "Sí"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Todas"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "No"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
-msgstr "Error en %s en la línea %lu: "
+msgstr "Error en %s en la línea %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "El argumento '%s' tiene una \" sin terminar"
+msgstr "El argumento «%s» tiene una \" sin terminar"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
-msgstr "Las cadenas de regex han de empezar y acabar con un carácter \""
+msgstr "Las cadenas de regex han de empezar y acabar con un carácter \""
 
-# c-format
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "Regex \"%s\" incorrecta: %s"
+msgstr "Regex «%s» incorrecta: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
-msgstr "Nombre de la sintaxis inexistente"
+msgstr "Falta el nombre para la sintaxis"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
-msgstr "La sintaxis \"none\" está reservada"
+msgstr "La sintaxis «none» está reservada"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
-msgstr "La sintaxis \"default\" no toma extensiones"
+msgstr "La sintaxis «default» no toma extensiones"
 
-#: src/rcfile.c:386 src/rcfile.c:483
-#, fuzzy
+#: src/rcfile.c:433
 msgid "Missing key name"
-msgstr "Nombre de la sintaxis inexistente"
+msgstr "Falta el nombre de la combinación"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "El nombre de la combinación está demasiado corta"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr ""
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "El nombre de una combinación debe comenzar por «^», «M» o «F»"
+
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "Debe especificar una función a la cual vincular la tecla"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
+"Debe especificar un menú (o «all») en la cual vincular/desvincular la tecla"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:489
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr ""
+msgid "Cannot map name \"%s\" to a function"
+msgstr "El «%s» no es un nombre de función"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr ""
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "El «%s» no es un nombre de menú"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "La función «%s» no existe en menú «%s»"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "La combinación «%s» no puede ser revinculado"
+
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Error al expandir «%s»: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1769,381 +1876,527 @@ msgid ""
 "\"black\", with the optional prefix \"bright\"\n"
 "for foreground colors."
 msgstr ""
-"No se ha reconocido el color \"%s\".\n"
-"Los válidos son \"green\", \"red\", \"blue\", \n"
-"\"white\", \"yellow\", \"cyan\", \"magenta\" y\n"
-"\"black\", con el prefijo opcional \"bright\"\n"
+"No se ha reconocido el color «%s».\n"
+"Los válidos son «green», «red», «blue», \n"
+"«white», «yellow», «cyan», «magenta» y\n"
+"«black», con el prefijo opcional «bright»\n"
 "para los de primer plano."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
-msgstr "No se puede añadir una directiva de color sin una orden de sintaxis"
+msgstr "No se puede añadir una directiva de color sin una orden de sintaxis"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
-msgstr "Nombre del color inexistente"
+msgstr "Falta un nombre de color"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "El color de fondo \"%s\" no puede ser brillante"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Falta la cadena regex"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "«start=» requiere su «end=» correspondiente"
+msgstr "«start=» requiere su «end=» correspondiente"
+
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "El color de fondo «%s» no puede ser brillante"
 
-#: src/rcfile.c:804
-#, fuzzy
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
-msgstr "No se puede añadir una directiva de color sin una orden de sintaxis"
+msgstr ""
+"No se puede añadir una expresión regular para «header» sin un comando "
+"«syntax»"
+
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+"No se puede añadir una expresión regular para «magic» sin un comando «syntax»"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Falta el nombre de la cadena mágica"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "No se puede añadir un «linter» sin un comando «syntax»"
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Falta un nombre de programa detrás «linter»"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "No se puede añadir un «formatter» sin un comando «syntax»"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Falta un nombre de programa detrás «formatter»"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
+"Error fatal: no hay teclas vinculadas a la función «%s».  Terminando.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
+"Si es necesario, use nano con la opción -I para ajustar su configuración "
+"nanorc.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "No se pudo encontrar el sintaxis «%s» para extender"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr "No se admite la orden \"%s\" en el fichero incluido"
+msgstr "No se admite la orden «%s» en el fichero incluido"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr "La sintaxis \"%s\" no tiene órdenes de color"
+msgstr "La sintaxis «%s» no tiene órdenes de color"
 
-# en la línea. sv
-# el comando -> la orden.
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "Orden \"%s\" no reconocida"
+msgstr "Orden «%s» no reconocida"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Falta la opción"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Falta una opción"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "La opción \"%s\" precisa un argumento"
+msgstr "La opción «%s» precisa un argumento"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
-msgstr "La opción no es una cadena multibyte válida"
+msgstr "La opción no es una cadena multibyte válida"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
-msgstr "Se requieren caracteres que no sean blancos"
+msgstr "Se precisan caracteres que no sean blancos"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Se precisan dos caracteres de una sola columna"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "No se pudo desactivar la opción \"%s\""
+msgid "Cannot unset option \"%s\""
+msgstr "No es posible desactivar la opción «%s»"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Opción \"%s\" desconocida"
+msgid "Unknown option \"%s\""
+msgstr "Opción «%s» desconocida"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
-msgstr "No se ha encontrado el directorio del usuario! Wah!"
+msgstr "No se encontró el directorio del usuario.  Ay!"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Pulsa Intro para continuar iniciando nano.\n"
 
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "\"%.*s%s\" no encontrado"
+msgstr "No se encontró «%.*s%s»"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Mayúsc/minúsc]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [ExpReg]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Hacia atrás]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
-msgstr " (a reemplazar) en la selección"
+msgstr " (a reemplazar) en la selección"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (a reemplazar)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
-msgstr "¿Reemplazar esta instancia?"
+msgstr "¿Reemplazar esta instancia?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Reemplazar con"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
-msgstr[0] "Ocurrencia %lu reemplazada"
+msgstr[0] "%lu ocurrencia reemplazada"
 msgstr[1] "%lu ocurrencias reemplazadas"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
-msgstr "Introduce número de línea, número de columna"
+msgstr "Introduce número de línea, número de columna"
 
-#: src/search.c:1061
-#, fuzzy
+#: src/search.c:1054
 msgid "Invalid line or column number"
-msgstr "Introduce número de línea, número de columna"
+msgstr "Número de línea o columna no válido"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "No es una llave"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "No hay una llave correspondiente"
 
 #: src/text.c:54
 msgid "Mark Set"
-msgstr "Marca Establecida"
+msgstr "Marca establecida"
 
 #: src/text.c:58
 msgid "Mark Unset"
-msgstr "Marca Borrada"
+msgstr "Marca borrada"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "Nada para deshacer en el búfer"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
-msgstr ""
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Error interno: no se puede encontrar la línea %d.  Guarde su trabajo."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
-msgstr ""
+msgstr "añadido de texto"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
-msgstr "Fichero siguiente"
+msgstr "eliminado de texto"
 
-# Uf. A ver si alguien encuentra una palabra para decir eso... sv
-# Esto creo que ya lo pregunté en la lista, a parte de en muchos otros
-# sitios y nadie encontró nada convincente. jm
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Ajuste de líneas largas"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
-msgstr ""
+msgstr "juntado de líneas"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
-msgstr ""
+msgstr "cortado de texto"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr ""
+msgstr "pegado de texto"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr ""
+msgstr "salto de línea"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
-msgstr "Línea siguiente"
+msgstr "inserción de texto"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
-msgstr " (a reemplazar)"
+msgstr "reemplazo de texto"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr ""
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Error interno: tipo desconocido.  Guarde su trabajo."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Acción deshecha (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "Nada para rehacer"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr ""
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "Error interno: no se puede configurar un rehacer.  Guarde su trabajo."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Acción rehecha (%s)"
 
-# Lo mismo. No se pudo cerrar. sv
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "No se pudo canalizar"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "No se pudo crear una tubería («pipe»)"
 
-# Lo mismo. No se pudo cerrar. sv
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "No se pudo crear otro proceso"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
+msgstr "Error interno: no se puede configurar un pegar.  Guarde su trabajo."
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
-msgstr "El marcador de cita '%s' no es válido: %s"
+msgstr "El marcador de cita «%s» no es válido: %s"
 
-# ahora se puede. sv
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
-msgstr "¡Ahora se puede desjustificar!"
+msgstr "Ahora se puede desjustificar."
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Editar un reemplazo"
 
-# Lo mismo. No se pudo cerrar. sv
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "No se pudo crear una tubería (\"pipe\")"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "Creando lista de palabras mal escritas. Espere, por favor..."
+msgstr "Creando una lista de palabras mal escritas.  Espere, por favor..."
 
-# Ídem de ídem. Te dejo que revises los que siguen.
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
-msgstr "No se pudo obtener el tamaño del búfer de la tubería (\"pipe\")"
+msgstr "No se pudo obtener el tamaño del búfer de la tubería («pipe»)"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
-msgstr "Error al invocar «spell»"
+msgstr "Error al invocar «spell»"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
-msgstr "Error al invocar «sort -f»"
+msgstr "Error al invocar «sort -f»"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
-msgstr "Error al invocar «uniq»"
+msgstr "Error al invocar «uniq»"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
-msgstr "Revisión de ortografía finalizada"
+msgstr "Revisión de ortografía finalizada"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "Error al invocar \"%s\""
+msgstr "Error al invocar «%s»"
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Invocando el corrector ortográfico.  Espere, por favor..."
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
-msgstr "Comprobación de ortografía fallida: \"%s\""
+msgstr "Comprobación de ortografía fallida: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
-msgstr "Comprobación de ortografía fallida: %s: %s"
+msgstr "Comprobación de ortografía fallida: %s: %s"
+
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "No se ha definido un corrector de sintaxis para este tipo de fichero"
 
-#: src/text.c:3030
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "¿Guardar el búfer modificado antes de invocar el corrector?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Invocando el corrector de sintaxis.  Espere, por favor..."
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Se ha recibido cero líneas analizables del comando «%s»"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr "Este mensaje es para fichero %s; ¿abrirlo en un nuevo búfer?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Este es el último mensaje"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Este es el primer mensaje"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Error: no se ha definido un «formatter»"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Acabado"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Invocando el arreglador.  Espere, por favor..."
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Se acabó el arreglado"
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
-msgstr "%sPalabras: %lu Líneas: %ld Caracteres: %lu "
+msgstr "%sPalabras: %lu Líneas: %ld Caracteres: %lu "
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
-msgstr "En la selección:  "
+msgstr "En la selección: "
 
-# ¡memoria insuficiente! sv
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Entrada literal"
+
+# ¡memoria insuficiente! sv
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
-msgstr "¡nano se ha quedado sin memoria!"
+msgstr "nano se ha quedado sin memoria"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Entrada de Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Modificado"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Ver"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Fichero:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Aviso: modificando un fichero no bloqueado, ¿comprobar los permisos del "
+"directorio?"
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
-msgstr "línea %ld/%ld (%d%%), col %lu/%lu (%d%%), car %lu/%lu (%d%%)"
+msgstr "línea %ld/%ld (%d%%), col %lu/%lu (%d%%), car %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "El editor de textos GNU nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
-msgstr "versión"
+msgstr "versión"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
-msgstr "Por cortesía de:"
+msgstr "Por cortesía de:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Agradecimientos especiales para:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "los traductores y la TP"
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Por ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "y cualquiera del que nos hayamos olvidado..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
-msgstr "¡Gracias por usar nano!"
+msgstr "Gracias por usar nano."
+
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Error interno: no se puede encontrar la línea %ld.  Guarde su trabajo."
+
+#~ msgid "Insert File"
+#~ msgstr "Insertar fichero"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Ir a la pantalla anterior"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Buscar la otra llave"
+
+# Uf. A ver si alguien encuentra una palabra para decir eso... sv
+# Esto creo que ya lo pregunté en la lista, a parte de en muchos otros
+# sitios y nadie encontró nada convincente. jm
+#~ msgid "Long line wrapping"
+#~ msgstr "Ajuste de líneas largas"
+
+# Uf. A ver si alguien encuentra una palabra para decir eso... sv
+# Esto creo que ya lo pregunté en la lista, a parte de en muchos otros
+# sitios y nadie encontró nada convincente. jm
+#~ msgid "Soft line wrapping"
+#~ msgstr "Ajuste suave de línea"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Permitir deshacer genérico [EXPERIMENTAL]"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(se ignora, está por compatibilidad con Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Debe especificar un al que vincular la tecla (o «todos»)"
+
+#~ msgid "Missing flag"
+#~ msgstr "Falta la opción"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Error interno: tipo desconocido. Guarde su trabajo."
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "Error interno: falló la configuración de rehacer. Guarde su trabajo."
 
 #~ msgid "Space"
 #~ msgstr "Espacio"
 
-# sé. sv
+# sé. sv
 #~ msgid "Come on, be reasonable"
-#~ msgstr "Venga ya, sé razonable"
+#~ msgstr "Venga ya, sé razonable"
diff --git a/po/eu.gmo b/po/eu.gmo
index a7a42d5..df6aa34 100644
--- a/po/eu.gmo
+++ b/po/eu.gmo
diff --git a/po/eu.po b/po/eu.po
index 2dd366f..0ccbb81 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,123 +1,147 @@
 # GNU nano-rentzat egindako hitzulpena.
 # Copyright (C) 2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# Mikel Olasagasti <hey_neken@mundurat.net>, 2004,2005,2006.
-# Peio Ziarsolo <peio@sindominio.net>, 2001, 2002.
-#
 #
+# Peio Ziarsolo <peio@sindominio.net>, 2001, 2002.
+# Mikel Olasagasti <hey_neken@mundurat.net>, 2004, 2005, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.9.99pre0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2006-09-25 19:59+0200\n"
 "Last-Translator: Mikel Olasagasti <hey_neken@mundurat.net>\n"
 "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Joan direktorio honetara"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Ezin da %stik kanpora joan era murriztuan"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Errorea %s irakurtzen: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Ezin da direktorioan gora egin"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(aita dir.)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Bilatu"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr "[May/Min]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr "[Regexp]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr "[Atzeruntza]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Bilaketa berriz hasia"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Hau da kointzidentzia bakarra"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Ez dago bilatzeko eredurik"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Ezin izan da aldi baterako fitxategia sortu: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Errorea aldi baterako fitxategia idazten: %s"
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Errorea aldi baterako fitxategia idazten: %s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Errorea %s irakurtzen: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Ezin da artxiboa txertatu %s-tik kanpo"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Ez dago irekitako fitxategi buffer gehiagorik"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "%s-ra aldatua"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Bufer berria"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Lerro %lu irakurria (DOS eta Mac formatutik bihurtuak)"
 msgstr[1] "%lu lerro irakurriak (DOS eta Mac formatutik bihurtuak)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -128,14 +152,14 @@ msgid_plural ""
 msgstr[0] "Lerro %lu irakurria (DOS eta Mac formatutik bihurtuak)"
 msgstr[1] "%lu lerro irakurriak (DOS eta Mac formatutik bihurtuak)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Lerro %lu irakurria (Mac formatutik bihurtuak)"
 msgstr[1] "%lu lerro irakurriak (Mac formatutik bihurtuak)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -144,14 +168,14 @@ msgid_plural ""
 msgstr[0] "Lerro %lu irakurria (Mac formatutik bihurtuak)"
 msgstr[1] "%lu lerro irakurriak (Mac formatutik bihurtuak)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Lerro %lu irakurria (DOS formatutik bihurtuak)"
 msgstr[1] "%lu lerro irakurriak (DOS formatutik bihurtuak)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -160,492 +184,447 @@ msgid_plural ""
 msgstr[0] "Lerro %lu irakurria (DOS formatutik bihurtuak)"
 msgstr[1] "%lu lerro irakurriak (DOS formatutik bihurtuak)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Lerro %lu irakurria"
 msgstr[1] "%lu lerro irakurriak"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Fitxategia irakurtzen"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Fitxategi berria"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" ezin aurkitu"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" direktorio bat da"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" fitxategia dispositibo-fitxategi bat da"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Buffer berrian exekutatzeko komandoa [%s-tik] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Exekutatutzeko komandoa [%s-(e)tik] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Buffer berrian txertatzeko fitxategia [%s-tik]"
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Txertatzeko fitxategia [%s-tik] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Baligabeko tekla ez-multibuffer moduan"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Ezin da %staz kanpo idatzi"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 "Ezin zaio hasieran edo amaieran gehitu esteka sinboliko bati --nofollow "
 "ezarria dagoenean"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, fuzzy, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Errorea aldi baterako fitxategia idazten: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Babes-kopia fitxategi gehiegi?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Errorea %s idazten: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Errorea aldi baterako fitxategia idazten: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Lerro %lu idatzia"
 msgstr[1] "%lu lerro idatziak"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr "[DOS formatua]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr "[Mac formatua]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Babeskopia]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Gehitu aukeraketa fitxategiaren hasieran"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Gehitu aukeraketa fitxategian"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Ahuatespena artxiboan idatzi"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Gehitu nahi duzun fitxategiaren izena"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Gehituko zaion fitxategiaren izena "
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Idatzi nahi duzun artxiboaren izena"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Fitxategia existitzen da dagoeneko, GAINIDATZI?"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Gorde fitxategia BESTE izen batekin?"
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(gehiago)"
 
-#: src/files.c:2694 src/rcfile.c:1220
-#, c-format
+#: src/files.c:2974
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Nano abiarazten jarraitzeko return sakatu.\n"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Bertan behera utzi"
+"Nanorekin jarraitzeko return sakatu\n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "Ordezkatu"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Ez ordezkatu"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "May/Min"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Atzeruntza"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Regexp"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Irten"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "Aurreko historikoa"
+#: src/global.c:478
+msgid "Close"
+msgstr "Itxi"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "Hurrengo historikoa"
+#: src/global.c:479
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Ezmoztu testua"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Joan testu hontara"
+#: src/global.c:481
+#, fuzzy
+msgid "Unjustify"
+msgstr "Justifikazioa ezeztatu"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Non dago Hur."
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Lehen fitxategia"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Azken Fitxategia"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Fitxategietara"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS formatua"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac formatua"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Gehitu"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Gehitu"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Babeskopia fitxategia"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Exekutatu komandoa"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Joan direktorio honetara"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Laguntza begiratu"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Irten"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Bilatu"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Aurreko orrialdea"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Hurrengo orrialdea"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Lehen lerroa"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Ordezkatu"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Azken lerroa"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Joan lerro hontara"
 
-#: src/global.c:487
-#, fuzzy
-msgid "Suspend"
-msgstr "Eseki"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Aurreko lerroa"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Par hasi"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Hurrengo lerroa"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Par amai"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Artxiboa irakurri"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Justifikatu"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Freskatu"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Txertatu fitxategia"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Joan lerro hontara"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Uneko parrafoa justifikatu"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Uneko funtzioa bertan behera utzi"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Erakutsi laguntza testu hau"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Unean kargatutako fitxategi bufferra itxi/Nanotik irten"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Nanotik irten"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Uneko artxiboa diskoan idatzi"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Uneko lerroan beste lerro bat txertatu"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Bilatu kate bat edo expresio erregular bat"
 
-#: src/global.c:520
+#: src/global.c:526
 #, fuzzy
-msgid "Go to previous screen"
-msgstr "Aurreko pantailara mugitu"
+msgid "Search for a string"
+msgstr "Bilatu kate bat edo expresio erregular bat"
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Hurrengo pantailara mugitu"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr ""
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Uneko lerroa moztu eta cutbufferean gorde"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Cutbufferekoa uneko lerroan txertatu"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Kurtsorearen posisioa erakutsi"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Deitu zuzentzaileari, eskuragarri badago"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Ordezkatu kate bat edo expresio erregular bat"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Joan espezifikatutako lerro eta zutabera"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Markatu testua kurtsorearen uneko posizioan"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Errepikatu azken bilaketa"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Uneko lerroa kopiatu eta cutbufferean gorde"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Koskatu uneko lerroa"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Koska kendu uneko lerroari"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:543
+#: src/global.c:550
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Karaktere bat aurreruntz mugitu"
 
-#: src/global.c:544
+#: src/global.c:551
 #, fuzzy
 msgid "Go back one character"
 msgstr "Karaktere bat atzeruntz mugitu"
 
-#: src/global.c:546
+#: src/global.c:553
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Mugitu hitz bat atzera"
 
-#: src/global.c:547
+#: src/global.c:554
 #, fuzzy
 msgid "Go back one word"
 msgstr "Mugitu hitz bat atzeruntz"
 
-#: src/global.c:549
+#: src/global.c:556
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Aurreko lerrora mugitu"
 
-#: src/global.c:550
+#: src/global.c:557
 #, fuzzy
 msgid "Go to next line"
 msgstr "Mugitu hurrengo lerrora"
 
-#: src/global.c:551
+#: src/global.c:558
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Uneko lerroaren hasierara mugitu"
 
-#: src/global.c:552
+#: src/global.c:559
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Uneko lerroaren bukaerara mugitu"
 
-#: src/global.c:555
+#: src/global.c:562
 #, fuzzy
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Mugitu uneko parrafoaren hasierara"
 
-#: src/global.c:557
+#: src/global.c:564
 #, fuzzy
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Mugitu uneko parrafoaren amaierara"
 
-#: src/global.c:560
+#: src/global.c:566
 #, fuzzy
 msgid "Go to the first line of the file"
 msgstr "Mugitu fitxategiaren lehen lerrora"
 
-#: src/global.c:562
+#: src/global.c:567
 #, fuzzy
 msgid "Go to the last line of the file"
 msgstr "Mugitu fitxategiaren azken lerrora"
 
-#: src/global.c:564
+#: src/global.c:569
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Ez dago giltz egokirik"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Korritu gora lerro bat kurtsorea korritu gabe"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Korritu behera lerro bat kurtsorea korritu gabe"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Aldatu aurreko fitxategi buffer-era"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Aldatu hurrengo fitxategi buffer-era"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Hurrengo tekla-sakatzea literalki sartu"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Txertatu tabuladore karaktere bat kurtsorearen posizioan"
 
@@ -654,343 +633,461 @@ msgstr "Txertatu tabuladore karaktere bat kurtsorearen posizioan"
 msgid "Insert a newline at the cursor position"
 msgstr "Orga-itzulera bat kurtsorearen posizioan txertatu"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Kurtsorearen azpiko karaterea ezabatu"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Kurtsorearen ezkerraldeko karaterea ezabatu"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Moztu kurtsoretik posiziotik lerro amaierara arte"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Justifikatu lerro osoa"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Zenbatu hitz, lerro eta karaktere kopurua"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Freskatu uneko pantaila"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:603
+#: src/global.c:602
 #, fuzzy
 msgid "Toggle the case sensitivity of the search"
 msgstr "Mayuskula/minuskulaz egindako bilaketa"
 
-#: src/global.c:605
+#: src/global.c:604
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "kurtsorearen posisioa erakutsi"
 
-#: src/global.c:609
+#: src/global.c:608
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Expresio erregularrak erabili"
 
-#: src/global.c:613
+#: src/global.c:612
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Editatu aurreko bilaketa/aldaketa kateak"
 
-#: src/global.c:615
+#: src/global.c:614
 #, fuzzy
 msgid "Recall the next search/replace string"
 msgstr "Editatu aurreko bilaketa/aldaketa kateak"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Fitxategi nabigatzailera joan"
 
-#: src/global.c:621
+#: src/global.c:620
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Dos formatoan fitxategia idazten"
 
-#: src/global.c:622
+#: src/global.c:621
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Idatzi fitxategia Mac formatuan"
 
-#: src/global.c:624
+#: src/global.c:622
 #, fuzzy
 msgid "Toggle appending"
 msgstr "Auto-doitu lerro luzeak"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:628
+#: src/global.c:624
 #, fuzzy
 msgid "Toggle backing up of the original file"
 msgstr "Gorde existitzen diren fitxategien babeskopiak"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Exekutatu kanpo-komandoa"
 
-#: src/global.c:633
+#: src/global.c:628
 #, fuzzy
 msgid "Toggle the use of a new buffer"
 msgstr "Ezin izan da hodi buffer-aren tamainua lortu"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Irten fitxategi nabigatzailetik"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Joan zerrendako lehen fitxategira"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Joan zerrendako azken fitxategira"
 
-#: src/global.c:641
+#: src/global.c:634
+#, fuzzy
+msgid "Go to the previous file in the list"
+msgstr "Joan zerrendako lehen fitxategira"
+
+#: src/global.c:635
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Joan zerrendako azken fitxategira"
 
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Joan direktorio honetara"
+
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Deitu zuzentzaileari, eskuragarri badago"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Aurreko lerrora mugitu"
+
+#: src/global.c:641
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Mugitu hurrengo lerrora"
+
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Joan zerrendako lehen fitxategira"
+msgid "Invoke formatter, if available"
+msgstr "Deitu zuzentzaileari, eskuragarri badago"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Joan direktorio honetara"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Laguntza begiratu"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Itxi"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Bertan behera utzi"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "Gorde"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Joan direktorio honetara"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Textua moztu"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Justifikatu"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Artxiboa irakurri"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Ortografia"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Textua moztu"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "Joan lerro hontara"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Justifikazioa ezeztatu"
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS formatua"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Ezmoztu testua"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "May/Min"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Regexp"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Atzeruntza"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Ez ordezkatu"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Uneko posizioa"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Ortografia"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Aurreko orrialdea"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Hurrengo orrialdea"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Lehen lerroa"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Azken lerroa"
 
-#: src/global.c:771
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ez da hori giltza"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Textua markatu"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Kopiatu testua"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Koskatu testua"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Ez koskatu testua"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Aurrean"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Atzean"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Hurrengo hitza"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Aurrean"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Aurreko hitza"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Aurreko lerroa"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Hurrengo lerroa"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Hurrengo hitza"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Etxea"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Bukaera"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Beste giltz bat bilatu"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Par hasi"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Par amai"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Korritu gora"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Korritu behera"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "Aurreko fitxategia"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Hurrengo fitxategia"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
 msgstr "Sarrera literala"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Sartu"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Atzera tekla"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "MoztuAmaieraraArte"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Hitz kopurua"
 
-#: src/global.c:1367
+#: src/global.c:905
+#, fuzzy
+msgid "Suspend"
+msgstr "Eseki"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Aurreko historikoa"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Hurrengo historikoa"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Joan testu hontara"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS formatua"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac formatua"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Gehitu"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Gehitu"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Babeskopia fitxategia"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Exekutatu komandoa"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Fitxategietara"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Lehen fitxategia"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Azken Fitxategia"
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Aurreko lerroa"
+
+#: src/global.c:979
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "Hurrengo lerroa"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Laguntza modua"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Kurtzorearen posizioa bistaratu beti"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Erabili lerro bat edo gehiago editatzeko"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Korritze leuna"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Ez doitu lerro luzeak"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Erakutsi txuriguneak"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Kolore sintaxi nabarmentzea"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "'Smart home' tekla"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Auto indentatu"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Lerroaren bukaeraraino ebaki"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Auto-doitu lerro luzeak"
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Ez doitu lerro luzeak"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Bihurtu idatzitako tabulazioak zuriuneetara"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Babeskopia fitxategiak"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Fitxategi anitzen buffer-a"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Xagu euskarria"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Ez bihurtu DOS/Mac formatuak"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Eseki"
 
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Auto-doitu lerro luzeak"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1011,7 +1108,7 @@ msgstr ""
 "Enter sakatuz karaktere berririk sartu gabe aurreko bilaketa berriz burutuko "
 "du.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1025,7 +1122,7 @@ msgstr ""
 " Honako funtzio teklak daude Bilaketa moduan:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1044,7 +1141,7 @@ msgstr ""
 " Honako funtzio teklak daude joan lerrora moduan:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1067,7 +1164,7 @@ msgstr ""
 "beste buffer batean kargatzen du (erabili Meta-< edo > buffer-ez "
 "aldatzeko).  "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1081,7 +1178,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri fitxategi txertaketa moduan:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1107,7 +1204,7 @@ msgstr ""
 "Honako funtzio teklak daude eskuragarri fitxategia idatzi moduan:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1132,7 +1229,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri fitxategi nabigatzaile moduan:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1155,7 +1252,7 @@ msgstr ""
 "Enter sakatuz karaktere berririk sartu gabe aurreko bilaketa berriz burutuko "
 "du.  "
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1163,7 +1260,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri Bilaketa Nabigatzaile moduan:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1186,7 +1283,7 @@ msgstr ""
 "moduan:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1210,7 +1307,7 @@ msgstr ""
 " Honako funtzio teklak daude eskuragarri zuzenketa moduan:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1231,7 +1328,7 @@ msgstr ""
 " Honako teklak gaituak daude modu hontan:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1251,7 +1348,7 @@ msgstr ""
 "erakutsiz.  Egoera lerroa da hirugarrena eta informazio garrantzitsuak "
 "ematen ditu  "
 
-#: src/help.c:366
+#: src/help.c:335
 #, fuzzy
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
@@ -1268,7 +1365,7 @@ msgstr ""
 "agertzen dira, eta Esc, Alt edo Meta-tekla (zure teklatuaren araberakoa) "
 "sakatuz erabili daitezke.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1282,15 +1379,15 @@ msgstr ""
 "parentesi artean erakusten dira:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "gaitu/ezgaitu"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Tekla baliogabea ikuskatze moduan"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1299,7 +1396,7 @@ msgstr ""
 "\n"
 "Bufferra hemen idatzia: %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1308,7 +1405,7 @@ msgstr ""
 "\n"
 "Bufferra ez da %s-(e)n idatzi: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1317,11 +1414,11 @@ msgstr ""
 "\n"
 "Bufferra ez da idatzi: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Leihoaren tamainua txikiegia da nano-rentzat...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1330,254 +1427,263 @@ msgstr ""
 "Erabilera: nano [AUKERAK] [[+LERROA,ZUTABEA] FITXATEGIA]\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Aukera\t\tGNU aukera luzea\t\tEsanahia\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Aukera\t\tEsanahia\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Mezu hau erakutsi"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+LERROA,ZUTABEA"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Hasi LERRO lerro zenbakian, ZUTABE zutabean"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Gaitu 'smart home' tekla"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Gorde existitzen diren fitxategien babeskopiak"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Babeskopia fitxategiak idazteko direktorioa"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Erabili lodia alderantzizko testua beharrean"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Bihurtu idatzitako tabuladoreak zuriuneetara"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Gaitu fitxategi buffer ugari"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Idatzi eta irakurri bilaketa/aldaketa kateen historia"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Ez begiratu nanorc fitxategietan"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Konpondu zenbakizko teklatu nahaste arazoak"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Ez gehitu lerro berria fitxategiaren amaieran"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Ez bihurtu DOS/Mac formatuko fitxategiak"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Erabili lerro bat edo gehiago editatzeko"
 
-#: src/nano.c:860
+#: src/nano.c:886
+#, fuzzy
+msgid "Log & read location of cursor position"
+msgstr "Txertatu tabuladore karaktere bat kurtsorearen posizioan"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Aipamen katea"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Mugatutako modua"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Ezarri fitxa baten zabalera #cols-era"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Egin egoera-barra garbiketa azkarra"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Bertsioaren informazioa inprimatu eta irten"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Aurkitu hitz amaierak zehatzago aurkitu"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<str>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 #, fuzzy
 msgid "Syntax definition to use for coloring"
 msgstr "Erabiltzeko sintaxi definizioa"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Erakutsi beti kurtsorearen posizioa"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Konpondu atzera tekla/ezabatu nahaste arazoak"
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "Erakutsi laguntza testu hau"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Automatikoki indentatu lerro berriak"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Moztu kurtsoretik lerro amaierara"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Ez jarraitu esteka sinbolikoak, gainidatzi"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Gaitu xaguaren erabilera"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Ezarri eragiketa direktorioa"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Mantendu XON (^Q) eta XOFF (^S) teklak"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:906
+#: src/nano.c:939
 #, fuzzy
-msgid "Set wrapping point at column #cols"
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Ezarri zutabe-tab baten zabalera #cols-i"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Gahitu zuzentzaile alternatiboa"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Irteterakoan automatikoki gorde, ez galdetu"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Ikuskatze modua (irakurri bakarrik)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Ez doitu lerro luzeak"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Ez erakutsi bi laguntza lerroak"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Gaitu esekitzea"
 
-#: src/nano.c:924
+#: src/nano.c:954
 #, fuzzy
 msgid "Enable soft line wrapping"
 msgstr "Auto-doitu lerro luzeak"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignoratua, Pico-rekin konpatibilitatea mantentzeko)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr "GNU nano %s bertsioa (%s %s konpilatua)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr "E-posta: nano@nano-editor.org\tWebgunea: http://www.nano-editor.org"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1586,155 +1692,179 @@ msgstr ""
 "\n"
 "Konpilazio aukerak:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Barkatu, funtzio horrentzat euskarria gaitu gabe dago"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Buffer aldatua gorde? (\"Ez\" ERANTZUTEKOTAN ALDAKETAK DEUZESTUEGINGO DIRA) ?"
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP edo SIGTERM jaso da\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Erabili \"fg\" nano-ra itzultzeko.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "gaitua"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "ez gaitua"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Komando ezezaguna"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignoratua, kaka zarra"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoratua, kaka zarra"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Eskatutako \"%s\" tab tamainua baliogabea da"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Eskatutako \"%s\" betetze tamainua baliogabea da"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr ""
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Bb"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Ee"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Dd"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Bai"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Guztiak"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Ez"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Errorea %s-n %lu lerroan: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "'%s' argumentuak amaitu gabeko \" bat dauka"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Regex kateak \" karaktearekin hasi eta amaitu behar dute"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "\"%s\" regex okerra: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Sintaxiaren izena falta da"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\" sintaxia erreserbaturik dago"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "\"default\" sintaxiak ez du extentsiorik hartu behar"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 #, fuzzy
 msgid "Missing key name"
 msgstr "Sintaxiaren izena falta da"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr ""
 
-#: src/rcfile.c:426
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Ezin izan zen %s ireki %s idazteko"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Ezin izan da \"%s\"-i deitu"
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:496
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
+
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr ""
+
+#: src/rcfile.c:629
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Errorea %s irakurtzen: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1750,135 +1880,196 @@ msgstr ""
 "\"black\", \"bright\" aukerazko aurrizkiarekin\n"
 "aurreplanoko koloreentzat."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Ezin izan da kolorea komando bat gehitu sintaxi komando bat gabe"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Kolorearen izena falta da"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Atzekaldeko \"%s\" koloreak ezin du bizia izan"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Regex katea falta da"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\"-k \"end=\" behar du"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Atzekaldeko \"%s\" koloreak ezin du bizia izan"
+
+#: src/rcfile.c:865
 #, fuzzy
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Ezin izan da kolorea komando bat gehitu sintaxi komando bat gabe"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:921
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Ezin izan da kolorea komando bat gehitu sintaxi komando bat gabe"
+
+#: src/rcfile.c:926
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Regex katea falta da"
+
+#: src/rcfile.c:985
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Ezin izan da kolorea komando bat gehitu sintaxi komando bat gabe"
+
+#: src/rcfile.c:990
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Kolorearen izena falta da"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Ezin izan da kolorea komando bat gehitu sintaxi komando bat gabe"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Ezin izan zen %s ireki %s idazteko"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "\"%s\" komandoa ez dago baimendua fitxategia barne moduan"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "\"%s\" sintaxiak ez dauka kolore komandorik"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Ez da \"%s\" komandoa ulertu"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Bandera falta da"
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "Kolorearen izena falta da"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "\"%s\" aukerak argumentu bat behar du"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Aukera ez da baliodun multibyte katea"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Ez-hutsune karaktereak behar dira"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Bi zutabe-bakar karaktere behar dira"
 
-#: src/rcfile.c:1114
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1339
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Ezin da \"%s\" bandera kendu"
 
-#: src/rcfile.c:1123
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1345
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "\"%s\" bandera ezezaguna"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ezin dut nire etxe direktorioa aurkitu!  Outx!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Nano abiarazten jarraitzeko return sakatu.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" ez da aurkitu"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr "[May/Min]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr "[Regexp]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr "[Atzeruntza]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (aldatzeko) aukeraketan"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr "(aldatzeko)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Instantsia hau aldatu?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Aldatu honekin"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%lu kointzidentzia aldatuta"
 msgstr[1] "%lu kointzidentzia aldatuta"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Lerroaren zenbakia, zutabe zenbakia sartu"
 
-#: src/search.c:1061
+#: src/search.c:1054
 #, fuzzy
 msgid "Invalid line or column number"
 msgstr "Lerroaren zenbakia, zutabe zenbakia sartu"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ez da hori giltza"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Ez dago giltz egokirik"
 
@@ -1890,228 +2081,307 @@ msgstr "Marka aukeratua"
 msgid "Mark Unset"
 msgstr "Markatu ez hautatua"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 #, fuzzy
 msgid "text delete"
 msgstr "Hurrengo fitxategia"
 
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Auto-doitu lerro luzeak"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 #, fuzzy
 msgid "text insert"
 msgstr "Hurrengo lerroa"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 #, fuzzy
 msgid "text replace"
 msgstr "(aldatzeko)"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Ezin da hoditik pasa"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Ezin izan da hodia sortu"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Ezin izan da bikoiztu"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "%s aipamen kate okerra: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Orain ez-justifikatu dezakezu!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Ordezkoa editatu"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Ezin izan da hodia sortu"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Gaizki idatzitako hiz zerrenda sortzen, itxaron mesedez..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Ezin izan da hodi buffer-aren tamainua lortu"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Errorea \"spell\"-i deitzen"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Errorea \"sort -f\"-i deitzen"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Errorea \"uniq\"-i deitzen"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Zuzenketa ortografikoa bukatu da"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Errorea \"%s\"-(e)ri deitzen"
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Deitu zuzentzaileari, eskuragarri badago"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Zuzenketa ortografikoan huts egin du: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Zuzenketa ortografikoan huts egin du: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Ez gehitu lerro berria fitxategiaren amaieran"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "Mezu hau erakutsi"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "Mezu hau erakutsi"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sHitzak: %lu  Lerroak: %ld  Karaktereak: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Aukeraketan:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Sarrera literala"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano: memoriatik kanpo!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Unicode sarrera"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Aldatua"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Ikusi"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Fitxategia:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr ""
 "%ld/%ld (%d%%) lerroa, %lu/%lu (%d%%) zutabea, %lu/%lu\t (%d%%) karakterea"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Nano textu editorea"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "bertsioa"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Zuretzako hauek egina:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Esker bereziak:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "ncurses-entzat:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "eta ahaztu dugun baten bat..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Mila esker nano erabiltzeagatik!"
 
+#~ msgid "Move to the previous screen"
+#~ msgstr "Aurreko pantailara mugitu"
+
+#~ msgid "Move to the next screen"
+#~ msgstr "Hurrengo pantailara mugitu"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Beste giltz bat bilatu"
+
+#~ msgid "Insert File"
+#~ msgstr "Txertatu fitxategia"
+
 #~ msgid "Space"
 #~ msgstr "Hutsunea"
 
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(ignoratua, Pico-rekin konpatibilitatea mantentzeko)"
+
+#~ msgid "Missing flag"
+#~ msgstr "Bandera falta da"
+
 #~ msgid "Come on, be reasonable"
 #~ msgstr "Bai zera, izan zentzuduna!"
 
+#~ msgid "Could not pipe"
+#~ msgstr "Ezin da hoditik pasa"
+
 #~ msgid "Prepending to %s failed: %s"
 #~ msgstr "%s-(e)ra gehitzen huts egin da: %s"
 
@@ -2164,9 +2434,6 @@ msgstr "Mila esker nano erabiltzeagatik!"
 #~ msgid "Duplicate syntax name %s"
 #~ msgstr "Bikoiztutako %s sintaxi izena"
 
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "Ezin izan da aldi baterako fitxategia sortu: %s"
-
 #~ msgid "Refusing zero-length regex match"
 #~ msgstr "0 regex parekotasun luzeera ukatzen"
 
@@ -2203,6 +2470,9 @@ msgstr "Mila esker nano erabiltzeagatik!"
 #~ msgid "Verbatim input"
 #~ msgstr "Sarrera literala"
 
+#~ msgid "Could not invoke \"%s\""
+#~ msgstr "Ezin izan da \"%s\"-i deitu"
+
 #~ msgid "Search Cancelled"
 #~ msgstr "Bilaketa ezeztatua"
 
@@ -2242,8 +2512,7 @@ msgstr "Mila esker nano erabiltzeagatik!"
 #~ msgid "Could not reopen %s: %s"
 #~ msgstr "Ezin izan zen %s: %s itxi"
 
-#, fuzzy
-#~ msgid "Could not open %s for prepend: %s"
+#~ msgid "Could not open %s for writing: %s"
 #~ msgstr "Ezin izan zen %s ireki %s idazteko"
 
 #~ msgid "Could not set permissions %o on %s: %s"
@@ -2440,12 +2709,6 @@ msgstr "Mila esker nano erabiltzeagatik!"
 #~ msgid "delete_opennode(): free'd last node.\n"
 #~ msgstr "delete_node(): Azkenengo nodoa liberatua.\n"
 
-#, fuzzy
-#~ msgid "Press return to continue\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Nanorekin jarraitzeko return sakatu\n"
-
 #~ msgid "current->data = \"%s\"\n"
 #~ msgstr "current->data = \"%s\"\n"
 
diff --git a/po/fi.gmo b/po/fi.gmo
index 3ae1d96..cb9ccf9 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
diff --git a/po/fi.po b/po/fi.po
index 4a251b5..b0688d6 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,124 +1,153 @@
 # GNU nano Finnish Translation.
-# Copyright © 2000, 2001, 2003, 2009, 2010 Free Software Foundation, Inc.
+# Copyright © 2000, 2001, 2003, 2009, 2010, 2011, 2013, 2014, 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
+#
 # Pauli Virtanen <pauli.virtanen@saunalahti.fi>, 2000, 2001.
 # Kalle Kivimaa <kalle.kivimaa@iki.fi>, 2003.
 # Kalle Olavi Niemitalo <kon@iki.fi>, 2003.
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2009-2010
-#
+# Jorma Karvonen <karvonen.jorma@gmail.com>, 2009-2011, 2013-2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.99pre3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-04-08 10:55+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-07 21:10+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Siirry hakemistoon"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Peruttu"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
-msgstr "Ei voi siirtyä pois hakemistosta %s rajoitetussa tilassa"
+msgstr "Hakemistosta %s pois siirtyminen rajoitetussa tilassa epäonnistui"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Virhe luettaessa kohdetta %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "Ei voi siirtyä ylähakemistoon"
+msgstr "Ylähakemistoon siirtyminen epäonnistui"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(hakem.)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(ylähakem.)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Etsi"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Kirj. koko]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Säännöke]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Taaksepäin]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Etsintä jatkuu"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Tämä on ainoa esiintymä"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Ei nykyistä etsintämallia"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"Identiteettini määritteleminen lukitustiedostolle (getpwuid()-funktiolla) "
+"epäonnistui"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Tietokonenimen määritteleminen lukitustiedostolle epäonnistui: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Virhe kirjoitettaessa lukitustiedostoa %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Virhe poistettaessa lukitustiedostoa %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Virhe avattaessa lukitustiedostoa %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "Virhe luettaessa lukitustiedostoa %s: Dataa ei luettu riittävästi"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+"Tiedostoa %s on muokattu (muokkaaja %s kohteella %s, PID-tunniste %d), "
+"jatketaanko?"
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Virhe kirjoitettaessa lukitustiedostoa: Hakemistoa ’%s’ ei ole"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "Ei voi lisätä tiedostoa hakemiston %s ulkopuolelta"
+msgstr "Tiedoston lisääminen hakemiston %s ulkopuolelta epäonnistui"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Ei enää avoimia tiedostopuskureita"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Vaihdoin tiedostoon %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Uusi teksti"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Luettu %lu rivi (Muunnettu DOS- ja Mac-muodosta)"
 msgstr[1] "Luettu %lu riviä (Muunnettu DOS- ja Mac-muodosta)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -131,14 +160,14 @@ msgstr[0] ""
 msgstr[1] ""
 "Luettu %lu riviä (Muunnettu Mac-muodosta - Varoitus: Ei kirjoitusoikeutta)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Luettu %lu rivi (Muunnettu Mac-muodosta)"
 msgstr[1] "Luettu %lu riviä (Muunnettu Mac-muodosta)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -149,14 +178,14 @@ msgstr[0] ""
 msgstr[1] ""
 "Luettu %lu riviä (Muunnettu Mac-muodosta - Varoitus: Ei kirjoitusoikeutta)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Luettu %lu rivi (Muunnettu DOS-muodosta)"
 msgstr[1] "Luettu %lu riviä (Muunnettu DOS-muodosta)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -167,503 +196,457 @@ msgstr[0] ""
 msgstr[1] ""
 "Luettu %lu riviä (Muunnettu DOS-muodosta - Varoitus: Ei kirjoitusoikeutta)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Luettu %lu rivi"
 msgstr[1] "Luettu %lu riviä"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] "Luettu %lu rivi (Varoitus: Ei kirjoitusoikeutta)"
 msgstr[1] "Luettu %lu riviä (Varoitus: Ei kirjoitusoikeutta)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Lukee tiedostoa"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Uusi tiedosto"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Ei löytynyt: �%s�"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "�%s� on hakemisto"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "�%s� on laitetiedosto"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Uudessa puskurissa suoritettava komento [kohteesta %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Suoritettava komento [kohteesta %s] "
 
-#  Toisaalla on "Ei voi lisätä tiedostoa hakemiston %s ulkopuolelta",
+#  Toisaalla on "Tiedoston lisääminen hakemiston %s ulkopuolelta epäonnistui",
 #  joten täälläkin on "hakemistosta" eikä "hakemistossa".
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Uuteen puskuriin lisättävä tiedosto [hakemistosta %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Lisättävä tiedosto [hakemistosta %s] "
 
 #  "Virheellinen näppäin yksipuskuritilassa"?
 #  "Komento toimii vain monen puskurin tilassa"?
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Virheellinen näppäin yhden puskurin tilassa"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"Varmuuskopiotiedoston kirjoittaminen epäonnistui, jatketaanko tallentamista? "
+"(Sanoi N jos olet epävarma) "
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "Ei voi kirjoittaa hakemiston %s ulkopuolelle"
+msgstr "Hakemiston %s ulkopuolelle kirjoittaminen epäonnistui"
 
 #  "Prepend" ei ole englanti, oikea sana on "prefix"
 #  "Prepend" is not an English word, use "prefix"
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 "Symboliseen linkkiin ei voi liittää etuliitettä eikä jälkiliikettä "
 "parametrillä �--nofollow set�"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Virhe kirjoitettaessa varmuuskopiotiedostoon %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Liian monta varmuuskopiotiedostoa?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Virhe kirjoitettaessa %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Virhe kirjoitettaessa tilapäiseen tiedostoon: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Kirjoitettu %lu rivi"
 msgstr[1] "Kirjoitettu %lu riviä"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS-muoto]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac-muoto]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Varmuuskopio]"
 
 #  "Prepend" is not an English word, use "prefix"
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Lisää valinta tiedoston alkuun"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Lisää valinta tiedoston loppuun"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Kirjoita valinta tiedostoon"
 
 #  "Alkuun lisättävä tiedosto" olisi väärinpäin.
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Minkä tiedoston alkuun"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Minkä tiedoston loppuun"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Kirjoitettava tiedosto"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Tiedosto olemassa, korvataanko ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Tallennetaanko tiedosto eri nimellä ? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 "Tiedostoa on muokattu sen jälkeen kun avasit sen, jatketaanko "
 "tallentamista ? "
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(jatkuu)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Paina enteriä jatkaaksesi Nanon käynnistämistä.\n"
+"Paina return-painiketta jatkaaksesi Nanon käynnistämistä\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Peru"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Korvaa"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Hakemiston %s luominen epäonnistui: %s\n"
+"Sitä vaaditaan kohdistinkoordinaatin tai etsintähistorian tallentamiseksi/"
+"lataamiseksi.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Älä korvaa"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"Polku %s ei ole hakemisto ja sen pitää olla.\n"
+"Nano ei kykene lataamaan tai tallentamaan etsintää tai "
+"kohdistinkoordinaatteja.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Kirj. koko"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Havaittu perinteinen nano-historiatiedosto (%s), jota yritettiin siirtää\n"
+"parempana pidettyyn sijaintipaikkaan (%s), mutta kohdattiin virhe: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Taaksepäin"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Havaittu perinteinen nano-historiatiedosto (%s), joka siirrettiin\n"
+"parempana pidettyyn sijaintipaikkaan (%s)\n"
+"(katso nano FAQ tästä muutoksesta)"
 
-#  "Äiti, mikä on säännöke?" "Kai se joku pikku sääntö on."
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Säännöke"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Lopeta"
 
-#  Tämä on Etsi-valikossa.
-#  80 sarakkeen näytöllä mahtuu 11 merkkiä.
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "EdHistoria"
+#: src/global.c:478
+msgid "Close"
+msgstr "Sulje"
 
-#  Tämä on Etsi-valikossa.
-#  80 sarakkeen näytöllä mahtuu 11 merkkiä.
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "SeurHistor."
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Liitä"
 
-#  Tämä on "Etsi"-valikossa.
-#  80 sarakkeen näytöllä mahtuu 13 merkkiä, mieluummin 12.
-#  Huomaa myös "Go To Line Help Text".
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Tekstiin"
+#  80 sarakkeen näytöllä mahtuu 10 merkkiä, mieluummin 9.
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Epätasaa"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "EtsiSeuraava"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Ensim. tiedosto"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Viim. tiedosto"
-
-#  Tämä on Kirjoita tiedosto- ja Lisää tiedosto -valikoissa.
-#  80 sarakkeen näytöllä mahtuu 17 merkkiä, mieluummin 16.
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Tiedostoselain"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS-muoto"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac-muoto"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Lisää loppuun"
-
-#  "Prepend" is not an English word, use "prefix"
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Lisää alkuun"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Varmuuskopio"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Suorita komento"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Siirry hakemistoon"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Ohjeita"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Lopeta"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Etsi"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Ed. sivu"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Seur. sivu"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Ensim. rivi"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Korvaa"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Viim. rivi"
+#  Tämä on "Etsi"-valikossa.
+#  80 sarakkeen näytöllä mahtuu 13 merkkiä, mieluummin 12.
+#  Huomaa myös "Go To Line Help Text".
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Rivinumero"
 
-#  Perään tulee "käytössä" tai "ei käytössä".
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Keskeytysnäppäin"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Ed. rivi"
 
-#  "Par" on "paragraph" ?
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Kappalealku"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Seuraava rivi"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Kappaleloppu"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Lue tied."
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "KokoTasaus"
 
 #  "Päivitä"?
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Piirrä uudelleen"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Lisää tiedosto"
-
-#  Tämä on "Etsi"-valikossa.
-#  80 sarakkeen näytöllä mahtuu 13 merkkiä, mieluummin 12.
-#  Huomaa myös "Go To Line Help Text".
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Rivinumero"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Tasaa nykyinen kappale"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Peru nykyinen toiminto"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Näytä tämä ohjeteksti"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Sulje nykyinen tiedostopuskuri / Poistu Nanosta"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Poistu Nanosta"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Kirjoita nykyinen tiedosto levylle"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Lisää toinen tiedosto nykyiseen tiedostoon"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Etsi merkkijonoa tai säännöllistä lauseketta"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Siirry edelliseen ruutuun"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Etsi merkkijonoa"
 
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "Siirry seuraavaan ruutuun"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Siirry ruutu ylöspäin"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Siirry ruutu alaspäin"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Leikkaa nykyinen rivi leiketilaan"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Liitä rivi leiketilasta nykyiselle riville"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Näytä kohdistimen sijainti"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Käynnistä oikoluin (jos saatavilla)"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Korvaa merkkijono tai säännöllinen lauseke"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Siirry riville ja sarakkeelle numero"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Merkitse kohdistimen kohdalla oleva teksti"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Merkitse teksti alkaen kohdistimen kohdalta"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr "Toista viimeisin etsintä"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Leikkaa nykyinen rivi leiketilaan"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Sisennä nykyinen rivi"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Poista nykyisen rivin sisennys"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Peru viimeisin toiminto"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Tee uudelleen viimeisen toiminnon peruminen"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Siirry yksi merkki eteenpäin"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Siirry yksi merkki taaksepäin"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Siirry yksi sana eteenpäin"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Siirry yksi sana taaksepäin"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Siirry edelliselle riville"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Siirry seuraavalle riville"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Siirry nykyisen rivin alkuun"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Siirry nykyisen rivin loppuun"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Siirry kappaleen alkuun; sitten seuraavan kappaleen"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Siirry vain kappaleen loppuun; sitten seuraavan kappaleen"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Siirry tiedoston ensimmäiselle riville"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Siirry tiedoston viimeiselle riville"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Siirry vastaavalle sulkeelle"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Siirry rivi ylöspäin liikuttamatta kohdistinta"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Siirry rivi alaspäin liikuttamatta kohdistinta"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Vaihda edelliseen tiedostopuskuriin"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Vaihda seuraavaan tiedostopuskuriin"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Lisää seuraava näppäily kirjaimellisesti"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Lisää sarkain kohdistimen kohdalle"
 
@@ -671,334 +654,454 @@ msgstr "Lisää sarkain kohdistimen kohdalle"
 msgid "Insert a newline at the cursor position"
 msgstr "Lisää rivinvaihto kohdistimen kohdalle"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Poista kohdistimen kohdalla oleva merkki"
 
 #  "Poista merkki kohdistimen vasemmalta puolelta"?
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Poista kohdistimesta vasemmalle oleva merkki"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Liitä teksti kohdistimesta tiedoston loppuun"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Tasaa nykyinen tiedosto"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Laske sanojen, rivien ja merkkien määrä"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Piirrä ruutu uudestaan"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Keskeytä editori (jos keskeytys on aktivoitu)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Vaihda merkkikoko etsinnässä"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Vaihda etsinnän suunta"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Vaihda säännöllisten lausekkeiden käyttö"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Kutsu takaisin edellinen haettu/korvattu merkkijono"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Kutsu takaisin seuraava haettu/korvattu merkkijono"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Siirry tiedostoselaimeen"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Vaihda DOS-muodon käyttö"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Vaihda Mac-muodon käyttö"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Vaihda liittäminen loppuun"
 
 #  "Prepend" is not an English word, use "prefix"
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Vaihda liittäminen alkuun"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Vaihda alkuperäisen tiedoston varmuuskopiointi"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Suorita ulkoinen komento"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Vaihda uuden puskurin käyttö"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Poistu tiedostoselaimesta"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Siirry luettelon ensimmäiseen tiedostoon"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Siirry luettelon viimeiseen tiedostoon"
 
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "Siirry luettelon seuraavaan tiedostoon"
-
-#: src/global.c:642
+#: src/global.c:634
 msgid "Go to the previous file in the list"
 msgstr "Siirry luettelon edelliseen tiedostoon"
 
-#: src/global.c:643
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Siirry luettelon seuraavaan tiedostoon"
+
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Siirry hakemistoon"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Sulje"
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Käynnistä esikatselu (jos saatavilla)"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Siirry edelliseen esikatseluun"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Siirry seuraavaan esikatseluun"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:642
+msgid "Invoke formatter, if available"
+msgstr "Käynnistä muotoilija (jos saatavilla)"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Ohjeita"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Peru"
+
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Kirjoita"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Siirry hakemistoon"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Leikkaa"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Tasaa"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Lue tied."
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Oikolue"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Leikkaa"
+#  Tämä on "Etsi"-valikossa.
+#  80 sarakkeen näytöllä mahtuu 13 merkkiä, mieluummin 12.
+#  Huomaa myös "Go To Line Help Text".
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Esikatseluun"
 
-#  80 sarakkeen näytöllä mahtuu 10 merkkiä, mieluummin 9.
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Epätasaa"
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Muotoilija"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Liitä"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Kirj. koko"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#  "Äiti, mikä on säännöke?" "Kai se joku pikku sääntö on."
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Säännöke"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Taaksepäin"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Älä korvaa"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Sijainti"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Oikolue"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Ed. sivu"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Seur. sivu"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Ensim. rivi"
 
-#: src/global.c:771
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Viim. rivi"
+
+#  versiossa 1.1.99pre2 hakee merkkejä "([{<>}])"
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Sulkeeseen"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Merkitse tekstiä"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Kopioi"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Sisennä"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Poista sisennys"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Peru"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Tee uudelleen"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Eteenpäin"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Takaisin"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Seuraava sana"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Eteenpäin"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Edellinen sana"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Ed. rivi"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Seuraava rivi"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Seuraava sana"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Koti"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Loppu"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Etsi toinen sulje"
+#  "Par" on "paragraph" ?
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Kappalealku"
 
-#: src/global.c:848
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Kappaleloppu"
+
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Vieritä ylös"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Vieritä alas"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "Edellinen tiedosto"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Seuraava tiedosto"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Merkintarkka syöte"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Merkintarkka"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Sarkain"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Poista"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Askelpalautin"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "LeikLoppuun"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Sanaluku"
 
-#: src/global.c:1367
+#  Perään tulee "käytössä" tai "ei käytössä".
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Keskeytysnäppäin"
+
+#  Tämä on Etsi-valikossa.
+#  80 sarakkeen näytöllä mahtuu 11 merkkiä.
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "EdHistoria"
+
+#  Tämä on Etsi-valikossa.
+#  80 sarakkeen näytöllä mahtuu 11 merkkiä.
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "SeurHistor."
+
+#  Tämä on "Etsi"-valikossa.
+#  80 sarakkeen näytöllä mahtuu 13 merkkiä, mieluummin 12.
+#  Huomaa myös "Go To Line Help Text".
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Tekstiin"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS-muoto"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac-muoto"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Lisää loppuun"
+
+#  "Prepend" is not an English word, use "prefix"
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Lisää alkuun"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Varmuuskopio"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Suorita komento"
+
+#  Tämä on Kirjoita tiedosto- ja Lisää tiedosto -valikoissa.
+#  80 sarakkeen näytöllä mahtuu 17 merkkiä, mieluummin 16.
+#: src/global.c:961
+msgid "To Files"
+msgstr "Tiedostoselain"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Ensim. tiedosto"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Viim. tiedosto"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Ed. esikatselu"
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "Seur. esikats."
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Ohjetila"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Näytä kohdistimen sijainti aina"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Käytä lisäriviä muokkaukseen"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Pehmeä vieritys"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Pitkien rivien pehmeä rivitys"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Tyhjemerkkien näyttö"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Värillinen rakenteen merkintä"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Älykäs kotiavain"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Automaattinen sisennys"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Leikkaa loppuun saakka"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Pitkän rivin jakaminen eri riveille"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Pitkien rivien kova rivitys"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Kirjoitettujen sarkainmerkkien muunnos välilyönneiksi"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Varmuuskopiotiedostot"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Useat puskurit"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Hiirituki"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Ei muunnosta DOS/Mac-muodosta"
 
 # Perään tulee "käytössä" tai "ei käytössä".
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Keskeytysnäppäin"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Pehmeä rivin jakaminen usealle riville"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1019,7 +1122,7 @@ msgstr ""
 "vain enteriä antamatta mitään uutta tekstiä, Nano hakee edellistä "
 "hakutekstiä uudestaan.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1033,7 +1136,7 @@ msgstr ""
 " Seuraavat toimintonäppäimet ovat käytettävissä Etsintä-tilassa:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1052,7 +1155,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä Etsi rivinumero -tilassa:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1076,7 +1179,7 @@ msgstr ""
 "puskuriin. (Tiedostopuskureita voit vaihtaa näppäinkomennoilla Meta-< ja "
 "Meta->).  "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1091,7 +1194,7 @@ msgstr ""
 " Seuraavat toimintonäppäimet ovat käytössä Lisää tiedosto -tilassa:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1119,7 +1222,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä Kirjoita tiedosto -tilassa:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1145,7 +1248,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä tiedostoselaimessa:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1168,7 +1271,7 @@ msgstr ""
 "hakutekstiä uudestaan.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1176,7 +1279,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä selaimen Etsi-tilassa:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1200,7 +1303,7 @@ msgstr ""
 "tilassa:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1224,7 +1327,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä Oikolue-tilassa:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1244,7 +1347,7 @@ msgstr ""
 " Seuraavat funktionäppäimet ovat käytössä Suorita komento -tilassa:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1264,7 +1367,7 @@ msgstr ""
 "muokattava tiedosto. Tilarivi on kolmas rivi alhaalta lukien ja näyttää "
 "tärkeät viestit."
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1282,7 +1385,7 @@ msgstr ""
 "merkitään Meta (M-) -symbolillla ja voidaan kirjoittaa joko Esc, Alt, tai "
 "Meta -näppäimellä riippuen näppäimistösi asetuksista.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1296,15 +1399,15 @@ msgstr ""
 "pääikkunassa. Vaihtoehtoiset näppäimet näytetään sulkeissa:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "päälle/pois"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Virheellinen näppäin katselutilassa"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1313,7 +1416,7 @@ msgstr ""
 "\n"
 "Puskuri kirjoitettu tiedostoon �%s�\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1322,7 +1425,7 @@ msgstr ""
 "\n"
 "Puskuria ei kirjoitettu tiedostoon %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1331,11 +1434,11 @@ msgstr ""
 "\n"
 "Puskuria ei kirjoitettu tiedostoon: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Ikkuna on liian pieni Nanolle...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1344,252 +1447,258 @@ msgstr ""
 "Käyttö: nano [VALITSIMET] [[+RIVI,SARAKE] TIEDOSTO]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Valitsin\t\tPitkä valitsin\t\tMerkitys\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Valitsin\tMerkitys\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Näytä tämä ohje"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+RIVI,SARAKE"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Aloita rivillä RIVI, sarakkeessa SARAKE"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Ota käyttöön älykäs kotinäppäin"
 
 #  "tallennettaessa"?
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Tallenna olemassaolevien tiedostojen varmuuskopiot"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <hak>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<hak>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Hakemisto uniikkien varmuuskopitiedostojen tallentamiseen"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Käytä lihavoitua tekstiä käänteisen videotekstin sijasta"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Muunna näppäillyt sarkainlyönnit välilyönneiksi"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Mahdollista useiden puskureiden käyttö"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Käytä (vim-tyylisiä) lukitustiedostoja"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Muista viimeksi etsityt/korvatut merkkijonot"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Älä käytä nanorc-tiedostoja"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Korjaa numeerisen näppäistön näppäinten sekaantumispulma"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Älä lisää rivinvaihtoa tiedostojen loppuun"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Älä muunna tiedostoja DOS/Mac-muodosta"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Käytä yhtä lisäriviä muokkaukseen"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Kirjaa lokiin ja lue kohdistinkoordinaatin sijainti"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <jono>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<jono>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Lainauksen merkintä"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Rajoitettu tila"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Vieritä rivi kerrallaan puoliruudun sijasta"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#saraketta>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#saraketta>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Aseta sarkaimen leveys #cols -sarakkeeksi"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Tyhjennä tilarivi pikaisesti"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Tulosta versiotiedot ja lopeta"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Havaitse sanarajat tarkemmin"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <jono>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<jono>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Väritykseen käytettävä syntaksimääritys"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Näytä kohdistimen sijainti jatkuvasti"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Korjaa Backspace/Delete -näppäinten sekaantumispulma"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Näytä tämä ohjeteksti"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Sisennä uudet rivit automaattisesti"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Leikkaa rivin loppuun saakka"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Älä seuraa symbolisia linkkejä, vaan korvaa ne tiedostoilla."
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Käytä hiirtä"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Älä lue tiedostoa (vain kirjoita se)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <hak>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<hak>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Aseta toimintahakemisto"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Salli XON (^Q)- ja XOFF (^S) -näppäimet"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Älä ilmoita käynnistyspulmista kuten rc-tiedoston virheistä"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#sarakkeet>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#sarakkeet>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Aseta rivityspiste sarakkeeseen #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Aseta kova rivitys sarakkeeseen #cols"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <ohjelma>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<ohjelma>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Käytö vaihtoehtoista oikolukuohjelmaa"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Tallenna tiedosto kysymättä poistuttaessa"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Ota käyttöön yleinen perumistoiminto [KOKEELLINEN]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Katselutila (vain luku)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Älä rivitä pitkiä rivejä"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Älä kovarivitä pitkiä rivejä"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Älä näytä kahta avusteriviä"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Ota käyttöön keskeyttäminen"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "Ota käyttöön pehmeä rivitys"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(eivät vaikuta Nanoon; Pico käyttäisi)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU Nano, versio %s (käännetty %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Sähköposti: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1598,155 +1707,181 @@ msgstr ""
 "\n"
 " Mukaan käännetyt valitsimet:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Tämä ominaisuus ei ikävä kyllä ole käytössä"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Ei tiedostonimeä"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Tallenna muutettu teksti (Muutokset häviävät, jos vastaat �ei�) ? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr "Ei voitu valitettavasti avata uudelleen vakiosyötettä näppäimistöstä\n"
+msgstr "Vakiosyötteen avaaminen uudelleen näppäimistöstä epäonnistui\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Luetaan vakiosyötteestä, ^C lopettaa toiminnon\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Vastaanotettiin SIGHUP tai SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Palaa Nanoon komennolla �fg�.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "käytössä"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "ei käytössä"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Tuntematon komento"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON:ia ei käytetä, mutinaa"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF:ia ei käytetä, mutinaa"
 
 #  puuttuu tai liian iso tai liian pieni
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Haluttu sarkaimen koko �%s� ei kelpaa"
 
 #  puuttuu tai liian iso tai liian pieni
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Haluttu täydennyspituus �%s� ei kelpaa"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Hae käytettävissä olevat valitsimet kirjoittamalla ’%s -h’.\n"
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "KkYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "EeNn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "aA"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Kaikki"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Ei"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Virhe tiedostossa %s rivillä %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "parametri ’%s’ sisältää parittoman �-merkin"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Säännöllisten lausekkeiden on alettava ja loputtava �-merkillä"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Säännöllinen lauseke �%s� ei kelpaa: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Puuttuva syntaksin nimi"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "Syntaksi �none� on varattu"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Syntaksi �default� ei saa ottaa laajennuksia"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Puuttuva näppäinnimi"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "Näppäinsidontojen on alettava merkeillä �^�, �M�, tai �F�"
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Näppäinnimi on liian lyhyt"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Näppäinnimien on alettava merkeillä �^�, �M�, tai �F�"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr "On määriteltävä funktionäppäin, johon näppäin sidotaan"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "On määriteltävä valikko, johon näppäin sidotaan (tai �all�)"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
+"On määriteltävä valikko (tai �all�), johon näppäin sidotaan/josta näppäin "
+"irrotetaan"
+
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Nimen �%s� kartoittaminen funktioon epäonnistui"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Ei voitu kartoittaa nimeä �%s� funktioon"
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Nimen �%s� kartoittaminen valikkoon epäonnistui"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:528
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Ei voitu kartoittaa nimeä �%s� valikkoon"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Funktiota ’%s’ ei ole valikossa ’%s’"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:543
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Valitettavasti näppäinmerkkijonossa �%s� on väärä sidonta"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Virhe laajennettaessa kohdetta %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1761,137 +1896,194 @@ msgstr ""
 "�black�, ja alussa voi olla �bright�\n"
 "edustaväreinä."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "En voi lisätä värikomentoa ilman syntaksikomentoa"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Puuttuva värin nimi"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Taustaväri �%s� ei  voi olla �bright�"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Puuttuva säännöllinen lausekemerkkijono"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "�start=� vaatii vastaavan �end=�:n"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Taustaväri �%s� ei voi olla �bright�"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
-msgstr "Ei voi lisätä säännöllistä otsakelauseketta ilman syntaksikomentoa"
+msgstr "En voi lisätä säännöllistä otsakelauseketta ilman syntaksikomentoa"
+
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+"En voi lisätä maagista säännöllistä otsakelauseketta ilman syntaksikomentoa"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Puuttuva maaginen säännöllinen lausekemerkkijono"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "En voi lisätä esikatselua ilman syntaksikomentoa"
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Puuttuva esikatselukomento"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "En voi lisätä muotoilijaa ilman syntaksikomentoa"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Puuttuva muotoilijakomento"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Vakava virhe: funktioon �%s� ei ole kartoitettu näppäimiä"
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr ""
+"Vakava virhe: funktioon �%s� ei ole kartoitettu näppäimiä. Poistutaan.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Poistutaan. Käytä Nano-ohjelmaa �-I�-valitsimella, jos nanorc-asetuksia "
-"täytyy säätää\n"
+"Tarvittaessa käytä Nano-ohjelmaa �-I�-valitsimella, jos nanorc-asetuksia "
+"täytyy säätää.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Laajennettavan syntaksin �%s� löytäminen epäonnistui"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Komentoa �%s� ei sallita sisällytetyssä tiedostossa"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Syntaksissa �%s� ei ole värikomentoja"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Komentoa �%s� ei ymmärretty"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Puuttuva lippu"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Puuttuva valitsin"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "valitsin �%s� vaatii argumentin"
+msgstr "Valitsin �%s� vaatii argumentin"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Valitsin ei ole monitavuinen merkkijono"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Ei-tyhjemerkkejä vaadittu"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Kaksi yksisarakkeista merkkiä vaadittu"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Ei voi poistaa lippua �%s�"
+msgid "Cannot unset option \"%s\""
+msgstr "En voi poistaa valitsinta �%s�"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Tuntematon lippu �%s�"
+msgid "Unknown option \"%s\""
+msgstr "Tuntematon valitsin �%s�"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Kotihakemistoa ei löydy! Vää!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Paina enteriä jatkaaksesi Nanon käynnistämistä.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "�%.*s%s� ei löytynyt"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Kirj. koko]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Säännöke]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Taaksepäin]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (korvattava) valinnassa"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (korvattava)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Korvataanko tämä kohta?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Korvaa merkkijonolla"
 
 # Pitäisiköhän olla passiivi?
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Korvattu %lu kohta"
 msgstr[1] "Korvattu %lu kohtaa"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Kirjoita rivin numero, sarakkeen numero"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Virheellinen rivi- tai sarakenumero"
 
 #  versiossa 1.1.99pre2 hakee merkkejä "([{<>}])"
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ei ole suljemerkki"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Ei vastaavaa suljetta"
 
@@ -1903,712 +2095,335 @@ msgstr "Merkintä alkoi"
 msgid "Mark Unset"
 msgstr "Merkintä loppui"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Peruutuspuskurissa ei ole mitään!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
-msgstr "Sisäinen virhe: vastaavaa riviä %d ei löydy. Tallenna työsi"
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Sisäinen virhe: vastaavaa riviä %d ei löydy. Tallenna työsi."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "teksti lisää"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "teksti poista"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "rivittäminen"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "rivin liittäminen"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "tekstileikkaus"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "testin leikkauksen peruutus"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "rivin katkaiseminen"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "teksti lisää"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "teksti korvaa"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Sisäinen virhe: tuntematon tyyppi. Tallenna työsi"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Sisäinen virhe: tuntematon tyyppi. Tallenna työsi."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Peruttu toiminto (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Ei mitään tehtävää!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "Sisäinen virhe: Uudelleenteon asetukset epäonnistuivat. Tallenna työsi"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "Sisäinen virhe: komennon redo asettaminen epäonnistui. Tallenna työsi."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Toiminto tehtiin uudelleen (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Ei voitu tehdä putkea"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Putken luominen epäonnistui"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
-msgstr "Ei voitu tehdä lapsiprosessia"
+msgstr "Lapsiprosessi epäonnistui"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr "Sisäinen virhe: ei voi asettaa uncut-komentoa. Tallenna työsi"
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Sisäinen virhe: tuntematon tyyppi. Tallenna työsi."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
+msgstr ""
+"Sisäinen virhe: komennon uncut asettaminen epäonnistui. Tallenna työsi."
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Lainausmerkintä %s ei kelpaa: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Tasaamisen voi perua nyt."
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Muokkaa korvausta"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Ei voitu tehdä putkea"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Luodaan väärin kirjoitettujen sanojen lista, ole hyvä ja odota..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Putken puskurin kokoa ei saatu selville"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Virhe komennon �spell� aikana"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Virhe komennon �sort -f� aikana"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Virhe komennon �uniq� aikana"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Oikoluku on valmis"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Virhe kutsuttaessa kohdetta �%s�"
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Käynnistä oikoluin, odota hetki"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Oikoluku epäonnistui: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Oikoluku epäonnistui: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Esikatselua ei ole määritelty tämäntyyppiselle tiedostolle"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Tallennetaanko muokattu puskuri ennen esikatselua?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Kutsutaan esikastelua, odota vähän"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Saatiin 0 jäsenneltäviltä riveiltä komennosta: %s"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+"Tämä viesti on avamaattomalle tiedostolle %s, avataanko se uudessa "
+"puskurissa?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Viimeisessä viestissä"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Ensimmäisessä viestissä"
+
+#: src/text.c:3250
+#, fuzzy
+msgid "Error: no formatter defined"
+msgstr "Virhe: esikatselua ei ole määritelty"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Valmis"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Kutsutaan muotoilijaa, odota vähän"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Lopetettiin muotoilu"
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sSanoja: %lu  riviä: %ld  merkkiä: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
-msgstr "Valinnassa:"
+msgstr "Valinnassa:    "
+
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Merkintarkka syöte"
 
-#: src/utils.c:405 src/utils.c:417
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "Nanolta loppui muisti!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Unikoodisyöte"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Muokattu"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Näkymä"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "HAKEMISTO:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Tiedosto:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Varoitus: Muokataan tiedostoa, joka ei ole lukittu, tarkista hakemiston "
+"käyttöoikeudet?"
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "rivi %ld/%ld (%d%%), sarake %lu/%lu (%d%%), merkki %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Nano-editori"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "versio"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Tehneet:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Erikoiskiitokset:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation"
 
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "monta kielenkääntäjää ja Translationproject"
+
 #  Special thanks to: (nimiä) For ncurses: (nimiä)
-#: src/winio.c:3497
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Ncursesista:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "ja kaikille muille, jotka unohdimme..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Kiitos Nanon käyttämisestä!"
 
-#~ msgid "Error writing backup file %s: File owner mismatch"
-#~ msgstr ""
-#~ "Virhe kirjoitettaessa varmuuskopiotiedostoon %s: Tiedoston "
-#~ "omistajatäsmäämättömyys"
-
-#~ msgid "Space"
-#~ msgstr "Väli"
-
-#~ msgid "Come on, be reasonable"
-#~ msgstr "Jotakin järkevää, kiitos?"
-
-#~ msgid "File to insert into new buffer [from ./] "
-#~ msgstr "Uuteen puskuriin lisättävä tiedosto [hakemistosta ./] "
-
-#~ msgid "File to insert [from ./] "
-#~ msgstr "Lisättävä tiedosto [hakemistosta ./] "
-
-# Oikeasti ohjelma tuossa kohtaa vasta avaa tiedoston, mutta eipä
-# englanninkielinenkään versio käyttäjälle sitä kerro.
-#~ msgid "Could not read %s for backup: %s"
-#~ msgstr "Tiedostoa %s ei voitu lukea varmuuskopioitavaksi: %s"
-
-#~ msgid "Couldn't write backup: %s"
-#~ msgstr "Varmuuskopiota ei voitu kirjoittaa: %s"
-
-# Allatiivi kuulostaa väärältä.
-#~ msgid "Could not set permissions %o on backup %s: %s"
-#~ msgstr "Oikeuksia %o ei voitu asettaa varmuuskopiolle %s: %s"
-
-# Allatiivi kuulostaa väärältä.
-#
-# "Varmuuskopion %3$s omistajaa ei voitu asettaa %1$d:ksi ja ryhmää %2$d:ksi: %4$s"?
-# "Varmuuskopiota %3$s ei voitu siirtää käyttäjän %1$d ja ryhmän %2$d omistukseen: %4$s"?
-# "Käyttäjää %d ja ryhmää %d ei voitu asettaa varmuuskopion %s omistajaksi: %s"?
-#~ msgid "Could not set owner %d/group %d on backup %s: %s"
-#~ msgstr "Omistajaa %d ja ryhmää %d ei voitu asettaa varmuuskopiolle %s: %s"
-
-# Allatiivi kuulostaa väärältä.
-#
-# Mitenhän ajat pitäisi kääntää? Unixissa niitä on kolme:
-# * atime = access time
-#   - milloin tiedoston sisältöä on luettu (read, execve)
-#   - "käyttöaika", "lukuaika"?
-# * mtime = modification time
-#   - milloin tiedoston sisältöä on muutettu (write)
-#   - "muutosaika", "kirjoitusaika"?
-# * ctime = change time
-#   - milloin metatietoja on muutettu (chown, chmod, link, unlink)
-#   - "luontiaika"?
-#~ msgid "Could not set access/modification time on backup %s: %s"
-#~ msgstr "Varmuuskopion %s käyttö- ja muutosaikaa ei voitu asettaa: %s"
-
-#~ msgid "Could not open file for writing: %s"
-#~ msgstr "Tiedostoa ei voitu avata kirjoitettavaksi: %s"
-
-#~ msgid "Could not close %s: %s"
-#~ msgstr "Tiedostoa %s ei voitu sulkea: %s"
-
-#~ msgid "Could not reopen %s: %s"
-#~ msgstr "Tiedostoa %s ei voitu avata uudestaan: %s"
-
-# Ohjelma on tallentanut puskurin väliaikaiseen tiedostoon. Nyt se avaa
-# alkuperäisen tiedoston ja kopioi sen sisällön väliaikaistiedoston
-# perään. Jos tämä onnistuu, niin seuraavaksi se siirtää
-# väliaikaistiedoston alkuperäisen tilalle.
-#~ msgid "Could not open %s for prepend: %s"
-#~ msgstr "Tiedostoa %s ei voitu avata alkuun kirjoittamista varten: %s"
-
-# Allatiivi kuulostaa väärältä.
-#~ msgid "Could not set permissions %o on %s: %s"
-#~ msgstr "Oikeuksia %o ei voitu asettaa tiedostolle %s: %s"
-
-#~ msgid "Can't open \"%s\": %s"
-#~ msgstr "Hakemistoa �%s� ei voi avata: %s"
-
-#~ msgid "Goto Cancelled"
-#~ msgstr "Siirtyminen peruttu"
-
-#~ msgid "Unable to open ~/.nano_history file, %s"
-#~ msgstr "Ei voi avata tiedostoa ~/.nano_history: %s"
-
-#~ msgid "Unable to write ~/.nano_history file, %s"
-#~ msgstr "Ei voi kirjoittaa tiedostoa ~/.nano_history: %s"
-
-# Perään tulee "käytössä" tai "ei käytössä".
-#~ msgid "Writing file in DOS format"
-#~ msgstr "Tiedoston kirjoitus DOS-muodossa"
-
-# Perään tulee "käytössä" tai "ei käytössä".
-#~ msgid "Writing file in Mac format"
-#~ msgstr "Tiedoston kirjoitus Mac-muodossa"
-
-# Perään tulee "käytössä" tai "ei käytössä".
-#~ msgid "Backing up file"
-#~ msgstr "Varmuuskopiointi"
-
-#~ msgid "Auto wrap"
-#~ msgstr "Automaattinen rivitys"
-
-#~ msgid "Invoke the help menu"
-#~ msgstr "Avaa ohjevalikko"
-
-#~ msgid "Unjustify after a justify"
-#~ msgstr "Poista tasaus tasauksen jälkeen"
-
-#~ msgid "Replace text within the editor"
-#~ msgstr "Etsi ja korvaa tekstiä"
-
-#~ msgid "Search for text within the editor"
-#~ msgstr "Etsi tekstiä"
-
-#~ msgid "Move up one line"
-#~ msgstr "Siirry yksi rivi yläspäin"
-
-#~ msgid "Move down one line"
-#~ msgstr "Siirry yksi rivi alaspäin"
-
-#~ msgid "Insert a tab character"
-#~ msgstr "Lisää sarkainmerkki"
-
-# 80 sarakkeen näytöllä mahtuu 56 merkkiä.
-#~ msgid "Make the current search or replace case (in)sensitive"
-#~ msgstr "Muuta, huomioiko etsintä tai korvaus kirjainkokoa (a/A)"
-
-#~ msgid "Prepend to the current file"
-#~ msgstr "Lisää levyllä olevan tiedoston alkuun"
-
-#~ msgid "Search backwards"
-#~ msgstr "Etsi taaksepäin"
-
-#~ msgid "Write file out in DOS format"
-#~ msgstr "Kirjoita tiedosto DOS-muodossa"
-
-#~ msgid "Write file out in Mac format"
-#~ msgstr "Kirjoita tiedosto Mac-muodossa"
-
-# "tallennettaessa"?
-#~ msgid "Back up original file when saving"
-#~ msgstr "Tee varmuuskopio alkuperäisestä tiedostosta talletettaessa"
-
-#~ msgid "Find other bracket"
-#~ msgstr "Etsi toinen suljemerkki"
-
-# "edellinen"?
-#~ msgid "Open previously loaded file"
-#~ msgstr "Avaa viimeksi ladattu tiedosto"
-
-# "seuraavaksi"?
-#~ msgid "Open next loaded file"
-#~ msgstr "Avaa seuraava ladattu tiedosto"
-
-#~ msgid "Up"
-#~ msgstr "Yläs"
-
-#~ msgid "Down"
-#~ msgstr "Alas"
-
-#~ msgid "Direction"
-#~ msgstr "Suunta"
-
-#~ msgid ""
-#~ "Usage: nano [+LINE] [GNU long option] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Käyttö: nano [+RIVI] [GNU pitkät valitsimet] [valitsimet] [tiedosto]\n"
-
-#~ msgid ""
-#~ "Usage: nano [+LINE] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Käyttö: nano [+RIVI] [valitsimet] [tiedosto]\n"
-#~ "\n"
-
-#~ msgid "+LINE"
-#~ msgstr "+RIVI"
-
-#~ msgid "Use alternate keypad routines"
-#~ msgstr "Käytä vaihtoehtoisia näppäimistörutiineja"
-
-#~ msgid "Do regular expression searches"
-#~ msgstr "Etsi säännällisillä lausekkeilla"
-
-#~ msgid "-T [num]"
-#~ msgstr "-T [luku]"
-
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "Rivitä annettua pidemmät rivit"
-
-#~ msgid "Could not create a temporary filename: %s"
-#~ msgstr "Väliaikaista tiedostonnimeä ei voitu luoda: %s"
-
-#~ msgid "Spell checking failed: unable to write temp file!"
-#~ msgstr "Oikoluku epäonnistui: väliaikaistiedostoa ei voitu kirjoittaa"
-
-#~ msgid "Cannot resize top win"
-#~ msgstr "Yläikkunan kokoa ei voi muuttaa"
-
-#~ msgid "Cannot move top win"
-#~ msgstr "Yläikkunaa ei voi siirtää"
-
-#~ msgid "Cannot resize edit win"
-#~ msgstr "Muokkausikkunan kokoa ei voi muuttaa"
-
-#~ msgid "Cannot move edit win"
-#~ msgstr "Muokkausikkunaa ei voi siirtää"
-
-#~ msgid "Cannot resize bottom win"
-#~ msgstr "Alaikkunan kokoa ei voi muuttaa"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr "Sisäinen virhe: vastaavaa riviä %ld ei löydy. Tallenna työsi."
 
-#~ msgid "Cannot move bottom win"
-#~ msgstr "Alaikkunaa ei voi siirtää"
+#~ msgid "line wrap"
+#~ msgstr "rivittäminen"
 
-#~ msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
-#~ msgstr ""
-#~ "NumLock-ongelma: Numeronäppäimistö toimii väärin, kun NumLock ei ole "
-#~ "päällä."
-
-#~ msgid "Tab size is too small for nano...\n"
-#~ msgstr "Sarkaimen leveys on liian pieni Nanolle...\n"
-
-#~ msgid "Errors found in .nanorc file"
-#~ msgstr "Tiedostossa .nanorc oli virheitä"
-
-#~ msgid "Unable to open ~/.nanorc file, %s"
-#~ msgstr "Ei voi avata tiedostoa ~/.nanorc: %s"
-
-#~ msgid "\"%s...\" not found"
-#~ msgstr "�%s...� ei löytynyt"
-
-#~ msgid "Invalid regex �%s�"
-#~ msgstr "Virheellinen säännöllinen lauseke �%s�"
-
-#~ msgid "Search Cancelled"
-#~ msgstr "Etsintä peruttu"
-
-#~ msgid "Replace Cancelled"
-#~ msgstr "Korvaus peruttu"
-
-#~ msgid "Replace failed: unknown subexpression!"
-#~ msgstr "Korvaus epäonnistui: tuntematon alilauseke!"
-
-#~ msgid "Aborted"
-#~ msgstr "Keskeytetty"
-
-#~ msgid "  File: ..."
-#~ msgstr "  Tiedosto: ..."
-
-#~ msgid "   DIR: ..."
-#~ msgstr "   HAKEMISTO: ..."
-
-#~ msgid "Refusing 0 length regex match"
-#~ msgstr "En hyväksy 0-pituista säännöllisen lausekkeen osumaa"
-
-#~ msgid "add_to_cutbuffer() called with inptr->data = %s\n"
-#~ msgstr "add_to_cutbuffer() kutsuttu, inptr->data = %s\n"
-
-#~ msgid "Blew away cutbuffer =)\n"
-#~ msgstr "Leiketila katosi =)\n"
-
-#~ msgid "filename is %s\n"
-#~ msgstr "tiedoston nimi on %s\n"
-
-#~ msgid "%s: free'd a node, YAY!\n"
-#~ msgstr "%s: solmu vapautettu, YAY!\n"
-
-#~ msgid "%s: free'd last node.\n"
-#~ msgstr "%s: viimeinen solmu vapautettu.\n"
-
-#~ msgid "Backing up %s to %s\n"
-#~ msgstr "Kopioin tiedoston %s tiedostoksi %s\n"
-
-#~ msgid "Wrote >%s\n"
-#~ msgstr "Kirjoitettu: >%s\n"
-
-#~ msgid "current->data now = \"%s\"\n"
-#~ msgstr "current->data nyt = �%s�\n"
-
-#~ msgid "After, data = \"%s\"\n"
-#~ msgstr "Jälkeenpäin data = �%s�\n"
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Ota käyttöön yleinen perumistoiminto [KOKEELLINEN]"
 
-#~ msgid "Main: set up windows\n"
-#~ msgstr "Pääohjelma: ikkunoiden asettelu\n"
+#~ msgid "Insert File"
+#~ msgstr "Lisää tiedosto"
 
-#~ msgid "Main: bottom win\n"
-#~ msgstr "Pääohjelma: alaikkuna\n"
+#~ msgid "Go to previous screen"
+#~ msgstr "Siirry edelliseen ruutuun"
 
-#~ msgid "Main: open file\n"
-#~ msgstr "Pääohjelma: avaa tiedosto\n"
+#~ msgid "Find Other Bracket"
+#~ msgstr "Etsi toinen sulje"
 
-#~ msgid "AHA!  %c (%d)\n"
-#~ msgstr "Ahaa! %c (%d)\n"
+#~ msgid "Long line wrapping"
+#~ msgstr "Pitkän rivin jakaminen eri riveille"
 
-#~ msgid "I got Alt-O-%c! (%d)\n"
-#~ msgstr "Vastaanotettu Alt-O-%c! (%d)\n"
+#~ msgid "Soft line wrapping"
+#~ msgstr "Pehmeä rivin jakaminen usealle riville"
 
-#~ msgid "I got Alt-[-1-%c! (%d)\n"
-#~ msgstr "Vastaanotettu Alt-[-1-%c! (%d)\n"
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(eivät vaikuta Nanoon; Pico käyttäisi)"
 
-#~ msgid "I got Alt-[-2-%c! (%d)\n"
-#~ msgstr "Vastaanotettu Alt-[-2-%c! (%d)\n"
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "On määriteltävä valikko, johon näppäin sidotaan (tai �all�)"
 
-#~ msgid "I got Alt-[-%c! (%d)\n"
-#~ msgstr "Vastaanotettu Alt-[-%c! (%d)\n"
+#~ msgid "Missing flag"
+#~ msgstr "Puuttuva lippu"
 
-#~ msgid "I got Alt-%c! (%d)\n"
-#~ msgstr "Vastaanotettu Alt-%c! (%d)\n"
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Sisäinen virhe: tuntematon tyyppi. Tallenna työsi"
 
-#~ msgid "I got %c (%d)!\n"
-#~ msgstr "Vastaanotettu %c (%d)!\n"
-
-#~ msgid "Adding new syntax after 1st\n"
-#~ msgstr "Lisään syntaksin ensimmäisen jälkeen\n"
-
-#~ msgid "Starting a new syntax type\n"
-#~ msgstr "Aloitan uuden syntaksityypin\n"
-
-#~ msgid "Starting a new colorstring for fg %d bg %d\n"
-#~ msgstr "Aloitan uuden värimerkkijonon fg: %d bg: %d\n"
-
-#~ msgid "Adding new entry for fg %d bg %d\n"
-#~ msgstr "Lisään uuden määrityksen fg: %d bg: %d\n"
-
-#~ msgid "%s: Read a comment\n"
-#~ msgstr "%s: Luki kommentin\n"
-
-#~ msgid "%s: Parsing option %s\n"
-#~ msgstr "%s: Tulkitsee asetusta %s\n"
-
-#~ msgid "set flag %d!\n"
-#~ msgstr "asetti lipun %d!\n"
-
-#~ msgid "actual_x for xplus=%d returns %d\n"
-#~ msgstr "actual_x parametrilla xplus=%d palauttaa %d\n"
-
-#~ msgid "Aha! '%c' (%d)\n"
-#~ msgstr "Ahaa! '%c' (%d)\n"
-
-#~ msgid "input '%c' (%d)\n"
-#~ msgstr "syäte '%c' (%d)\n"
-
-#~ msgid "Moved to (%d, %d) in edit buffer\n"
-#~ msgstr "Kohtaan (%d,%d) siirrytty muokkausruudussa\n"
-
-#~ msgid "I got \"%s\"\n"
-#~ msgstr "Saatiin �%s�\n"
-
-#~ msgid "Dumping file buffer to stderr...\n"
-#~ msgstr "Syöttää tiedoston stderriin...\n"
-
-#~ msgid "Dumping cutbuffer to stderr...\n"
-#~ msgstr "Syöttää leiketilan stderriin...\n"
-
-#~ msgid "Dumping a buffer to stderr...\n"
-#~ msgstr "Syöttää tekstin stderriin...\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "The -p flag now invokes the Pico \"preserve\" flag.\n"
-#~ "The Pico compatibility flag has been removed as nano\n"
-#~ "now fully Pico compatible.  Please see the nano FAQ\n"
-#~ "for more info on this change...\n"
-#~ "\n"
-#~ "Press return to continue\n"
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
 #~ msgstr ""
-#~ "\n"
-#~ "-p-valitsin tarkoittaa nyt Picon �preserve�-valitsinta.\n"
-#~ "Pico-yhteensopivuusvalitsin on poistettu, koska Nano on\n"
-#~ "nyt täysin Pico-yhteensopiva. Lue Nanon FAQ:sta\n"
-#~ "lisätietoja tästä muutoksesta...\n"
-#~ "\n"
-#~ "Paina enteriä jatkaaksesi\n"
-
-#~ msgid "Generic error"
-#~ msgstr "Yleinen virhe"
-
-#~ msgid "Can't visit parent in restricted mode"
-#~ msgstr "Ei voi siirtyä ylähakemistoon rajoitetussa tilassa"
-
-#~ msgid "delete_node(): free'd a node, YAY!\n"
-#~ msgstr "delete_node(): solmu vapautettu, YAY!\n"
-
-#~ msgid "delete_node(): free'd last node.\n"
-#~ msgstr "delete_node(): viimeinen solmu vapautettu.\n"
-
-#~ msgid "Press return to continue\n"
-#~ msgstr "Paina return-painiketta jatkaaksesi Nanon käynnistämistä\n"
+#~ "Sisäinen virhe: Uudelleenteon asetukset epäonnistuivat. Tallenna työsi"
 
-#~ msgid "read_line: not on first line and prev is NULL"
-#~ msgstr "read_line: ei ensimmäisellä rivillä ja prev on NULL"
+#~ msgid "Could not pipe"
+#~ msgstr "Putki epäonnistui"
 
-#~ msgid "Pico mode"
-#~ msgstr "Pico-tila"
-
-#~ msgid "Emulate Pico as closely as possible"
-#~ msgstr "Jäljittele Picoa mahdollisimman tarkasti"
-
-#~ msgid "Replaced 1 occurrence"
-#~ msgstr "Korvattu 1 tapahtuma"
-
-#~ msgid "Replace with [%s]"
-#~ msgstr "Korvaa merkkijonolla [%s]"
-
-#~ msgid "nano: realloc: out of memory!"
-#~ msgstr "nano: realloc: muisti loppui!"
-
-#~ msgid " -T \t\t--tabsize=[num]\t\tSet width of a tab to num\n"
-#~ msgstr " -T \t\t--tabsize=[luku]\tAseta sarkaimen leveys\n"
-
-#~ msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
-#~ msgstr " -R\t\t--regexp\t\tEtsi säännöllisillä lausekkeilla\n"
-
-#~ msgid " -V \t\t--version\t\tPrint version information and exit\n"
-#~ msgstr " -V \t\t--version\t\tTulosta versiotiedot ja lopeta\n"
-
-#~ 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"
-
-#~ msgid " -h \t\t--help\t\t\tShow this message\n"
-#~ msgstr " -h \t\t--help\t\t\tNäytä tämä ohje\n"
-
-#~ 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 leikkaa rivin loppuun saakka\n"
-
-#~ msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
-#~ msgstr " -i \t\t--autoindent\t\tSisennä uudet rivit automaattisesti\n"
-
-#~ 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"
-
-#~ msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
-#~ msgstr " -m \t\t--mouse\t\t\tKäytä hiirtä\n"
-
-#~ 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"
-
-#~ msgid " -p\t \t--pico\t\t\tEmulate Pico as closely as possible\n"
-#~ msgstr " -p\t \t--pico\t\t\tJäljittele Picoa mahdollisimman tarkasti\n"
-
-#~ msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
-#~ msgstr ""
-#~ " -s [ohjelma] \t--speller=[ohjelma]\tKäytä annettua oikolukuohjelmaa\n"
-
-#~ msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
+#~ msgid "Error writing backup file %s: File owner mismatch"
 #~ msgstr ""
-#~ " -t \t\t--tempfile\t\tTallenna tiedosto kysymättä\n"
-#~ "\t\t\t\t\tpoistuttaessa \n"
-
-#~ msgid " -v \t\t--view\t\t\tView (read only) mode\n"
-#~ msgstr " -v \t\t--view\t\t\tKatselutila (vain luku)\n"
-
-#~ msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
-#~ msgstr " -w \t\t--nowrap\t\tÄlä rivitä pitkiä rivejä\n"
-
-#~ msgid " -x \t\t--nohelp\t\tDon't show help window\n"
-#~ msgstr " -x \t\t--nohelp\t\tÄlä näytä ohjeikkunaa\n"
-
-#~ msgid " -z \t\t--suspend\t\tEnable suspend\n"
-#~ msgstr " -z \t\t--suspend\t\tMahdollista keskeyttäminen\n"
-
-#~ msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
-#~ msgstr " +RIVI\t\t\t\t\tSiirry riville RIVI\n"
-
-#~ msgid " -R\t\tUse regular expressions for search\n"
-#~ msgstr " -R\t\tEtsi säännöllisillä lausekkeilla\n"
-
-#~ msgid "check_wrap called with inptr->data=\"%s\"\n"
-#~ msgstr "check_wrap-funktion parametri inptr->data=�%s�\n"
-
-#~ msgid "Case Sensitive Search%s%s"
-#~ msgstr "Kirjainkokotarkka etsintä%s%s"
-
-#~ msgid "Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses"
-#~ msgstr "Pavel Curtis, Zeyd Ben-Halim ja Eric S. Raymond ncursesista"
-
-#~ msgid "Backwards search"
-#~ msgstr "Taaksepäin etsintä"
-
-#~ msgid "Goto"
-#~ msgstr "Siirry"
-
-#~ msgid "nano: calloc: out of memory!"
-#~ msgstr "nano: calloc: muisti loppui!"
+#~ "Virhe kirjoitettaessa varmuuskopiotiedostoon %s: Tiedoston "
+#~ "omistajatäsmäämättömyys"
 
-#~ msgid " -D \t\t--dos\t\t\tWrite file in DOS format\n"
-#~ msgstr " -D \t\t--dos\t\t\tKirjoita tiedosto DOS-muodossa\n"
+#~ msgid "Space"
+#~ msgstr "Väli"
 
-#~ msgid " -F \t\t--multibuffer\t\tEnable multiple file buffers\n"
-#~ msgstr " -F \t\t--multibuffer\t\tMahdollista useiden puskureiden käyttö\n"
+#~ msgid "Come on, be reasonable"
+#~ msgstr "Jotakin järkevää, kiitos?"
 
-#~ msgid " -M \t\t--mac\t\t\tWrite file in Mac format\n"
-#~ msgstr " -M \t\t--mac\t\t\tKirjoita tiedosto Mac-muodossa\n"
+#~ msgid "File to insert into new buffer [from ./] "
+#~ msgstr "Uuteen puskuriin lisättävä tiedosto [hakemistosta ./] "
 
-#~ msgid " -S\t\t--smooth\t\tSmooth scrolling\n"
-#~ msgstr " -S\t\t--smooth\t\tPehmeä vieritys\n"
+#~ msgid "File to insert [from ./] "
+#~ msgstr "Lisättävä tiedosto [hakemistosta ./] "
diff --git a/po/fr.gmo b/po/fr.gmo
index b6a23c7..f2ed1a0 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 9b65df9..f6671f2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,30 +1,34 @@
-# Translation of the nano editor to French
-# Messages en langue française pour l'éditeur nano
+# Translation of the nano editor to French.
+# Messages en langue française pour l'éditeur nano.
 # Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
 # Pierre Tane <tanep@bigfoot.com>, 2000.
 # Clement Laforet <sheep.killer@free.fr>, 2000.
 # Michel Robitaille <robitail@IRO.UMontreal.CA>, 2001.
-# Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>, 2001-2010.
+# Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir.org>, 2001-2015.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-10-30 15:43+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 00:43+0100\n"
 "Last-Translator: Jean-Philippe Guérard <jean-philippe.guerard@corbeaunoir."
 "org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
 #
 # File: src/browser.c, line: 207
 # File: src/browser.c, line: 207
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Changer de répertoire"
 
@@ -45,9 +49,9 @@ msgstr "Changer de répertoire"
 # File: src/search.c, line: 212
 # File: src/search.c, line: 934
 # File: src/search.c, line: 995
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Annulé"
 
@@ -56,7 +60,7 @@ msgstr "Annulé"
 # File: src/browser.c, line: 299
 # File: src/browser.c, line: 246
 # File: src/browser.c, line: 299
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "En mode restreint, sortir de %s est impossible"
@@ -90,10 +94,10 @@ msgstr "En mode restreint, sortir de %s est impossible"
 # File: src/rcfile.c, line: 366
 # File: src/rcfile.c, line: 383
 # File: src/rcfile.c, line: 913
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Erreur lors de la lecture de %s : %s"
@@ -101,7 +105,7 @@ msgstr "Erreur lors de la lecture de %s : %s"
 #
 # File: src/browser.c, line: 288
 # File: src/browser.c, line: 288
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Impossible de passer au répertoire supérieur"
 
@@ -112,13 +116,13 @@ msgstr "Impossible de passer au répertoire supérieur"
 # File: src/browser.c, line: 569
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(rép.)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(remonter)"
 
@@ -127,51 +131,19 @@ msgstr "(remonter)"
 # File: src/search.c, line: 179
 # File: src/browser.c, line: 651
 # File: src/search.c, line: 179
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Recherche"
 
 #
-# File: src/browser.c, line: 655
-# File: src/search.c, line: 183
-# File: src/browser.c, line: 655
-# File: src/search.c, line: 183
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Resp. casse]"
-
-#
-# File: src/browser.c, line: 661
-# File: src/search.c, line: 189
-# File: src/browser.c, line: 661
-# File: src/search.c, line: 189
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Exp. ration.]"
-
-#
-# File: src/browser.c, line: 667
-# File: src/search.c, line: 195
-# File: src/browser.c, line: 667
-# File: src/search.c, line: 195
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Arrière]"
-
-#
 # File: src/browser.c, line: 760
 # File: src/browser.c, line: 768
 # File: src/search.c, line: 369
 # File: src/browser.c, line: 760
 # File: src/browser.c, line: 768
 # File: src/search.c, line: 369
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "La recherche a fait le tour"
 
@@ -188,8 +160,8 @@ msgstr "La recherche a fait le tour"
 # File: src/search.c, line: 489
 # File: src/search.c, line: 546
 # File: src/search.c, line: 549
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "C'est la seule occurrence"
 
@@ -198,14 +170,83 @@ msgstr "C'est la seule occurrence"
 # File: src/search.c, line: 555
 # File: src/browser.c, line: 891
 # File: src/search.c, line: 555
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Aucun motif de recherche défini"
 
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr "Fichier verrou : compte actuel inconnu (échec de getpwuid())"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Impossible d'identifier l'hôte courant pour créer le verrou : %s"
+
+#
+# File: src/files.c, line: 1476
+# File: src/text.c, line: 2315
+# File: src/text.c, line: 2327
+# File: src/files.c, line: 1476
+# File: src/text.c, line: 2315
+# File: src/text.c, line: 2327
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Erreur d'écriture du fichier verrou %s : %s"
+
+#
+# File: src/files.c, line: 1476
+# File: src/text.c, line: 2315
+# File: src/text.c, line: 2327
+# File: src/files.c, line: 1476
+# File: src/text.c, line: 2315
+# File: src/text.c, line: 2327
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Erreur de suppression du fichier verrou %s : %s"
+
+#
+# File: src/files.c, line: 1476
+# File: src/text.c, line: 2315
+# File: src/text.c, line: 2327
+# File: src/files.c, line: 1476
+# File: src/text.c, line: 2315
+# File: src/text.c, line: 2327
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Erreur d'ouverture du fichier verrou %s : %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "Erreur de lecture du fichier verrou %s : pas assez de données lues"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr "Le fichier %s est ouvert (par %s avec %s, PID %d) ; continuer ?"
+
+#
+# File: src/files.c, line: 1476
+# File: src/text.c, line: 2315
+# File: src/text.c, line: 2327
+# File: src/files.c, line: 1476
+# File: src/text.c, line: 2315
+# File: src/text.c, line: 2327
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+"Erreur d'écriture du fichier verrou : le répertoire « %s » n'existe pas"
+
 #
 # File: src/files.c, line: 119
 # File: src/files.c, line: 119
-#: src/files.c:125
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Impossible d'insérer le fichier depuis l'extérieur de %s"
@@ -213,14 +254,14 @@ msgstr "Impossible d'insérer le fichier depuis l'extérieur de %s"
 #
 # File: src/files.c, line: 228
 # File: src/files.c, line: 228
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Plus aucun fichier ouvert"
 
 #
 # File: src/files.c, line: 244
 # File: src/files.c, line: 244
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Basculement vers %s"
@@ -232,14 +273,14 @@ msgstr "Basculement vers %s"
 # File: src/files.c, line: 245
 # File: src/global.c, line: 302
 # File: src/winio.c, line: 2022
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Nouvel espace"
 
 #
 # File: src/files.c, line: 559
 # File: src/files.c, line: 559
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -249,7 +290,7 @@ msgstr[1] "Lecture de %lu lignes (converties des formats DOS et Mac)"
 #
 # File: src/files.c, line: 559
 # File: src/files.c, line: 559
-#: src/files.c:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -266,7 +307,7 @@ msgstr[1] ""
 #
 # File: src/files.c, line: 564
 # File: src/files.c, line: 564
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -276,7 +317,7 @@ msgstr[1] "Lecture de %lu lignes (converties du format Mac)"
 #
 # File: src/files.c, line: 564
 # File: src/files.c, line: 564
-#: src/files.c:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -289,7 +330,7 @@ msgstr[1] ""
 #
 # File: src/files.c, line: 569
 # File: src/files.c, line: 569
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -299,7 +340,7 @@ msgstr[1] "Lecture de %lu lignes (converties du format DOS)"
 #
 # File: src/files.c, line: 569
 # File: src/files.c, line: 569
-#: src/files.c:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -312,14 +353,14 @@ msgstr[1] ""
 #
 # File: src/files.c, line: 574
 # File: src/files.c, line: 574
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Lecture de %lu ligne"
 msgstr[1] "Lecture de %lu lignes"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
@@ -329,21 +370,21 @@ msgstr[1] "Lecture de %lu lignes (En lecture seule !)"
 #
 # File: src/files.c, line: 623
 # File: src/files.c, line: 623
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Lecture du fichier"
 
 #
 # File: src/files.c, line: 594
 # File: src/files.c, line: 594
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Nouveau fichier"
 
 #
 # File: src/files.c, line: 597
 # File: src/files.c, line: 597
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "« %s » non trouvé"
@@ -357,7 +398,7 @@ msgstr "« %s » non trouvé"
 # File: src/rcfile.c, line: 375
 # File: src/rcfile.c, line: 870
 # File: src/rcfile.c, line: 904
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "« %s » est un répertoire"
@@ -371,7 +412,7 @@ msgstr "« %s » est un répertoire"
 # File: src/rcfile.c, line: 376
 # File: src/rcfile.c, line: 871
 # File: src/rcfile.c, line: 905
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "« %s » est un périphérique"
@@ -379,7 +420,7 @@ msgstr "« %s » est un périphérique"
 #
 # File: src/files.c, line: 696
 # File: src/files.c, line: 696
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Commande à exécuter dans un nouvel espace [à partir de %s] "
@@ -387,7 +428,7 @@ msgstr "Commande à exécuter dans un nouvel espace [à partir de %s] "
 #
 # File: src/files.c, line: 698
 # File: src/files.c, line: 698
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Commande à exécuter [à partir de %s] "
@@ -395,7 +436,7 @@ msgstr "Commande à exécuter [à partir de %s] "
 #
 # File: src/files.c, line: 704
 # File: src/files.c, line: 704
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fichier à insérer dans un nouvel espace [à partir de %s] "
@@ -403,7 +444,7 @@ msgstr "Fichier à insérer dans un nouvel espace [à partir de %s] "
 #
 # File: src/files.c, line: 706
 # File: src/files.c, line: 706
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fichier à insérer [à partir de %s] "
@@ -411,14 +452,20 @@ msgstr "Fichier à insérer [à partir de %s] "
 #
 # File: src/files.c, line: 885
 # File: src/files.c, line: 885
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Touche illégale hors du mode multi-espace"
 
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"Impossible d'écrire la copie de sécurité, sauver quand même ? (Dites N en "
+"cas de doute) "
+
 #
 # File: src/files.c, line: 1286
 # File: src/files.c, line: 1286
-#: src/files.c:1486
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Impossible d'écrire à l'extérieur de %s"
@@ -426,7 +473,7 @@ msgstr "Impossible d'écrire à l'extérieur de %s"
 #
 # File: src/files.c, line: 1301
 # File: src/files.c, line: 1301
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "Impossible d'ajouter pour un lien symbolique (option --nofollow)"
 
@@ -437,8 +484,8 @@ msgstr "Impossible d'ajouter pour un lien symbolique (option --nofollow)"
 # File: src/files.c, line: 1476
 # File: src/text.c, line: 2315
 # File: src/text.c, line: 2327
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Erreur d'écriture de la copie de sécurité %s : %s"
@@ -448,7 +495,7 @@ msgstr "Erreur d'écriture de la copie de sécurité %s : %s"
 # File: src/nano.c, line: 624
 # File: src/files.c, line: 1374
 # File: src/nano.c, line: 624
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Trop de copies de sécurité ?"
 
@@ -479,9 +526,10 @@ msgstr "Trop de copies de sécurité ?"
 # File: src/files.c, line: 1617
 # File: src/files.c, line: 2449
 # File: src/files.c, line: 2458
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erreur lors de l'écriture de %s : %s"
@@ -493,7 +541,8 @@ msgstr "Erreur lors de l'écriture de %s : %s"
 # File: src/files.c, line: 1476
 # File: src/text.c, line: 2315
 # File: src/text.c, line: 2327
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erreur d'écriture du fichier temporaire : %s"
@@ -501,7 +550,7 @@ msgstr "Erreur d'écriture du fichier temporaire : %s"
 #
 # File: src/files.c, line: 1651
 # File: src/files.c, line: 1651
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -511,90 +560,88 @@ msgstr[1] "%lu lignes écrites"
 #
 # File: src/files.c, line: 1751
 # File: src/files.c, line: 1751
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
 #
 # File: src/files.c, line: 1752
 # File: src/files.c, line: 1752
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
 #
 # File: src/files.c, line: 1754
 # File: src/files.c, line: 1754
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Copie de sécurité]"
 
 #
 # File: src/files.c, line: 1758
 # File: src/files.c, line: 1758
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Ajouter la sélection au début d'un fichier"
 
 #
 # File: src/files.c, line: 1759
 # File: src/files.c, line: 1759
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Ajouter la sélection à la fin d'un fichier"
 
 #
 # File: src/files.c, line: 1760
 # File: src/files.c, line: 1760
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Écrire la sélection dans un fichier"
 
 #
 # File: src/files.c, line: 1763
 # File: src/files.c, line: 1763
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Nom du fichier au tête duquel ajouter"
 
 #
 # File: src/files.c, line: 1764
 # File: src/files.c, line: 1764
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Nom du fichier à la fin duquel ajouter"
 
 #
 # File: src/files.c, line: 1765
 # File: src/files.c, line: 1765
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Nom du fichier à écrire"
 
 #
 # File: src/files.c, line: 1856
 # File: src/files.c, line: 1856
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Le fichier existe, VOULEZ-VOUS L'ÉCRASER ? "
 
 #
 # File: src/files.c, line: 1871
 # File: src/files.c, line: 1871
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Écrire le fichier sous un NOM MODIFIÉ ? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
-"Le fichier a été modifié depuis son ouverture. Voulez-vous vraiment "
-"sauvegarder ?"
+msgstr "Le fichier a été modifié depuis son ouverture. Continuer à sauver ?"
 
 #
 # File: src/files.c, line: 2298
 # File: src/files.c, line: 2298
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(suite)"
 
@@ -603,549 +650,448 @@ msgstr "(suite)"
 # File: src/rcfile.c, line: 848
 # File: src/files.c, line: 2379
 # File: src/rcfile.c, line: 848
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Appuyez sur « Entrée » pour poursuivre le démarrage de nano.\n"
-
-#
-# File: src/global.c, line: 264
-# File: src/prompt.c, line: 1281
-# File: src/global.c, line: 264
-# File: src/prompt.c, line: 1281
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Annuler"
+"Appuyez sur « Entrée » pour continuer\n"
 
-#
-# File: src/global.c, line: 272
-# File: src/global.c, line: 272
-#: src/global.c:416
-msgid "Replace"
-msgstr "Remplacer"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Impossible de créer le répertoire %s : %s\n"
+"Il permet de conserver l'historique des recherches\n"
+"et les positions du curseur\n"
 
-#
-# File: src/global.c, line: 828
-# File: src/global.c, line: 828
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Rechercher"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"Le chemin %s n'est pas un répertoire et devrait l'être.\n"
+"Nano ne pourra pas conserver l'historique des recherches\n"
+"et les positions du curseur\n"
 
-#
-# File: src/global.c, line: 290
-# File: src/global.c, line: 290
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Resp.casse"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Un ancien fichier d'historique (%s) a été détecté, mais une\n"
+"tentative de déplacement vers le nouvel emplacement (%s)\n"
+"a rencontré une erreur : %s"
 
-#
-# File: src/global.c, line: 291
-# File: src/global.c, line: 291
-#: src/global.c:421
-msgid "Backwards"
-msgstr "->Arrière"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Un ancien fichier d'historique (%s) a été détecté, et déplacé\n"
+"vers le nouvel emplacement (%s)\n"
+"(consultez la FAQ nano pour plus d'information)"
 
 #
-# File: src/global.c, line: 294
-# File: src/global.c, line: 294
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Exp. ratio."
+# File: src/global.c, line: 266
+# File: src/global.c, line: 266
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Quitter"
 
 #
-# File: src/global.c, line: 297
-# File: src/global.c, line: 297
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "Précédente"
+# File: src/global.c, line: 477
+# File: src/global.c, line: 477
+#: src/global.c:478
+msgid "Close"
+msgstr "Fermer"
 
 #
-# File: src/global.c, line: 299
-# File: src/global.c, line: 299
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "Suivante"
+# File: src/global.c, line: 539
+# File: src/global.c, line: 539
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Coller"
 
 #
-# File: src/global.c, line: 919
-# File: src/global.c, line: 919
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Rechercher"
+# File: src/global.c, line: 534
+# File: src/global.c, line: 534
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Dé-justif."
 
 #
 # File: src/global.c, line: 275
 # File: src/global.c, line: 275
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Cherch.suiv."
 
 #
-# File: src/global.c, line: 309
-# File: src/global.c, line: 309
-#: src/global.c:457
-msgid "First File"
-msgstr "Prem. fich."
-
-#
-# File: src/global.c, line: 311
-# File: src/global.c, line: 311
-#: src/global.c:458
-msgid "Last File"
-msgstr "Dern. fich."
-
-#
-# File: src/global.c, line: 307
-# File: src/global.c, line: 307
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Parcourir"
-
-#
-# File: src/global.c, line: 958
-# File: src/global.c, line: 958
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Format DOS"
-
-#
-# File: src/global.c, line: 964
-# File: src/global.c, line: 964
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Format Mac"
-
-#
-# File: src/global.c, line: 971
-# File: src/global.c, line: 971
-#: src/global.c:464
-msgid "Append"
-msgstr "Ajout (à la fin)"
-
-#
-# File: src/global.c, line: 977
-# File: src/global.c, line: 977
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Ajout (au début)"
-
-#
-# File: src/global.c, line: 984
-# File: src/global.c, line: 984
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Copie de sécu."
-
-#
-# File: src/global.c, line: 1021
-# File: src/global.c, line: 1021
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Exécuter une commande"
-
-#
-# File: src/global.c, line: 1154
-# File: src/global.c, line: 1154
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Aller -> rép."
-
-#
-# Les messages suivants doivent tenir sur 10 caractères !
-# Ils sont utilisés comme entrée des menus du bas d'écran.
-# File: src/global.c, line: 265
-# File: src/global.c, line: 265
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Aide"
-
-#
-# File: src/global.c, line: 266
-# File: src/global.c, line: 266
-#: src/global.c:481
-msgid "Exit"
-msgstr "Quitter"
-
-#
 # File: src/global.c, line: 267
 # File: src/global.c, line: 267
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Chercher"
 
 #
-# File: src/global.c, line: 268
-# File: src/global.c, line: 268
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Page préc."
-
-#
-# File: src/global.c, line: 269
-# File: src/global.c, line: 269
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Page suiv."
-
-#
-# File: src/global.c, line: 278
-# File: src/global.c, line: 278
-#: src/global.c:485
-msgid "First Line"
-msgstr "Prem. lig."
+# File: src/global.c, line: 272
+# File: src/global.c, line: 272
+#: src/global.c:493
+msgid "Replace"
+msgstr "Remplacer"
 
 #
-# File: src/global.c, line: 279
-# File: src/global.c, line: 279
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Dern. Lig."
+# File: src/global.c, line: 270
+# File: src/global.c, line: 270
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Aller lig."
 
 #
-# File: src/global.c, line: 1360
-# File: src/global.c, line: 1360
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Suspendre"
+# File: src/global.c, line: 614
+# File: src/global.c, line: 1083
+# File: src/global.c, line: 614
+# File: src/global.c, line: 1083
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Ligne préc."
 
 #
-# File: src/global.c, line: 284
-# File: src/global.c, line: 284
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Début para."
+# File: src/global.c, line: 618
+# File: src/global.c, line: 1087
+# File: src/global.c, line: 618
+# File: src/global.c, line: 1087
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Ligne suiv."
 
 #
-# File: src/global.c, line: 285
-# File: src/global.c, line: 285
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Fin para."
+# File: src/global.c, line: 505
+# File: src/global.c, line: 505
+#: src/global.c:497
+msgid "Read File"
+msgstr "Lire fich."
 
 #
 # File: src/global.c, line: 286
 # File: src/global.c, line: 286
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Justifier"
 
 #
 # File: src/global.c, line: 288
 # File: src/global.c, line: 288
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Rafraîchir"
 
 #
-# File: src/global.c, line: 1053
-# File: src/global.c, line: 1053
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Insérer un fichier"
-
-#
-# File: src/global.c, line: 270
-# File: src/global.c, line: 270
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Aller lig."
-
-#
 # File: src/global.c, line: 325
 # File: src/global.c, line: 325
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Justifier le paragraphe courant"
 
 #
 # File: src/global.c, line: 314
 # File: src/global.c, line: 314
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Annuler la fonction courante"
 
 #
 # File: src/global.c, line: 315
 # File: src/global.c, line: 315
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
-msgstr "Affiche de message"
+msgstr "Afficher ce message"
 
 #
 # File: src/global.c, line: 318
 # File: src/global.c, line: 318
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Fermer l'espace en cours / Quitter nano"
 
 #
 # File: src/global.c, line: 320
 # File: src/global.c, line: 320
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Quitter nano"
 
 #
 # File: src/global.c, line: 324
 # File: src/global.c, line: 324
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Écrire le fichier en cours sur le disque"
 
 #
 # File: src/global.c, line: 327
 # File: src/global.c, line: 327
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Insérer un autre fichier dans l'espace en cours"
 
 #
 # File: src/global.c, line: 329
 # File: src/global.c, line: 329
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "Recherche d'une chaîne ou d'une expression rationnelle"
+msgstr "Rechercher une chaîne ou une expression rationnelle"
 
 #
-# File: src/global.c, line: 330
-# File: src/global.c, line: 330
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Aller à l'écran précédent"
+# File: src/global.c, line: 329
+# File: src/global.c, line: 329
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Recherche d'une chaîne"
 
 #
 # File: src/global.c, line: 331
 # File: src/global.c, line: 331
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "Aller à l'écran suivant"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Monter d'un écran"
+
+#
+# File: src/global.c, line: 331
+# File: src/global.c, line: 331
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Descendre d'un écran"
 
 #
 # File: src/global.c, line: 333
 # File: src/global.c, line: 333
-#: src/global.c:523
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Couper la ligne courante vers le presse-papiers"
 
 #
 # File: src/global.c, line: 335
 # File: src/global.c, line: 335
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Coller le presse-papiers à partir de la ligne courante"
 
 #
 # File: src/global.c, line: 337
 # File: src/global.c, line: 337
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Indiquer la position du curseur"
 
 #
 # File: src/global.c, line: 339
 # File: src/global.c, line: 339
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Appeler le correcteur orthographique (si dispo.)"
 
 #
 # File: src/global.c, line: 342
 # File: src/global.c, line: 342
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Remplacer une chaîne ou une expression rationnelle"
 
 #
 # File: src/global.c, line: 340
 # File: src/global.c, line: 340
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Aller à la ligne et à la colonne indiquées"
 
 #
 # File: src/global.c, line: 344
 # File: src/global.c, line: 344
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Marquer le texte à la position du curseur"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Marquer le texte depuis la position du curseur"
 
 #
 # File: src/global.c, line: 345
 # File: src/global.c, line: 345
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr "Recommencer la dernière recherche"
 
 #
 # File: src/global.c, line: 347
 # File: src/global.c, line: 347
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Copier la ligne courante dans le presse-papiers"
 
 #
 # File: src/global.c, line: 314
 # File: src/global.c, line: 314
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
-msgstr "Mise en retrait de la ligne courante"
+msgstr "Augmenter la marge de la ligne courante"
 
 #
 # File: src/global.c, line: 314
 # File: src/global.c, line: 314
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "Annuler le retrait de la ligne courante"
+msgstr "Diminuer la marge de la ligne courante"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Annuler la dernière opération"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Refaire la dernière opération annulée"
 
 #
 # File: src/global.c, line: 351
 # File: src/global.c, line: 351
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Avancer d'un caractère"
 
 #
 # File: src/global.c, line: 352
 # File: src/global.c, line: 352
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Reculer d'un caractère"
 
 #
 # File: src/global.c, line: 354
 # File: src/global.c, line: 354
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Avancer d'un mot"
 
 #
 # File: src/global.c, line: 355
 # File: src/global.c, line: 355
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Reculer d'un mot"
 
 #
 # File: src/global.c, line: 357
 # File: src/global.c, line: 357
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Aller à la ligne précédente"
 
 #
 # File: src/global.c, line: 358
 # File: src/global.c, line: 358
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Aller à la ligne suivante"
 
 #
 # File: src/global.c, line: 360
 # File: src/global.c, line: 360
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Aller au début de la ligne courante"
 
 #
 # File: src/global.c, line: 362
 # File: src/global.c, line: 362
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Aller à la fin de la ligne courante"
 
 #
 # File: src/global.c, line: 365
 # File: src/global.c, line: 365
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Aller au début du paragraphe, puis à celui du précédent"
 
 #
 # File: src/global.c, line: 367
 # File: src/global.c, line: 367
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Aller à la fin du paragraphe, puis à celle du suivant"
 
 #
 # File: src/global.c, line: 370
 # File: src/global.c, line: 370
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Aller à la première ligne du fichier"
 
 #
 # File: src/global.c, line: 372
 # File: src/global.c, line: 372
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Aller à la dernière ligne du fichier"
 
 #
 # File: src/global.c, line: 374
 # File: src/global.c, line: 374
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Aller au crochet correspondant"
 
 #
 # File: src/global.c, line: 376
 # File: src/global.c, line: 376
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Remonter d'une ligne sans déplacer le curseur"
 
 #
 # File: src/global.c, line: 378
 # File: src/global.c, line: 378
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Descendre d'une ligne sans déplacer le curseur"
 
 #
 # File: src/global.c, line: 382
 # File: src/global.c, line: 382
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Basculer vers l'espace précédent"
 
 #
 # File: src/global.c, line: 384
 # File: src/global.c, line: 384
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Basculer vers l'espace suivant"
 
 #
 # File: src/global.c, line: 387
 # File: src/global.c, line: 387
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Insérer le prochain caractère tel quel"
 
 #
 # File: src/global.c, line: 389
 # File: src/global.c, line: 389
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Insérer une tabulation à la position du curseur"
 
@@ -1159,382 +1105,465 @@ msgstr "Insérer un passage à la ligne à la position du curseur"
 #
 # File: src/global.c, line: 393
 # File: src/global.c, line: 393
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Supprimer le caractère sous le curseur"
 
 #
 # File: src/global.c, line: 395
 # File: src/global.c, line: 395
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Supprimer le caractère à la gauche du curseur"
 
 #
 # File: src/global.c, line: 398
 # File: src/global.c, line: 398
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Coupe du curseur à la fin du fichier"
+msgstr "Couper du curseur à la fin du fichier"
 
 #
 # File: src/global.c, line: 401
 # File: src/global.c, line: 401
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Justifier le fichier entier"
 
 #
 # File: src/global.c, line: 405
 # File: src/global.c, line: 405
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Compter le nombre de mots, de lignes et de caractères"
 
 #
 # File: src/global.c, line: 408
 # File: src/global.c, line: 408
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Rafraîchir (redessiner) l'écran courant"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Suspendre l'éditeur (si vous y êtes autorisé)"
 
 #
 # File: src/global.c, line: 411
 # File: src/global.c, line: 411
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Chercher en tenant compte de la casse (commutateur)"
 
 #
 # File: src/global.c, line: 413
 # File: src/global.c, line: 413
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Inverser le sens de la recherche"
 
 #
 # File: src/global.c, line: 417
 # File: src/global.c, line: 417
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Utiliser des expressions rationnelles (commutateur)"
 
 #
 # File: src/global.c, line: 421
 # File: src/global.c, line: 421
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Rappeler la précédente chaîne de recherche"
 
 #
 # File: src/global.c, line: 423
 # File: src/global.c, line: 423
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Rappeler la chaîne de recherche suivante"
 
 #
 # File: src/global.c, line: 426
 # File: src/global.c, line: 426
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Ouvrir le navigateur de fichiers"
 
 #
 # File: src/global.c, line: 429
 # File: src/global.c, line: 429
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "Utilisation du format DOS (commutateur)"
+msgstr "Utiliser le format DOS (commutateur)"
 
 #
 # File: src/global.c, line: 430
 # File: src/global.c, line: 430
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "Utilisation du format Mac (commutateur)"
+msgstr "Utiliser le format Mac (commutateur)"
 
 #
 # File: src/global.c, line: 432
 # File: src/global.c, line: 432
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Ajouter à la fin du fichier (commutateur)"
 
 #
 # File: src/global.c, line: 433
 # File: src/global.c, line: 433
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Ajouter au début du fichier (commutateur)"
 
 #
 # File: src/global.c, line: 436
 # File: src/global.c, line: 436
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Créer une copie de sécurité de l'original (commutateur)"
 
 #
 # File: src/global.c, line: 437
 # File: src/global.c, line: 437
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Exécuter une commande externe"
 
 #
 # File: src/global.c, line: 441
 # File: src/global.c, line: 441
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Utiliser un nouvel espace (commutateur)"
 
 #
 # File: src/global.c, line: 444
 # File: src/global.c, line: 444
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Sortir du navigateur de fichiers"
 
 #
 # File: src/global.c, line: 446
 # File: src/global.c, line: 446
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Aller au premier fichier de la liste"
 
 #
 # File: src/global.c, line: 448
 # File: src/global.c, line: 448
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Aller au dernier fichier de la liste"
 
 #
-# File: src/global.c, line: 448
-# File: src/global.c, line: 448
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "Aller au prochain fichier de la liste"
-
-#
 # File: src/global.c, line: 446
 # File: src/global.c, line: 446
-#: src/global.c:642
+#: src/global.c:634
 msgid "Go to the previous file in the list"
 msgstr "Aller au précédent fichier de la liste"
 
 #
+# File: src/global.c, line: 448
+# File: src/global.c, line: 448
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Aller au prochain fichier de la liste"
+
+#
 # File: src/global.c, line: 449
 # File: src/global.c, line: 449
-#: src/global.c:643
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Changer de répertoire"
 
 #
-# File: src/global.c, line: 477
-# File: src/global.c, line: 477
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Fermer"
+# File: src/global.c, line: 339
+# File: src/global.c, line: 339
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Appeler l'analyseur statique (si dispo.)"
+
+#
+# File: src/global.c, line: 357
+# File: src/global.c, line: 357
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Aller au message précédent de l'analyse statique"
+
+#
+# File: src/global.c, line: 358
+# File: src/global.c, line: 358
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Aller au message suivant de l'analyse statique"
+
+#
+# File: src/global.c, line: 339
+# File: src/global.c, line: 339
+#: src/global.c:642
+msgid "Invoke formatter, if available"
+msgstr "Appeler l'outil de mise en forme (si dispo.)"
+
+#
+# Les messages suivants doivent tenir sur 10 caractères !
+# Ils sont utilisés comme entrée des menus du bas d'écran.
+# File: src/global.c, line: 265
+# File: src/global.c, line: 265
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Aide"
+
+#
+# File: src/global.c, line: 264
+# File: src/prompt.c, line: 1281
+# File: src/global.c, line: 264
+# File: src/prompt.c, line: 1281
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Annuler"
 
 #
 # File: src/global.c, line: 483
 # File: src/global.c, line: 483
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Écrire"
 
 #
+# File: src/global.c, line: 1154
+# File: src/global.c, line: 1154
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Aller -> rép."
+
+#
+# File: src/global.c, line: 528
+# File: src/global.c, line: 528
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Couper"
+
+#
 # File: src/global.c, line: 488
 # File: src/global.c, line: 488
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:728
 msgid "Justify"
 msgstr "Justifier"
 
 #
-# File: src/global.c, line: 505
-# File: src/global.c, line: 505
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Lire fich."
+# File: src/global.c, line: 552
+# File: src/global.c, line: 552
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Orthograp."
 
 #
-# File: src/global.c, line: 528
-# File: src/global.c, line: 528
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Couper"
+# File: src/global.c, line: 270
+# File: src/global.c, line: 270
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Analyse statique"
 
 #
-# File: src/global.c, line: 534
-# File: src/global.c, line: 534
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Dé-justif."
+# File: src/global.c, line: 958
+# File: src/global.c, line: 958
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Formateur"
 
 #
-# File: src/global.c, line: 539
-# File: src/global.c, line: 539
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Coller"
+# File: src/global.c, line: 290
+# File: src/global.c, line: 290
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Resp.casse"
+
+#
+# File: src/global.c, line: 294
+# File: src/global.c, line: 294
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Exp. ratio."
+
+#
+# File: src/global.c, line: 291
+# File: src/global.c, line: 291
+#: src/global.c:755
+msgid "Backwards"
+msgstr "->Arrière"
+
+#
+# File: src/global.c, line: 828
+# File: src/global.c, line: 828
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Rechercher"
 
 #
 # File: src/global.c, line: 544
 # File: src/global.c, line: 544
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Pos. cur."
 
 #
-# File: src/global.c, line: 552
-# File: src/global.c, line: 552
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Orthograp."
+# File: src/global.c, line: 268
+# File: src/global.c, line: 268
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Page préc."
+
+#
+# File: src/global.c, line: 269
+# File: src/global.c, line: 269
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Page suiv."
+
+#
+# File: src/global.c, line: 278
+# File: src/global.c, line: 278
+#: src/global.c:785
+msgid "First Line"
+msgstr "Prem. lig."
+
+#
+# File: src/global.c, line: 279
+# File: src/global.c, line: 279
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Dern. Lig."
+
+#
+# File: src/search.c, line: 1167
+# File: src/search.c, line: 1167
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Parenthèse corresp."
 
 #
 # File: src/global.c, line: 575
 # File: src/global.c, line: 575
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Marquer"
 
 #
 # File: src/global.c, line: 583
 # File: src/global.c, line: 583
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Copier"
 
 #
 # File: src/global.c, line: 587
 # File: src/global.c, line: 587
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Indenter"
 
 #
 # File: src/global.c, line: 591
 # File: src/global.c, line: 591
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Supprimer l'indentation"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Annuler"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Refaire"
 
 #
-# File: src/global.c, line: 596
-# File: src/global.c, line: 596
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "En avant"
-
-#
 # File: src/global.c, line: 600
 # File: src/global.c, line: 600
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "En arrière"
 
 #
-# File: src/global.c, line: 605
-# File: src/global.c, line: 605
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Mot suivant"
+# File: src/global.c, line: 596
+# File: src/global.c, line: 596
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "En avant"
 
 #
 # File: src/global.c, line: 609
 # File: src/global.c, line: 609
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Mot précédent"
 
 #
-# File: src/global.c, line: 614
-# File: src/global.c, line: 1083
-# File: src/global.c, line: 614
-# File: src/global.c, line: 1083
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Ligne préc."
-
-#
-# File: src/global.c, line: 618
-# File: src/global.c, line: 1087
-# File: src/global.c, line: 618
-# File: src/global.c, line: 1087
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Ligne suiv."
+# File: src/global.c, line: 605
+# File: src/global.c, line: 605
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Mot suivant"
 
 #
 # File: src/global.c, line: 622
 # File: src/global.c, line: 622
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Début doc."
 
 #
 # File: src/global.c, line: 626
 # File: src/global.c, line: 626
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Fin"
 
 #
-# File: src/global.c, line: 649
-# File: src/global.c, line: 649
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Trouver l'autre crochet"
+# File: src/global.c, line: 284
+# File: src/global.c, line: 284
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Début para."
+
+#
+# File: src/global.c, line: 285
+# File: src/global.c, line: 285
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Fin para."
 
 #
 # File: src/global.c, line: 653
 # File: src/global.c, line: 653
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Remonter"
 
 #
 # File: src/global.c, line: 657
 # File: src/global.c, line: 657
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Descendre"
 
 #
 # File: src/global.c, line: 663
 # File: src/global.c, line: 663
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "Fichier précédent"
 
 #
 # File: src/global.c, line: 668
 # File: src/global.c, line: 668
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Fichier suivant"
 
@@ -1543,72 +1572,181 @@ msgstr "Fichier suivant"
 # File: src/text.c, line: 2431
 # File: src/global.c, line: 673
 # File: src/text.c, line: 2431
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+msgid "Verbatim"
 msgstr "Entrée telle quelle"
 
 #
 # File: src/global.c, line: 677
 # File: src/global.c, line: 677
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tabulation"
 
 #
 # File: src/global.c, line: 681
 # File: src/global.c, line: 681
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Entrée"
 
 #
 # File: src/global.c, line: 685
 # File: src/global.c, line: 685
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Supprimer"
 
 #
 # File: src/global.c, line: 689
 # File: src/global.c, line: 689
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "RetourArr."
 
 #
 # File: src/global.c, line: 281
 # File: src/global.c, line: 281
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "Coup.->Fin"
 
 #
 # File: src/global.c, line: 710
 # File: src/global.c, line: 710
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Nombre de mots "
 
 #
+# File: src/global.c, line: 1360
+# File: src/global.c, line: 1360
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Suspendre"
+
+#
+# File: src/global.c, line: 297
+# File: src/global.c, line: 297
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Précédente"
+
+#
+# File: src/global.c, line: 299
+# File: src/global.c, line: 299
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Suivante"
+
+#
+# File: src/global.c, line: 919
+# File: src/global.c, line: 919
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Rechercher"
+
+#
+# File: src/global.c, line: 958
+# File: src/global.c, line: 958
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Format DOS"
+
+#
+# File: src/global.c, line: 964
+# File: src/global.c, line: 964
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Format Mac"
+
+#
+# File: src/global.c, line: 971
+# File: src/global.c, line: 971
+#: src/global.c:934
+msgid "Append"
+msgstr "Ajout (à la fin)"
+
+#
+# File: src/global.c, line: 977
+# File: src/global.c, line: 977
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Ajout (au début)"
+
+#
+# File: src/global.c, line: 984
+# File: src/global.c, line: 984
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Copie de sécu."
+
+#
+# File: src/global.c, line: 1021
+# File: src/global.c, line: 1021
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Exécuter une commande"
+
+#
+# File: src/global.c, line: 307
+# File: src/global.c, line: 307
+#: src/global.c:961
+msgid "To Files"
+msgstr "Parcourir"
+
+#
+# File: src/global.c, line: 309
+# File: src/global.c, line: 309
+#: src/global.c:964
+msgid "First File"
+msgstr "Prem. fich."
+
+#
+# File: src/global.c, line: 311
+# File: src/global.c, line: 311
+#: src/global.c:966
+msgid "Last File"
+msgstr "Dern. fich."
+
+#
+# File: src/global.c, line: 614
+# File: src/global.c, line: 1083
+# File: src/global.c, line: 614
+# File: src/global.c, line: 1083
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Analyse préc."
+
+#
+# File: src/global.c, line: 618
+# File: src/global.c, line: 1087
+# File: src/global.c, line: 618
+# File: src/global.c, line: 1087
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "Analyse suiv."
+
+#
 # File: src/global.c, line: 1277
 # File: src/global.c, line: 1277
-#: src/global.c:1367
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Mode aide"
 
 #
 # File: src/global.c, line: 1280
 # File: src/global.c, line: 1280
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Afficher la position du curseur"
 
 #
 # File: src/global.c, line: 1283
 # File: src/global.c, line: 1283
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Utiliser 1 ligne de plus pour l'édition"
 
@@ -1617,105 +1755,105 @@ msgstr "Utiliser 1 ligne de plus pour l'édition"
 # File: src/nano.c, line: 776
 # File: src/global.c, line: 1285
 # File: src/nano.c, line: 776
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Défilement progressif"
 
 #
+# File: src/nano.c, line: 824
+# File: src/nano.c, line: 824
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Affichage automatique sur plusieurs lignes"
+
+#
 # File: src/global.c, line: 1294
 # File: src/global.c, line: 1294
-#: src/global.c:1375
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Afficher les blancs"
 
 #
 # File: src/global.c, line: 1304
 # File: src/global.c, line: 1304
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Coloration syntaxique"
 
 #
 # File: src/global.c, line: 1308
 # File: src/global.c, line: 1308
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Touche « Début » intelligente"
 
 #
 # File: src/global.c, line: 1311
 # File: src/global.c, line: 1311
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Indenter automatiquement"
 
 #
 # File: src/global.c, line: 1314
 # File: src/global.c, line: 1314
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Couper jusqu'en fin de ligne"
 
 #
-# File: src/global.c, line: 1318
-# File: src/global.c, line: 1318
-#: src/global.c:1385
-msgid "Long line wrapping"
+# File: src/nano.c, line: 824
+# File: src/nano.c, line: 824
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
 msgstr "Passer à la ligne automatiquement"
 
 #
 # File: src/global.c, line: 1323
 # File: src/global.c, line: 1323
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "La touche tabulation ajoute des espaces"
 
 #
 # File: src/global.c, line: 1334
 # File: src/global.c, line: 1334
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Conserver des copies de sécurité"
 
 #
 # File: src/global.c, line: 1342
 # File: src/global.c, line: 1342
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Mode multi-espace"
 
 #
 # File: src/global.c, line: 1346
 # File: src/global.c, line: 1346
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Utiliser la souris"
 
 #
 # File: src/global.c, line: 1354
 # File: src/global.c, line: 1354
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Pas de conversion des formats DOS et Mac"
 
 #
 # File: src/global.c, line: 1360
 # File: src/global.c, line: 1360
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Autoriser à suspendre"
 
 #
-# File: src/global.c, line: 1318
-# File: src/global.c, line: 1318
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Affichage multiligne automatique"
-
-#
 # File: src/help.c, line: 228
 # File: src/help.c, line: 228
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1740,7 +1878,7 @@ msgstr ""
 #
 # File: src/help.c, line: 237
 # File: src/help.c, line: 237
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1758,7 +1896,7 @@ msgstr ""
 #
 # File: src/help.c, line: 243
 # File: src/help.c, line: 243
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1782,7 +1920,7 @@ msgstr ""
 #
 # File: src/help.c, line: 252
 # File: src/help.c, line: 252
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1809,7 +1947,7 @@ msgstr ""
 #
 # File: src/help.c, line: 261
 # File: src/help.c, line: 261
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1828,7 +1966,7 @@ msgstr ""
 #
 # File: src/help.c, line: 267
 # File: src/help.c, line: 267
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1846,13 +1984,13 @@ msgstr ""
 " Aide de l'écriture de fichier\n"
 "\n"
 " Indiquez le nom sous lequel vous désirez écrire le fichier courant et "
-"appuyez sur la touche « Entrée » pour effectuer la sauvegarde.\n"
+"appuyez sur la touche « Entrée » pour sauver le fichier.\n"
 "\n"
 " Si vous avez sélectionné du texte en le marquant, il vous sera proposé de "
-"sauvegarder seulement la partie sélectionnée du texte dans un fichier "
-"différent. Pour limiter le risque d'écraser le fichier en cours avec une "
-"simple portion de ce dernier, le nom du fichier courant ne vous sera proposé "
-"par défaut dans ce mode.\n"
+"sauver seulement la partie sélectionnée du texte dans un fichier différent. "
+"Pour limiter le risque d'écraser le fichier en cours avec une simple portion "
+"de ce dernier, le nom du fichier courant ne vous sera proposé par défaut "
+"dans ce mode.\n"
 "\n"
 " Les touches de fonction suivantes sont disponibles en mode écriture de "
 "fichier :\n"
@@ -1861,7 +1999,7 @@ msgstr ""
 #
 # File: src/help.c, line: 281
 # File: src/help.c, line: 281
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1878,11 +2016,11 @@ msgstr ""
 "\n"
 " Le navigateur de fichiers est utilisé pour parcourir visuellement la "
 "structure des répertoires afin de sélectionner un fichier en lecture ou en "
-"écriture. Les flèches et les touches « page précédente » et « page suivante » "
-"peuvent être utilisées pour parcourir les fichiers, les touches « S » et "
-"« Entrée » permettent de sélectionner un fichier ou de descendre dans un "
-"répertoire. Pour remonter dans l'arborescence des répertoires, sélectionner "
-"le répertoire appelé  « .. » en haut de la liste des fichiers.\n"
+"écriture. Les flèches et les touches « page précédente » et « page "
+"suivante » peuvent être utilisées pour parcourir les fichiers, les touches "
+"« S » et « Entrée » permettent de sélectionner un fichier ou de descendre "
+"dans un répertoire. Pour remonter dans l'arborescence des répertoires, "
+"sélectionner le répertoire appelé  « .. » en haut de la liste des fichiers.\n"
 "\n"
 " Les touches de fonction suivantes sont disponibles en mode navigateur de "
 "fichiers :\n"
@@ -1891,7 +2029,7 @@ msgstr ""
 #
 # File: src/help.c, line: 294
 # File: src/help.c, line: 294
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1918,7 +2056,7 @@ msgstr ""
 #
 # File: src/help.c, line: 303
 # File: src/help.c, line: 303
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1930,7 +2068,7 @@ msgstr ""
 #
 # File: src/help.c, line: 307
 # File: src/help.c, line: 307
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1957,7 +2095,7 @@ msgstr ""
 #
 # File: src/help.c, line: 320
 # File: src/help.c, line: 320
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1985,7 +2123,7 @@ msgstr ""
 #
 # File: src/help.c, line: 335
 # File: src/help.c, line: 335
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -2010,7 +2148,7 @@ msgstr ""
 #
 # File: src/help.c, line: 348
 # File: src/help.c, line: 348
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -2034,7 +2172,7 @@ msgstr ""
 #
 # File: src/help.c, line: 359
 # File: src/help.c, line: 359
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -2048,16 +2186,16 @@ msgstr ""
 "utilisés.\n"
 "\n"
 " Les raccourcis sont représentés de la façon suivante : la touche "
-"« Contrôle » est représentée par l'accent circonflexe (^) et peut être entrée "
-"soit via la touche Contrôle (Ctrl), soit en pressant 2 fois la touche "
+"« Contrôle » est représentée par l'accent circonflexe (^) et peut être "
+"entrée soit via la touche Contrôle (Ctrl), soit en pressant 2 fois la touche "
 "« Échap. ». Les séquences d'échappement sont représentées par le symbole "
 "« Méta » (M) et peuvent être entrées via les touches « Échap. », « Alt. » ou "
-"« Méta » selon la configuration de votre clavier.  "
+"« Méta » selon la configuration de votre clavier. "
 
 #
 # File: src/help.c, line: 366
 # File: src/help.c, line: 366
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -2066,9 +2204,9 @@ msgid ""
 "\n"
 msgstr ""
 "Appuyer 2 fois sur la touche « Échap. » puis entrer un nombre à 3 chiffres "
-"entre 000 et 255 insère le caractère de code correspondant. Les combinaisons "
+"entre 000 et 255 insère le caractère de code correspondant. Les raccourcis "
 "suivantes sont disponibles dans la fenêtre principale de l'éditeur. Les "
-"combinaisons pouvant être utilisées comme alternatives sont affichées entre "
+"raccourcis pouvant être utilisées comme alternatives sont affichées entre "
 "parenthèses :\n"
 "\n"
 
@@ -2077,14 +2215,14 @@ msgstr ""
 # File: src/help.c, line: 551
 # File: src/help.c, line: 397
 # File: src/help.c, line: 551
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "(commutateur)"
 
 #
 # File: src/nano.c, line: 522
 # File: src/nano.c, line: 522
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Touche illégale en mode visualisation"
 
@@ -2092,7 +2230,7 @@ msgstr "Touche illégale en mode visualisation"
 # Fin des entrées de menu sur 10 caractères
 # File: src/nano.c, line: 618
 # File: src/nano.c, line: 618
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -2105,7 +2243,7 @@ msgstr ""
 # Fin des entrées de menu sur 10 caractères
 # File: src/nano.c, line: 620
 # File: src/nano.c, line: 620
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -2118,7 +2256,7 @@ msgstr ""
 # Fin des entrées de menu sur 10 caractères
 # File: src/nano.c, line: 623
 # File: src/nano.c, line: 623
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -2130,14 +2268,14 @@ msgstr ""
 #
 # File: src/nano.c, line: 635
 # File: src/nano.c, line: 635
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "La taille de la fenêtre est trop petite pour nano...\n"
 
 #
 # File: src/nano.c, line: 727
 # File: src/nano.c, line: 727
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -2149,7 +2287,7 @@ msgstr ""
 #
 # File: src/nano.c, line: 730
 # File: src/nano.c, line: 730
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Option\t\tOption longue GNU\t\tDescription\n"
@@ -2157,406 +2295,412 @@ msgstr "Option\t\tOption longue GNU\t\tDescription\n"
 #
 # File: src/nano.c, line: 732
 # File: src/nano.c, line: 732
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Option\t\tSignification\n"
 
 #
-# File: src/nano.c, line: 735
-# File: src/nano.c, line: 735
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Affiche ce message"
-
-#
 # File: src/nano.c, line: 736
 # File: src/nano.c, line: 736
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+LIGNE,COLONNE"
 
 #
 # File: src/nano.c, line: 737
 # File: src/nano.c, line: 737
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Démarre ligne LIGNE, colonne COLONNE"
 
 #
 # File: src/nano.c, line: 739
 # File: src/nano.c, line: 739
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Touche « Début » intelligente"
 
 #
 # File: src/nano.c, line: 740
 # File: src/nano.c, line: 740
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
-msgstr "Sauver en créant une copie de sécurité"
+msgstr "Créer des copies de sécurité des fichiers existants"
 
 #
 # File: src/nano.c, line: 741
 # File: src/nano.c, line: 741
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <rép.>"
 
 #
 # File: src/nano.c, line: 741
 # File: src/nano.c, line: 741
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<rép.>"
 
 #
 # File: src/nano.c, line: 742
 # File: src/nano.c, line: 742
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Répertoire des copies de sécu. uniques"
 
 #
 # File: src/nano.c, line: 745
 # File: src/nano.c, line: 745
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Affiche en gras le texte vidéo inverse"
 
 #
 # File: src/nano.c, line: 748
 # File: src/nano.c, line: 748
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "La touche tabulation ajoute des espaces"
 
 #
 # File: src/nano.c, line: 751
 # File: src/nano.c, line: 751
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Mode multi-espace"
 
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Utilisation de fichiers verrou (du type vim)"
+
 #
 # File: src/nano.c, line: 756
 # File: src/nano.c, line: 756
-#: src/nano.c:845
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Mémorise les recherches & remplacements"
 
 #
 # File: src/nano.c, line: 759
 # File: src/nano.c, line: 759
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Ne pas utiliser les fichiers nanorc"
 
 #
 # File: src/nano.c, line: 762
 # File: src/nano.c, line: 762
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Corrige la gestion du pavé numérique"
 
 #
 # File: src/nano.c, line: 764
 # File: src/nano.c, line: 764
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Pas d'ajout de ligne en fin de fichier"
 
 #
 # File: src/nano.c, line: 767
 # File: src/nano.c, line: 767
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Pas de conversion depuis DOS et Mac"
 
 #
 # File: src/global.c, line: 1283
 # File: src/global.c, line: 1283
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Utiliser 1 ligne de plus pour l'édition"
 
 #
+# File: src/global.c, line: 389
+# File: src/global.c, line: 389
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Mémoriser la position du curseur"
+
+#
 # File: src/nano.c, line: 771
 # File: src/nano.c, line: 771
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <chaîne>"
 
 #
 # File: src/nano.c, line: 771
 # File: src/nano.c, line: 771
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<chaîne>"
 
 #
 # File: src/nano.c, line: 772
 # File: src/nano.c, line: 772
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Préfixe des citations"
 
 #
 # File: src/nano.c, line: 774
 # File: src/nano.c, line: 774
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Mode restreint"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr "Défilement ligne par ligne*"
+msgstr "Défilement ligne par ligne"
 
 #
 # File: src/nano.c, line: 778
 # File: src/nano.c, line: 778
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <nombre>"
 
 #
 # File: src/nano.c, line: 778
 # File: src/nano.c, line: 778
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<nombre>"
 
 #
 # File: src/nano.c, line: 779
 # File: src/nano.c, line: 779
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Largeur des tabulations"
 
 #
 # File: src/nano.c, line: 781
 # File: src/nano.c, line: 781
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Effacement rapide de la barre d'état"
 
 #
 # File: src/nano.c, line: 784
 # File: src/nano.c, line: 784
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Affiche la version et s'arrête"
 
 #
 # File: src/nano.c, line: 787
 # File: src/nano.c, line: 787
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Meilleure détection des limites de mots"
 
 #
 # File: src/nano.c, line: 790
 # File: src/nano.c, line: 790
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <chaîne>"
 
 #
 # File: src/nano.c, line: 790
 # File: src/nano.c, line: 790
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<chaîne>"
 
 #
 # File: src/nano.c, line: 791
 # File: src/nano.c, line: 791
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Définit la syntaxe de coloration"
 
 #
 # File: src/nano.c, line: 793
 # File: src/nano.c, line: 793
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Afficher la position du curseur"
 
 #
 # File: src/nano.c, line: 795
 # File: src/nano.c, line: 795
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Corrige la confusion effac. arr./suppr."
 
 #
+# File: src/global.c, line: 315
+# File: src/global.c, line: 315
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Affiche de message"
+
+#
 # File: src/nano.c, line: 798
 # File: src/nano.c, line: 798
-#: src/nano.c:888
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Indentation automatique"
 
 #
 # File: src/nano.c, line: 799
 # File: src/nano.c, line: 799
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Coupe du curseur à la fin de la ligne"
 
 #
 # File: src/nano.c, line: 802
 # File: src/nano.c, line: 802
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Écraser les liens sym., sans les suivre"
 
 #
 # File: src/nano.c, line: 804
 # File: src/nano.c, line: 804
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Active l'utilisation de la souris"
 
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Ne pas lire le fichier existant (mais l'écraser)"
+
 #
 # File: src/nano.c, line: 807
 # File: src/nano.c, line: 807
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <rép.>"
 
 #
 # File: src/nano.c, line: 807
 # File: src/nano.c, line: 807
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<rép.>"
 
 #
 # File: src/nano.c, line: 808
 # File: src/nano.c, line: 808
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Répertoire de fonctionnement"
 
 #
 # File: src/nano.c, line: 811
 # File: src/nano.c, line: 811
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Préserver ^Q (XON) & ^S (XOFF)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Pas d'erreur au démarrage (nanorc...)"
 
 #
 # File: src/nano.c, line: 813
 # File: src/nano.c, line: 813
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <numéro>"
 
 #
 # File: src/nano.c, line: 813
 # File: src/nano.c, line: 813
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<numéro>"
 
 #
 # File: src/nano.c, line: 779
 # File: src/nano.c, line: 779
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Colonne de passage à la ligne"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Passer automatiquement à la ligne à la colonne #col"
 
 #
 # File: src/nano.c, line: 817
 # File: src/nano.c, line: 817
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
 #
 # File: src/nano.c, line: 817
 # File: src/nano.c, line: 817
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
 #
 # File: src/nano.c, line: 818
 # File: src/nano.c, line: 818
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Correcteur orthographique"
 
 #
 # File: src/nano.c, line: 821
 # File: src/nano.c, line: 821
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Sauver en quittant, sans question"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Fonct. annuler générique [EXPÉRIMENTAL]"
-
 #
 # File: src/nano.c, line: 822
 # File: src/nano.c, line: 822
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Mode visualisation (lecture seule)"
 
 #
 # File: src/nano.c, line: 824
 # File: src/nano.c, line: 824
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
 msgstr "Désactive le passage auto. à la ligne"
 
 #
 # File: src/nano.c, line: 826
 # File: src/nano.c, line: 826
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Ne pas afficher les deux lignes d'aide"
 
 #
 # File: src/nano.c, line: 827
 # File: src/nano.c, line: 827
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Autoriser à suspendre"
 
 #
 # File: src/global.c, line: 1318
 # File: src/global.c, line: 1318
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "Affichage multiligne automatique"
 
 #
-# File: src/nano.c, line: 831
-# File: src/nano.c, line: 831
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignoré, pour être compatible Pico)"
-
-#
 # File: src/nano.c, line: 841
 # File: src/nano.c, line: 841
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " nano GNU version %s (compilé à %s, le %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " nano GNU version %s\n"
 
 #
 # File: src/nano.c, line: 844
 # File: src/nano.c, line: 844
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Adr. él. : nano@nano-editor.org\tSite : http://www.nano-editor.org/"
@@ -2564,7 +2708,7 @@ msgstr " Adr. él. : nano@nano-editor.org\tSite : http://www.nano-editor.org/"
 #
 # File: src/nano.c, line: 845
 # File: src/nano.c, line: 845
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -2576,22 +2720,26 @@ msgstr ""
 #
 # File: src/nano.c, line: 923
 # File: src/nano.c, line: 923
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Désolé, le support de cette fonction a été désactivé"
 
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Pas de nom de fichier"
+
 #
 # File: src/nano.c, line: 940
 # File: src/nano.c, line: 940
-#: src/nano.c:1044
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Sauver l'espace modifié (RÉPONDRE « Non » EFFACERA LES CHANGEMENTS) ? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Impossible de rouvrir l'entrée standard depuis le clavier, désolé\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lecture depuis l'entrée standard, ^C pour abandonner\n"
@@ -2599,14 +2747,14 @@ msgstr "Lecture depuis l'entrée standard, ^C pour abandonner\n"
 #
 # File: src/nano.c, line: 1003
 # File: src/nano.c, line: 1003
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Réception de SIGHUP ou SIGTERM\n"
 
 #
 # File: src/nano.c, line: 1020
 # File: src/nano.c, line: 1020
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Utilisez « fg » pour revenir à nano.\n"
@@ -2614,14 +2762,14 @@ msgstr "Utilisez « fg » pour revenir à nano.\n"
 #
 # File: src/nano.c, line: 1186
 # File: src/nano.c, line: 1186
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "- marche"
 
 #
 # File: src/nano.c, line: 1187
 # File: src/nano.c, line: 1187
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "- arrêt"
 
@@ -2630,21 +2778,21 @@ msgstr "- arrêt"
 # File: src/winio.c, line: 530
 # File: src/nano.c, line: 1361
 # File: src/winio.c, line: 530
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Commande inconnue"
 
 #
 # File: src/nano.c, line: 1425
 # File: src/nano.c, line: 1425
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignoré, humm humm"
 
 #
 # File: src/nano.c, line: 1428
 # File: src/nano.c, line: 1428
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignoré, humm humm"
 
@@ -2653,7 +2801,7 @@ msgstr "XOFF ignoré, humm humm"
 # File: src/rcfile.c, line: 814
 # File: src/nano.c, line: 1827
 # File: src/rcfile.c, line: 814
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "taille de tabulation « %s » demandée non valide"
@@ -2663,60 +2811,65 @@ msgstr "taille de tabulation « %s » demandée non valide"
 # File: src/rcfile.c, line: 739
 # File: src/nano.c, line: 1883
 # File: src/rcfile.c, line: 739
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "la colonne maximale « %s » n'est pas valide"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Entrez « %s -h » pour une liste des options disponibles.\n"
+
 #
 # File: src/prompt.c, line: 1252
 # File: src/prompt.c, line: 1252
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Oo"
 
 #
 # File: src/prompt.c, line: 1253
 # File: src/prompt.c, line: 1253
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
 #
 # File: src/prompt.c, line: 1254
 # File: src/prompt.c, line: 1254
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Tt"
 
 #
 # File: src/prompt.c, line: 1268
 # File: src/prompt.c, line: 1268
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Oui"
 
 #
 # File: src/prompt.c, line: 1273
 # File: src/prompt.c, line: 1273
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Tous"
 
 #
 # File: src/prompt.c, line: 1278
 # File: src/prompt.c, line: 1278
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Non"
 
 #
 # File: src/rcfile.c, line: 120
 # File: src/rcfile.c, line: 120
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Erreur dans %s (ligne %lu) : "
@@ -2724,7 +2877,7 @@ msgstr "Erreur dans %s (ligne %lu) : "
 #
 # File: src/rcfile.c, line: 174
 # File: src/rcfile.c, line: 174
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "l'argument %s contient un \" non fermé"
@@ -2738,8 +2891,8 @@ msgstr "l'argument %s contient un \" non fermé"
 # File: src/rcfile.c, line: 253
 # File: src/rcfile.c, line: 524
 # File: src/rcfile.c, line: 581
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "les expr. rationnelles doivent être encadrées par des « \" »"
 
@@ -2748,7 +2901,7 @@ msgstr "les expr. rationnelles doivent être encadrées par des « \" »"
 # File: src/search.c, line: 62
 # File: src/rcfile.c, line: 226
 # File: src/search.c, line: 62
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "mauvaise expr. rationnelle « %s » : %s"
@@ -2756,65 +2909,108 @@ msgstr "mauvaise expr. rationnelle « %s » : %s"
 #
 # File: src/rcfile.c, line: 247
 # File: src/rcfile.c, line: 247
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "nom de syntaxe manquant"
 
 #
 # File: src/rcfile.c, line: 302
 # File: src/rcfile.c, line: 302
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "le nom « none » est un nom de syntaxe réservé"
 
 #
 # File: src/rcfile.c, line: 309
 # File: src/rcfile.c, line: 309
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "la syntaxe « default » ne doit être associée à aucune extension"
 
 #
 # File: src/rcfile.c, line: 247
 # File: src/rcfile.c, line: 247
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
-msgstr "Nom de clef manquant"
+msgstr "Raccourci manquant"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "Les combinaisons clavier doivent commencer par « ^ », « M » ou « F »"
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Raccourci trop court"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr ""
-"vous devez indiquer la fonction à laquelle cette combinaison est associée"
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Les raccourcis doivent commencer par « ^ », « M » ou « F »"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "Vous devez indiquer la fonction à laquelle ce raccourci est associée"
+
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
-"vous devez indiquer dans quel menu cette combinaison sera utilisée (ou "
-"« all » pour tous)"
+"Vous devez indiquer le menu (ou « all » pour tous) auquel ce raccourci est "
+"rattaché"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:489
 #, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Cannot map name \"%s\" to a function"
 msgstr "impossible de trouver la fonction « %s »"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "impossible de trouver le menu « %s »"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "La fonction « %s » n'existe pas dans le menu « %s »"
+
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "désolé, le raccourci « %s » ne peut être réattribué"
+
+#
+# File: src/browser.c, line: 257
+# File: src/browser.c, line: 309
+# File: src/browser.c, line: 325
+# File: src/files.c, line: 610
+# File: src/files.c, line: 618
+# File: src/files.c, line: 1332
+# File: src/files.c, line: 1420
+# File: src/files.c, line: 1466
+# File: src/files.c, line: 1487
+# File: src/files.c, line: 1609
+# File: src/files.c, line: 2376
+# File: src/rcfile.c, line: 366
+# File: src/rcfile.c, line: 383
+# File: src/rcfile.c, line: 913
+# File: src/browser.c, line: 257
+# File: src/browser.c, line: 309
+# File: src/browser.c, line: 325
+# File: src/files.c, line: 610
+# File: src/files.c, line: 618
+# File: src/files.c, line: 1332
+# File: src/files.c, line: 1420
+# File: src/files.c, line: 1466
+# File: src/files.c, line: 1487
+# File: src/files.c, line: 1609
+# File: src/files.c, line: 2376
+# File: src/rcfile.c, line: 366
+# File: src/rcfile.c, line: 383
+# File: src/rcfile.c, line: 913
+#: src/rcfile.c:629
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "désolé, « %s » n'est pas une combinaison valide"
+msgid "Error expanding %s: %s"
+msgstr "Erreur lors de l'expansion de %s : %s"
 
 #
 # File: src/rcfile.c, line: 438
 # File: src/rcfile.c, line: 438
-#: src/rcfile.c:625
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -2834,7 +3030,7 @@ msgstr ""
 #
 # File: src/rcfile.c, line: 460
 # File: src/rcfile.c, line: 460
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 "un directive de coloration (color) doit être précédée d'une commande "
@@ -2843,53 +3039,102 @@ msgstr ""
 #
 # File: src/rcfile.c, line: 465
 # File: src/rcfile.c, line: 465
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "nom de couleur manquant"
 
 #
-# File: src/rcfile.c, line: 485
-# File: src/rcfile.c, line: 485
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "une couleur de fond « %s » ne peut pas être lumineuse (bright)"
-
-#
 # File: src/rcfile.c, line: 503
 # File: src/rcfile.c, line: 503
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "chaîne d'expr. rationnelle manquante"
 
 #
 # File: src/rcfile.c, line: 575
 # File: src/rcfile.c, line: 575
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "« start » nécessite un « end » correspondant"
 
 #
+# File: src/rcfile.c, line: 485
+# File: src/rcfile.c, line: 485
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "une couleur de fond « %s » ne peut pas être lumineuse (bright)"
+
+#
 # File: src/rcfile.c, line: 460
 # File: src/rcfile.c, line: 460
-#: src/rcfile.c:804
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 "impossible d'ajouter un motif d'en-tête non précédé d'une commande « syntax »"
 
-#: src/rcfile.c:874
+#
+# File: src/rcfile.c, line: 460
+# File: src/rcfile.c, line: 460
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "impossible d'ajouter un motif Magic sans commande « syntax »"
+
+#
+# File: src/rcfile.c, line: 503
+# File: src/rcfile.c, line: 503
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "chaîne de motif Magic manquante"
+
+#
+# File: src/rcfile.c, line: 460
+# File: src/rcfile.c, line: 460
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "impossible d'ajouter un analyseur statique sans commande « syntax »"
+
+#
+# File: src/rcfile.c, line: 465
+# File: src/rcfile.c, line: 465
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Commande d'analyse statique manquante"
+
+#
+# File: src/rcfile.c, line: 460
+# File: src/rcfile.c, line: 460
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr ""
+"Impossible d'ajouter un outil de mise en forme sans commande « syntax »"
+
+#
+# File: src/rcfile.c, line: 465
+# File: src/rcfile.c, line: 465
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Commande de l'outil de mise en forme manquante"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
-"Erreur bloquante : aucune combinaison n'est associée à la fonction « %s »"
+"Erreur bloquante : aucun raccourci n'est associé à la fonction « %s ». "
+"Arrêt.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Arrêt. Si besoin, lancez nano avec l'option -I pour modifier les paramètres "
-"de votre fichier nanorc\n"
+"Si besoin, lancez nano avec l'option -I pour modifier les paramètres de "
+"votre fichier nanorc\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "impossible de trouver la syntaxe « %s » à étendre"
 
 #
 # File: src/rcfile.c, line: 646
@@ -2898,7 +3143,7 @@ msgstr ""
 # File: src/rcfile.c, line: 646
 # File: src/rcfile.c, line: 655
 # File: src/rcfile.c, line: 665
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "la commande « %s » est interdite dans un fichier inclus"
@@ -2908,7 +3153,7 @@ msgstr "la commande « %s » est interdite dans un fichier inclus"
 # File: src/rcfile.c, line: 838
 # File: src/rcfile.c, line: 671
 # File: src/rcfile.c, line: 838
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "la syntaxe « %s » ne contient aucune commande de coloration (color)"
@@ -2916,22 +3161,22 @@ msgstr "la syntaxe « %s » ne contient aucune commande de coloration (color)"
 #
 # File: src/rcfile.c, line: 680
 # File: src/rcfile.c, line: 680
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "impossible de comprendre la commande « %s »"
 
 #
-# File: src/rcfile.c, line: 686
-# File: src/rcfile.c, line: 686
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "nom de l'option manquant"
+# File: src/rcfile.c, line: 465
+# File: src/rcfile.c, line: 465
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Option manquante"
 
 #
 # File: src/rcfile.c, line: 708
 # File: src/rcfile.c, line: 708
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "l'option « %s » nécessite un argument"
@@ -2939,7 +3184,7 @@ msgstr "l'option « %s » nécessite un argument"
 #
 # File: src/rcfile.c, line: 726
 # File: src/rcfile.c, line: 726
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "l'option n'est pas une chaîne multioctet valide"
 
@@ -2950,41 +3195,55 @@ msgstr "l'option n'est pas une chaîne multioctet valide"
 # File: src/rcfile.c, line: 752
 # File: src/rcfile.c, line: 780
 # File: src/rcfile.c, line: 789
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "les blancs sont interdits"
 
 #
 # File: src/rcfile.c, line: 762
 # File: src/rcfile.c, line: 762
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "indiquez 2 caractères (mono-colonne)"
 
 #
 # File: src/rcfile.c, line: 828
 # File: src/rcfile.c, line: 828
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
+msgid "Cannot unset option \"%s\""
 msgstr "impossible de désactiver l'option « %s »"
 
 #
 # File: src/rcfile.c, line: 834
 # File: src/rcfile.c, line: 834
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "option inconnue « %s »"
+msgid "Unknown option \"%s\""
+msgstr "Option « %s » inconnue"
 
 #
 # File: src/rcfile.c, line: 894
 # File: src/rcfile.c, line: 894
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "impossible de trouver mon répertoire personnel ! Ouah !"
 
 #
+# File: src/files.c, line: 2379
+# File: src/rcfile.c, line: 848
+# File: src/files.c, line: 2379
+# File: src/rcfile.c, line: 848
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Appuyez sur « Entrée » pour poursuivre le démarrage de nano.\n"
+
+#
 # File: src/search.c, line: 94
 # File: src/search.c, line: 94
 #: src/search.c:96
@@ -2993,37 +3252,68 @@ msgid "\"%.*s%s\" not found"
 msgstr "« %.*s%s » non trouvé"
 
 #
+# File: src/browser.c, line: 655
+# File: src/search.c, line: 183
+# File: src/browser.c, line: 655
+# File: src/search.c, line: 183
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Resp. casse]"
+
+#
+# File: src/browser.c, line: 661
+# File: src/search.c, line: 189
+# File: src/browser.c, line: 661
+# File: src/search.c, line: 189
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Exp. ration.]"
+
+#
+# File: src/browser.c, line: 667
+# File: src/search.c, line: 195
+# File: src/browser.c, line: 667
+# File: src/search.c, line: 195
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Arrière]"
+
+#
 # File: src/search.c, line: 199
 # File: src/search.c, line: 199
-#: src/search.c:205
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (à remplacer) dans la sélection"
 
 #
 # File: src/search.c, line: 201
 # File: src/search.c, line: 201
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (à remplacer)"
 
 #
 # File: src/search.c, line: 753
 # File: src/search.c, line: 753
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Remplacer cette occurrence ?"
 
 #
 # File: src/search.c, line: 921
 # File: src/search.c, line: 921
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Remplacer par"
 
 #
 # File: src/search.c, line: 963
 # File: src/search.c, line: 963
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -3033,28 +3323,29 @@ msgstr[1] "%lu remplacements effectués"
 #
 # File: src/search.c, line: 989
 # File: src/search.c, line: 989
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Entrez : numéro de ligne, numéro de colonne "
 
 #
 # File: src/search.c, line: 989
 # File: src/search.c, line: 989
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "numéro de ligne ou de colonne incorrect"
 
 #
 # File: src/search.c, line: 1167
 # File: src/search.c, line: 1167
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "N'est pas un crochet"
 
 #
 # File: src/search.c, line: 1234
 # File: src/search.c, line: 1234
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Aucun crochet correspondant"
 
@@ -3072,48 +3363,41 @@ msgstr "Marque posée"
 msgid "Mark Unset"
 msgstr "Marque enlevée"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Aucune opération à annuler !"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 "Erreur interne : impossible de trouver une correspondance pour la ligne %d. "
-"Sauvegardez votre travail"
+"Sauvez votre travail."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "ajout de texte"
 
 #
 # File: src/global.c, line: 668
 # File: src/global.c, line: 668
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "effacement de texte"
 
-#
-# File: src/global.c, line: 1318
-# File: src/global.c, line: 1318
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "passage à la ligne"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "fusion de lignes"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "texte coupé"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "texte restauré"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "nouvelle ligne"
 
@@ -3122,47 +3406,47 @@ msgstr "nouvelle ligne"
 # File: src/global.c, line: 1087
 # File: src/global.c, line: 618
 # File: src/global.c, line: 1087
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "insertion de texte"
 
 #
 # File: src/search.c, line: 201
 # File: src/search.c, line: 201
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "remplacement de texte"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Erreur interne : type inconnu. Sauvegardez votre travail"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Erreur interne : type inconnu. Sauvez votre travail"
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Action annulée (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Rien à refaire !"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
-"Erreur interne : impossible de se préparer à refaire l'action. Sauvegardez "
-"votre travail"
+"Erreur interne : impossible de préparer le retour en avant. Sauvez votre "
+"travail."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Action refaite (%s)"
 
 #
-# File: src/text.c, line: 441
-# File: src/text.c, line: 441
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Impossible d'ouvrir un tube"
+# File: src/text.c, line: 1944
+# File: src/text.c, line: 1944
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Impossible de créer un tube"
 
 #
 # File: src/text.c, line: 468
@@ -3171,24 +3455,21 @@ msgstr "Impossible d'ouvrir un tube"
 # File: src/text.c, line: 468
 # File: src/text.c, line: 2032
 # File: src/text.c, line: 2179
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Impossible de créer un nouveau processus"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
-"Erreur interne : impossible de mettre en place le moyen d'annuler l'action "
-"« couper ». Sauvegardez votre travail."
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Erreur interne : type inconnu. Sauvegardez votre travail"
+"Erreur interne : impossible de préparer l'action « coller ». Sauvez votre "
+"travail."
 
 #
 # File: src/text.c, line: 1270
 # File: src/text.c, line: 1270
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Mauvaise chaîne de citation %s : %s"
@@ -3196,78 +3477,78 @@ msgstr "Mauvaise chaîne de citation %s : %s"
 #
 # File: src/text.c, line: 1666
 # File: src/text.c, line: 1666
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Il est maintenant possible de dé-justifier !"
 
 #
 # File: src/text.c, line: 1858
 # File: src/text.c, line: 1858
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Entrez une correction"
 
 #
-# File: src/text.c, line: 1944
-# File: src/text.c, line: 1944
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Impossible de créer un tube"
-
-#
 # File: src/text.c, line: 1946
 # File: src/text.c, line: 1946
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Création de la liste des fautes, veuillez patienter..."
 
 #
 # File: src/text.c, line: 2038
 # File: src/text.c, line: 2038
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Impossible d'obtenir la taille de tampon du tube"
 
 #
 # File: src/text.c, line: 2089
 # File: src/text.c, line: 2089
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "erreur d'appel de « spell »"
 
 #
 # File: src/text.c, line: 2092
 # File: src/text.c, line: 2092
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "erreur à l'appel de « sort -f »"
 
 #
 # File: src/text.c, line: 2095
 # File: src/text.c, line: 2095
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "erreur à l'appel de « uniq »"
 
 #
 # File: src/text.c, line: 2351
 # File: src/text.c, line: 2351
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Vérification orthographique terminée"
 
 #
 # File: src/text.c, line: 2206
 # File: src/text.c, line: 2206
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "erreur d'appel de « %s »"
 
 #
+# File: src/global.c, line: 339
+# File: src/global.c, line: 339
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Appel du correcteur orthographique, veuillez patienter"
+
+#
 # File: src/text.c, line: 2346
 # File: src/text.c, line: 2346
-#: src/text.c:2960
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Échec de la correction : %s"
@@ -3275,15 +3556,72 @@ msgstr "Échec de la correction : %s"
 #
 # File: src/text.c, line: 2348
 # File: src/text.c, line: 2348
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Échec de la correction : %s : %s"
 
 #
+# File: src/nano.c, line: 764
+# File: src/nano.c, line: 764
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Aucun analyseur statique défini pour ce type de fichiers !"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Sauver l'espace modifié avant l'analyse statique ?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Lancement de l'analyse statique, veuillez patienter"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "La commande « %s » n'a produit aucune ligne analysable"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+"Ce message concerne le fichier non ouvert %s. L'ouvrir dans un nouvel "
+"espace ?"
+
+#
+# File: src/nano.c, line: 735
+# File: src/nano.c, line: 735
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Dernier message"
+
+#
+# File: src/nano.c, line: 735
+# File: src/nano.c, line: 735
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Premier message"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Erreur : aucun formateur n'est défini"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Terminé"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Lancement de la mise en forme, veuillez patienter"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Mise en forme terminée"
+
+#
 # File: src/text.c, line: 2416
 # File: src/text.c, line: 2416
-#: src/text.c:3030
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%s %lu mots,  %ld lignes, %lu caractères"
@@ -3291,16 +3629,27 @@ msgstr "%s %lu mots,  %ld lignes, %lu caractères"
 #
 # File: src/text.c, line: 2417
 # File: src/text.c, line: 2417
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Contenu de la sélection : "
 
 #
+# File: src/global.c, line: 673
+# File: src/text.c, line: 2431
+# File: src/global.c, line: 673
+# File: src/text.c, line: 2431
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Entrée telle quelle"
+
+#
 # File: src/utils.c, line: 365
 # File: src/utils.c, line: 377
 # File: src/utils.c, line: 365
 # File: src/utils.c, line: 377
-#: src/utils.c:405 src/utils.c:417
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano n'a plus de mémoire !"
 
@@ -3309,7 +3658,7 @@ msgstr "nano n'a plus de mémoire !"
 # File: src/winio.c, line: 1467
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Entrée Unicode"
 
@@ -3318,7 +3667,7 @@ msgstr "Entrée Unicode"
 # File: src/winio.c, line: 2007
 # File: src/winio.c, line: 2004
 # File: src/winio.c, line: 2007
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Modifié"
 
@@ -3328,28 +3677,36 @@ msgstr "Modifié"
 # déborder sur le bord haut de l'écran.
 # File: src/winio.c, line: 2005
 # File: src/winio.c, line: 2005
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Voir"
 
 #
 # File: src/winio.c, line: 2018
 # File: src/winio.c, line: 2018
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "RÉP. :"
 
 #
 # File: src/winio.c, line: 2025
 # File: src/winio.c, line: 2025
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Fichier :"
 
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Attention : modification d'un fichier non verrouillé. Vérifiez les droits du "
+"répertoire."
+
 #
 # File: src/winio.c, line: 3046
 # File: src/winio.c, line: 3046
-#: src/winio.c:3360
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "ligne %ld/%ld (%d%%), col. %lu/%lu (%d%%), car. %lu/%lu (%d%%)"
@@ -3357,69 +3714,70 @@ msgstr "ligne %ld/%ld (%d%%), col. %lu/%lu (%d%%), car. %lu/%lu (%d%%)"
 #
 # File: src/winio.c, line: 3166
 # File: src/winio.c, line: 3166
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "L'éditeur de texte nano"
 
 #
 # File: src/winio.c, line: 3167
 # File: src/winio.c, line: 3167
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "version"
 
 #
 # File: src/winio.c, line: 3168
 # File: src/winio.c, line: 3168
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Proposé par :"
 
 #
 # File: src/winio.c, line: 3169
 # File: src/winio.c, line: 3169
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Remerciements particuliers à :"
 
 #
 # File: src/winio.c, line: 3170
 # File: src/winio.c, line: 3170
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "les nombreux traducteurs et le TP"
+
 #
 # File: src/winio.c, line: 3171
 # File: src/winio.c, line: 3171
-#: src/winio.c:3497
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Pour ncurses :"
 
 #
 # File: src/winio.c, line: 3172
 # File: src/winio.c, line: 3172
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "et toute autre personne que nous aurions oubliée..."
 
 #
 # File: src/winio.c, line: 3173
 # File: src/winio.c, line: 3173
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Merci d'utiliser nano !"
 
-#
-# File: src/files.c, line: 1476
-# File: src/text.c, line: 2315
-# File: src/text.c, line: 2327
-# File: src/files.c, line: 1476
-# File: src/text.c, line: 2315
-# File: src/text.c, line: 2327
-#~ msgid "Error writing backup file %s: File owner mismatch"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
 #~ msgstr ""
-#~ "Erreur d'écriture de la copie de sécurité %s : propriétaire différent"
+#~ "Erreur interne : pas de correspondance pour la ligne %ld. Sauvez votre "
+#~ "travail."
 
-#~ msgid "line split"
-#~ msgstr "coupure de ligne"
+#
+# File: src/global.c, line: 1318
+# File: src/global.c, line: 1318
+#~ msgid "line wrap"
+#~ msgstr "passage à la ligne"
diff --git a/po/ga.gmo b/po/ga.gmo
index c006617..89f7a8c 100644
--- a/po/ga.gmo
+++ b/po/ga.gmo
diff --git a/po/ga.po b/po/ga.po
index 9f00382..60f8269 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,116 +1,141 @@
 # Irish translations for nano.
 # Copyright (C) 2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# Kevin Patrick Scannell <scannell@SLU.EDU>, 2006, 2008.
 #
+# Kevin Patrick Scannell <scannell@SLU.EDU>, 2006, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.1.7pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2008-10-23 15:14-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
+"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : (n>2 && n<7) ? 2 :"
 "(n>6 && n<11) ? 3 : 4;\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Téigh go Comhadlann"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Cealaithe"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Ní féidir %s a fhágáil sa mhód teoranta"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Earráid agus %s á léamh: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Ní féidir dul go dtí an chomhadlann thuas"
 
 # max 7 with parens on 80 col screen --kps
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "cmhdlnn"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "téigh suas"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Cuardaigh"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Cásíogair]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Slonn]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Siar]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Thimfhill an Cuardach"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Níor aimsíodh an patrún in aon áit eile"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Níl patrún cuardaigh ann faoi láthair"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Níorbh fhéidir comhad sealadach a chruthú: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, fuzzy, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Ní féidir comhad a ionsá ón taobh amuigh de %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Níl aon mhaoláin oscailte fágtha"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Athraithe go %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Maolán Nua"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -120,7 +145,7 @@ msgstr[2] "Léadh %lu líne (tiontaithe ó fhormáid DOS/Mac)"
 msgstr[3] "Léadh %lu líne (tiontaithe ó fhormáid DOS/Mac)"
 msgstr[4] "Léadh %lu líne (tiontaithe ó fhormáid DOS/Mac)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -134,7 +159,7 @@ msgstr[2] "Léadh %lu líne (tiontaithe ó fhormáid DOS/Mac)"
 msgstr[3] "Léadh %lu líne (tiontaithe ó fhormáid DOS/Mac)"
 msgstr[4] "Léadh %lu líne (tiontaithe ó fhormáid DOS/Mac)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -144,7 +169,7 @@ msgstr[2] "Léadh %lu líne (tiontaithe ó fhormáid Mac)"
 msgstr[3] "Léadh %lu líne (tiontaithe ó fhormáid Mac)"
 msgstr[4] "Léadh %lu líne (tiontaithe ó fhormáid Mac)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -156,7 +181,7 @@ msgstr[2] "Léadh %lu líne (tiontaithe ó fhormáid Mac)"
 msgstr[3] "Léadh %lu líne (tiontaithe ó fhormáid Mac)"
 msgstr[4] "Léadh %lu líne (tiontaithe ó fhormáid Mac)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -166,7 +191,7 @@ msgstr[2] "Léadh %lu líne (tiontaithe ó fhormáid DOS)"
 msgstr[3] "Léadh %lu líne (tiontaithe ó fhormáid DOS)"
 msgstr[4] "Léadh %lu líne (tiontaithe ó fhormáid DOS)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -178,7 +203,7 @@ msgstr[2] "Léadh %lu líne (tiontaithe ó fhormáid DOS)"
 msgstr[3] "Léadh %lu líne (tiontaithe ó fhormáid DOS)"
 msgstr[4] "Léadh %lu líne (tiontaithe ó fhormáid DOS)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -188,7 +213,7 @@ msgstr[2] "Léadh %lu líne"
 msgstr[3] "Léadh %lu líne"
 msgstr[4] "Léadh %lu líne"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
@@ -198,87 +223,93 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Comhad á Léamh"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Comhad Nua"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" gan aimsiú"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "Is comhadlann é \"%s\""
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "Is comhad gléis é \"%s\""
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Ordú le rith i maolán nua [ó %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Ordú le rith [ó %s]"
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Comhad le hionsá i maolán nua [ó %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Comhad le hionsá [ó %s]"
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Eochair neamhcheadaithe mura bhfuiltear i mód ilmhaoláin"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Ní féidir scríobh lasmuigh de %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 "Ní féidir réamhcheangal nó iarcheangal le nasc siombalach nuair atá --"
 "nofollow socraithe"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Earráid agus comhad cúltaca %s á scríobh: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "An iomarca comhad cúltaca?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Earráid agus %s á scríobh: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Earráid agus comhad sealadach á scríobh: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -288,377 +319,332 @@ msgstr[2] "Scríobhadh %lu líne"
 msgstr[3] "Scríobhadh %lu líne"
 msgstr[4] "Scríobhadh %lu líne"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Formáid DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Formáid Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Cúltaca]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Réamhcheangail an Roghnúchán le Comhad"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Iarcheangail an Roghnúchán le Comhad"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Scríobh an Roghnúchán i gComhad"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Comhad is mian leat Réamhcheangal leis"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Comhad is mian leat Iarcheangal leis"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Ainm Comhaid le Scríobh"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Tá an comhad ann; FORSCR�OBH ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Sábháil an comhad le hAINM DIFRIÚIL ? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Athraíodh an comhad ón am a d'oscail tú é; sábháil é mar sin féin?"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(tuilleadh)"
 
-#: src/files.c:2694 src/rcfile.c:1220
-#, c-format
+#: src/files.c:2974
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
 "Brúigh \"Enter\" chun dul ar aghaidh le tosú nano.\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Cealaigh"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Ionadaigh"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Gan Ionadú"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Cásíogair"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Siar"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Slonn"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Scoir"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "StairArAis"
+# next batch are main menu - should be 9 characters at most
+# 10 characters fit, but with no space before next option
+# I'm assuming an 80 column terminal here
+#: src/global.c:478
+msgid "Close"
+msgstr "Dún"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "StairArAghaidh"
+#: src/global.c:479
+#, fuzzy
+msgid "Uncut Text"
+msgstr "DíGhearr Téacs"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Téigh Go Téacs"
+#: src/global.c:481
+#, fuzzy
+msgid "Unjustify"
+msgstr "DíComhfhdú"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Cuardaigh Arís"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "An Chéad Chomhad"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Comhad Deiridh"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Go Comhaid"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Formáid DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Formáid Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Iarcheangail"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Réamhcheangail"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Comhad Cúltaca"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Rith Ordú"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Téigh i gComhadlann"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Cabhair"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Scoir"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Cuardach"
 
-# main menu - keep short?
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Ar Ais"
-
-# main menu - keep short?
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Ar Aghaidh"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "An Chéad Líne"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Ionadaigh"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Líne Dheiridh"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Téigh Go Líne"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Cuir ar Fionraí"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "An Líne Roimhe Seo"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Barr an Ailt"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "An Chéad Líne Eile"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Bun an Ailt"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Léigh"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "LánComhfhadú"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Athnuaigh"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Ionsáigh Comhad"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Téigh Go Líne"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Comhfhadaigh an t-alt reatha"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Cealaigh an fheidhm reatha"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Taispeáin an chabhair seo"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Dún an maolán reatha / Scoir nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Scoir nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Scríobh an comhad reatha ar an diosca"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Ionsáigh comhad eile isteach sa cheann reatha"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Cuardach ar theaghrán nó slonn ionadaíochta"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Téigh chuig an scáileán roimhe seo"
+#: src/global.c:526
+#, fuzzy
+msgid "Search for a string"
+msgstr "Cuardach ar theaghrán nó slonn ionadaíochta"
 
-#: src/global.c:521
-msgid "Go to next screen"
+#: src/global.c:528
+#, fuzzy
+msgid "Go one screenful up"
 msgstr "Téigh chuig an chéad scáileán eile"
 
-#: src/global.c:523
+#: src/global.c:529
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "Téigh chuig an chéad scáileán eile"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Gearr an líne reatha agus cuir é sa mhaolán ghearrtha"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Greamaigh ón mhaolán gearrtha isteach sa líne reatha"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Taispeáin ionad an chúrsóra"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Rith an litreoir, má tá sé ar fáil"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Ionadaigh teaghrán nó slonn ionadaíochta"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Téigh go dtí an líne agus an colún sonraithe"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Marcáil téacs ag ionad an chúrsóra"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "An cuardach céanna arís"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Cóipeáil an líne reatha agus cuir é sa mhaolán ghearrtha"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Eangaigh an líne reatha"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Dí-eangaigh an líne reatha"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Cealaigh an oibríocht is déanaí"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Athdhéan an oibríocht is déanaí a cealaíodh"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Ar aghaidh carachtar amháin"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Carachtar amháin siar"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Téigh ar aghaidh focal amháin"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Téigh siar focal amháin"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Téigh go dtí an líne roimhe seo"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Téigh go dtí an chéad líne eile"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Téigh go tosach na líne reatha"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Téigh go deireadh na líne reatha"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Téigh go tús an ailt reatha; ansin an ceann roimhe sin"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Téigh thar deireadh an ailt reatha; ansin an t-alt tar éis sin"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Téigh go dtí an chéad líne sa chomhad"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Téigh go dtí an líne dheiridh sa chomhad"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Téigh go dtí an lúibín comhoiriúnach"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Scrollaigh suas líne amháin, ach ná scrollaigh an cúrsóir"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Scrollaigh síos líne amháin, ach ná scrollaigh an cúrsóir"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Athraigh go dtí an maolán roimhe seo"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Athraigh go dtí an chéad mhaolán eile"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Ionsáigh an chéad charachtar eile go litriúil"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Ionsáigh táb ag an gcúrsóir"
 
@@ -666,336 +652,452 @@ msgstr "Ionsáigh táb ag an gcúrsóir"
 msgid "Insert a newline at the cursor position"
 msgstr "Ionsáigh líne nua ag an gcúrsóir"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Scrios an carachtar faoin chúrsóir"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Scrios an carachtar ar an taobh clé den chúrsóir"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Gearr ón chúrsóir go deireadh an chomhaid"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Comhfhadaigh an comhad iomlán"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "�irigh líon na bhfocal, líon na línte, agus líon na gcarachtar"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Athnuaigh (ataispeáin) an scáileán reatha"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Cuir an t-eagarthóir ar fionraí (más féidir)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Scoránaigh cásíogaireacht"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Scoránaigh treo an chuardaigh"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Scoránaigh úsáid de shloinn ionadaíochta"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Athghair an teaghrán cuardaigh roimhe seo"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Athghair an chéad teaghrán cuardaigh eile"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Téigh go brabhsálaí na gcomhad"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Scoránaigh úsáid d'fhormáid DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Scoránaigh úsáid d'fhormáid Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Scoránaigh iarcheangal"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Scoránaigh réamhcheangal"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Scoránaigh cúltacaí"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Rith ordú seachtrach"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Scoránaigh úsáid de mhaolán nua"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Scoir brabhsálaí na gcomhad"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Téigh go dtí an chéad chomhad sa liosta"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Téigh go dtí an comhad deiridh sa liosta"
 
-#: src/global.c:641
+#: src/global.c:634
+#, fuzzy
+msgid "Go to the previous file in the list"
+msgstr "Téigh go dtí an chéad chomhad sa liosta"
+
+#: src/global.c:635
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Téigh go dtí an comhad deiridh sa liosta"
 
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Téigh go comhadlann"
+
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Rith an litreoir, má tá sé ar fáil"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Téigh go dtí an líne roimhe seo"
+
+#: src/global.c:641
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Téigh go dtí an chéad líne eile"
+
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Téigh go dtí an chéad chomhad sa liosta"
+msgid "Invoke formatter, if available"
+msgstr "Rith an litreoir, má tá sé ar fáil"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Téigh go comhadlann"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Cabhair"
 
-# next batch are main menu - should be 9 characters at most
-# 10 characters fit, but with no space before next option
-# I'm assuming an 80 column terminal here
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Dún"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Cealaigh"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "Scríobh"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Téigh i gComhadlann"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Gearr"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Comhfhadú"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Léigh"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Litreoir"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Gearr"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "Téigh Go Líne"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "DíComhfhdú"
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "Formáid DOS"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "DíGhearr Téacs"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Cásíogair"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Slonn"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Siar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Gan Ionadú"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Cúrsóir"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Litreoir"
+# main menu - keep short?
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Ar Ais"
 
-#: src/global.c:771
+# main menu - keep short?
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Ar Aghaidh"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "An Chéad Líne"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Líne Dheiridh"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ní lúibín é"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Marcáil Téacs"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Cóipeáil Téacs"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Eangaigh Téacs"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Dí-eangaigh Téacs"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Cealaigh"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Athdhéan"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Ar Aghaidh"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Siar"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "An Chéad Fhocal Eile"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Ar Aghaidh"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "An Focal Roimhe Seo"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "An Líne Roimhe Seo"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "An Chéad Líne Eile"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "An Chéad Fhocal Eile"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Baile"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Deireadh"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Aimsigh an Lúibín Eile"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Barr an Ailt"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Bun an Ailt"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Scrollaigh Suas"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Scrollaigh Síos"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "An Comhad Roimhe Seo"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "An Chéad Chomhad Eile"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
 msgstr "Ionchur Litriúil"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Táb"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Iontráil"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Scrios"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Cúlspás"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "GearrGoBun"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Líon na bhFocal"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Cuir ar Fionraí"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "StairArAis"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "StairArAghaidh"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Téigh Go Téacs"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Formáid DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Formáid Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Iarcheangail"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Réamhcheangail"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Comhad Cúltaca"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Rith Ordú"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Go Comhaid"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "An Chéad Chomhad"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Comhad Deiridh"
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "An Líne Roimhe Seo"
+
+#: src/global.c:979
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "An Chéad Líne Eile"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Mód cabhrach"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Taispeáin ionad an chúrsóra i gcónaí"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Úsáid líne amháin eile le haghaidh eagarthóireachta"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Mínscrollú"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Ná timfhill línte fada"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Taispeáint spáis bháin"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Aibhsiú comhréire le dathanna"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Eochair bhaile chliste"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Uath-eangú"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Gearr go dtí an deireadh"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Timfhilleadh líne"
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Ná timfhill línte fada"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Tiontaigh táib chlóscríofa go spásanna"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Comhaid chúltaca"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Maoláin iomadúla"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Tacaíocht luiche"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Ná tiontaigh ó fhormáid DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Cur ar Fionraí"
 
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Timfhilleadh líne"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1017,7 +1119,7 @@ msgstr ""
 "na leide chuardaigh.  Má bhrúnn tú \"Enter\" gan aon téacs, déanfar an "
 "cuardach céanna arís.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1031,7 +1133,7 @@ msgstr ""
 "Tá na heochracha feidhme seo a leanas ar fáil sa mhód Cuardaigh:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1051,7 +1153,7 @@ msgstr ""
 "Tá na heochracha feidhme seo a leanas ar fáil sa mhód \"Téigh Go Líne\":\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1074,7 +1176,7 @@ msgstr ""
 "comhad ionsáite  i maolán ar leith (úsáid Meta-< agus > chun bogadh idir "
 "maoláin oscailte).  "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1085,7 +1187,7 @@ msgstr ""
 "Má theastaíonn tú maolán folamh nua, ná hiontráil ainm comhaid, is é sin nó "
 "iontráil ainm de chomhad nach ann agus brúigh \"Enter\".\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1113,7 +1215,7 @@ msgstr ""
 "Tá na heochracha feidhme seo a leanas ar fáil sa mhód \"Scríobh Comhad\":\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1135,7 +1237,7 @@ msgstr ""
 "chomhadlann aibhsithe.  Roghnaigh an chomhadlann darb ainm \"..\" ag barr "
 "liosta na gcomhad chun dul suas leibhéal amháin.\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1159,7 +1261,7 @@ msgstr ""
 "cuardach céanna arís.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1168,7 +1270,7 @@ msgstr ""
 "\":\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1192,7 +1294,7 @@ msgstr ""
 "\":\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1216,7 +1318,7 @@ msgstr ""
 " Tá na heochracha feidhme seo a leanas ar fáil i mód an Litreora:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1236,7 +1338,7 @@ msgstr ""
 " Tá na heochracha feidhme seo a leanas ar fáil sa mhód \"Rith Ordú\":\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1257,7 +1359,7 @@ msgstr ""
 "an comhad atá in eagar.  Taispeántar teachtaireachtaí tábhachtacha ar an "
 "líne stádais, an tríú líne ó bhun an scáileáin.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1275,7 +1377,7 @@ msgstr ""
 "tsiombail Meta (M-), agus is féidir iad féin a iontráil le ceann de Esc, "
 "Alt, nó Meta, ag brath ar shocruithe do mhéarchlár.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1289,15 +1391,15 @@ msgstr ""
 "Taispeántar eochracha malartacha idir lúibíní:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "(cumasú/díchumasú)"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Eochair neamhcheadaithe sa mhód amhairc"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1306,7 +1408,7 @@ msgstr ""
 "\n"
 "Scríobhadh an maolán i %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1315,7 +1417,7 @@ msgstr ""
 "\n"
 "Níor scríobhadh an maolán i %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1324,11 +1426,11 @@ msgstr ""
 "\n"
 "Níor scríobhadh an maolán: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Tá an fhuinneog róbheag le haghaidh nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1337,253 +1439,262 @@ msgstr ""
 "Úsáid: nano [ROGHANNA] [[+L�NE,COLÚN] COMHAD]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Rogha\t\tRogha fhada GNU\t\tMíniú\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Rogha\t\tMíniú\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Taispeáin an teachtaireacht seo"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+L�NE,COLÚN"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Tosaigh ag líne L�NE, colún COLÚN"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Cumasaigh eochair bhaile chliste"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Sábháil cúltacaí de chomhaid atá ann cheana"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <comhadlann>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<comhadlann>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Comhadlann a sábhálfar comhaid uathúla chúltaca inti"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Úsáid cló trom in ionad téacs aisiompaithe"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Tiontaigh táib chlóscríofa go spásanna"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Cumasaigh maoláin iomadúla"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Logáil agus léigh stair na dteaghrán cuardaigh"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Ná húsáid comhaid nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Deisigh mearbhall maidir leis an eochaircheap uimhriúil"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Ná cuir carachtair líne nua ag deireadh comhad"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Ná tiontaigh comhaid ó fhormáid Dos/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Úsáid líne amháin eile le haghaidh eagarthóireachta"
 
-#: src/nano.c:860
+#: src/nano.c:886
+#, fuzzy
+msgid "Log & read location of cursor position"
+msgstr "Ionsáigh táb ag an gcúrsóir"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <teaghrán>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<teaghrán>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Teaghrán athfhriotail"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Mód teoranta"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Scrollaigh de réir línte in ionad leathscáileáin"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#colúin>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#colúin>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Socraigh leithead de tháib a bheith #colúin"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Bánaigh an barra stádais go gasta"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Taispeáin eolas faoin leagan agus scoir"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Braith teorainneacha idir focail i slí níos cruinne"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <teaghrán>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<teaghrán>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Sainmhíniú na comhréire le haghaidh dathaithe"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Taispeáin ionad an chúrsóra i gcónaí"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Deisigh mearbhall idir na heochracha \"Backspace\" agus \"Delete\""
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "Taispeáin an chabhair seo"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Eangaigh línte nua go huathoibríoch"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Gearr ón chúrsóir go deireadh na líne"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Ná lean naisc shiombalacha; forscríobh"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Cumasaigh úsáid na luiche"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <comhadlann>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<comhadlann>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Socraigh an chomhadlann oibre"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Caomhnaigh eochracha XON (^Q) agus XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#colúin>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#colúin>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Socraigh timfhilleadh ag #colúin colún"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <clár>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<clár>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Cumasaigh litreoir malartach"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Sábháil go huathoibríoch ag am scortha; ná fiafraigh díom"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Mód amhairc (inléite amháin)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Ná timfhill línte fada"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Ná taispeáin an dá líne chabhrach"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Cumasaigh cur ar fionraí"
 
-#: src/nano.c:924
+#: src/nano.c:954
 #, fuzzy
 msgid "Enable soft line wrapping"
 msgstr "Timfhilleadh líne"
 
-# plural flags ignored in my version --kps
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(rinneadh neamhshuim orthu seo - comhoiriúnacht le Pico)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano, leagan %s (tiomsaithe %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " R-phost: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1592,159 +1703,180 @@ msgstr ""
 "\n"
 " Roghanna tiomsaithe:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Tá brón orm, díchumasaíodh an fheidhm seo"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Sábháil an maolán athraithe (NÓ SCRIOSFAR DO CHUID ATHRUITHE) ? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Fuarthas SIGHUP nó SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Úsáid \"fg\" chun dul ar ais go nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "cumasaithe"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "díchumasaithe"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Ordú Anaithnid"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "Rinneadh neamhshuim ar XON :-("
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "Rinneadh neamhshuim ar XOFF :-("
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Is neamhbhailí í méid táib iarrtha \"%s\""
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Is neamhbhailí í méid líonta iarrtha \"%s\""
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr ""
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Ss"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Uu"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Sábháil"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Uile"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Ná Sábháil"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Earráid i %s ar líne %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Tá \" gan chríoch in argóint '%s'"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Ní mór carachtar \" a bheith ag tosach agus ag deireadh sloinn ionadaíochta"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Slonn ionadaíochta neamhbhailí \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Ainm comhréire ar iarraidh"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "Comhréir \"none\" in áirithe"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Ní cheadaítear eisínteachtaí leis an gcomhréir \"default\""
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Ainm eochrach ar iarraidh"
 
-#: src/rcfile.c:398 src/rcfile.c:499
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:463
 #, fuzzy
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "ní mór \"^\", \"M\", nó \"F\" a bheith ag tús ceangail eochrach\n"
 
-#: src/rcfile.c:407
+#: src/rcfile.c:472
 #, fuzzy
-msgid "Must specify function to bind key to"
+msgid "Must specify a function to bind the key to"
 msgstr "Ní mór duit feidhm a gceanglófar an eochair léi a thabhairt\n"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-#, fuzzy
-msgid "Must specify menu to bind key to (or \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
-"Ní mór duit an roghchlár a gceanglófar an eochair leis a thabhairt (nó \"all"
-"\")\n"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:489
 #, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Cannot map name \"%s\" to a function"
 msgstr "Níorbh fhéidir ainm \"%s\" a mhapáil go feidhm\n"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:496
 #, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "Níorbh fhéidir ainm \"%s\" a mhapáil go roghchlár\n"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
+
+#: src/rcfile.c:543
 #, fuzzy, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Tá brón orm, ceangal neamhcheadaithe é keystr \"%s\"\n"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Earráid agus %s á léamh: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1759,117 +1891,179 @@ msgstr ""
 "\"black\", leis an réimír roghnach \"bright\"\n"
 "le haghaidh dathanna tulra."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Ní féidir ordú dhatha a chur leis gan ordú comhréire"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Ainm datha ar iarraidh"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Ní cheadaítear do dhath cúlra \"%s\" a bheith geal"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Slonn ionadaíochta ar iarraidh"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "Tá gá le \"end=\" in éineacht le gach \"start=\""
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Ní cheadaítear do dhath cúlra \"%s\" a bheith geal"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 "Ní féidir slonn ionadaíochta don cheanntásc a chur leis gan ordú comhréire"
 
-#: src/rcfile.c:874
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:921
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+"Ní féidir slonn ionadaíochta don cheanntásc a chur leis gan ordú comhréire"
+
+#: src/rcfile.c:926
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Slonn ionadaíochta ar iarraidh"
+
+#: src/rcfile.c:985
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr ""
+"Ní féidir slonn ionadaíochta don cheanntásc a chur leis gan ordú comhréire"
+
+#: src/rcfile.c:990
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Ainm datha ar iarraidh"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Ní féidir ordú dhatha a chur leis gan ordú comhréire"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Earráid mharfach: níl aon eochracha mapáilte le haghaidh feidhm \"%s\""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, fuzzy, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 "� scor.  Úsáid nano leis an rogha -I más gá do chuid socruithe nanorc a "
 "athrú\n"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Níorbh fhéidir ainm \"%s\" a mhapáil go roghchlár\n"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Ní cheadaítear ordú \"%s\" i gcomhad iniata"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Níl orduithe datha ag an gcomhréir \"%s\""
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Níor tuigeadh ordú \"%s\""
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Bratach ar iarraidh"
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "Ainm datha ar iarraidh"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Caithfidh tú argóint a thabhairt le rogha \"%s\""
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Níl an rogha ina teaghrán bailí il-bhirt"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Carachtair neamhbhána de dhíth"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Dhá charachtar aoncholúin de dhíth"
 
-#: src/rcfile.c:1114
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1339
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Ní féidir bratach \"%s\" a dhíchumasú"
 
-#: src/rcfile.c:1123
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1345
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Bratach anaithnid \"%s\""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ní féidir mo chomhadlann bhaile a aimsiú!  Ochón!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Brúigh \"Enter\" chun dul ar aghaidh le tosú nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" gan aimsiú"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Cásíogair]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Slonn]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Siar]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (le cur in ionad) i roghnúchán"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (le cur in ionad)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Ionadaigh an ceann seo?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Ionadaigh le"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -1879,19 +2073,20 @@ msgstr[2] "Cuireadh teaghrán nua in ionad %lu huaire"
 msgstr[3] "Cuireadh teaghrán nua in ionad %lu n-uaire"
 msgstr[4] "Cuireadh teaghrán nua in ionad %lu uair"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Iontráil uimhir na líne agus uimhir an cholúin"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Uimhir líne nó uimhir cholúin neamhbhailí"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ní lúibín é"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Níl lúibín comhoiriúnach ann"
 
@@ -1903,224 +2098,315 @@ msgstr "Socraíodh Marc"
 msgid "Mark Unset"
 msgstr "Díshocraíodh Marc"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Níl faic le cealú!"
 
-#: src/text.c:455 src/text.c:593
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+#: src/text.c:445 src/text.c:590
+#, fuzzy, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 "Earráid inmheánach: ní féidir líne %d a mheaitseáil.  Sábháil do chuid oibre"
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "téacs a chur leis"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "téacs a scriosadh"
 
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Timfhilleadh líne"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "líne a cheangal"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "téacs a ghearradh"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "téacs a dhíghearradh"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "téacs a ionsá"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "téacs a ionadú"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Earráid inmheánach: cineál anaithnid.  Sábháil do chuid oibre"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Earráid inmheánach: cineál anaithnid.  Sábháil do chuid oibre."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Cealaíodh gníomh (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Níl faic le hathdhéanamh!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
-"Earráid inmheánach: Theip ar shocrú athdhéanta.  Sábháil do chuid oibre"
+"Earráid inmheánach: ní féidir díghearradh a shocrú.  Sábháil do chuid oibre."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Athrinneadh gníomh (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Níorbh fhéidir píopa a dhéanamh"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Níorbh fhéidir píopa a chruthú"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Níorbh fhéidir forc a dhéanamh"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 "Earráid inmheánach: ní féidir díghearradh a shocrú.  Sábháil do chuid oibre."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Earráid inmheánach: cineál anaithnid.  Sábháil do chuid oibre."
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Drochtheaghrán athfhriotail %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Is féidir DíChomhfhadú anois!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Cuir ionadaí in eagar"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Níorbh fhéidir píopa a chruthú"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Liosta d'fhocail mílitrithe á chruthú; fan go fóill, le do thoil..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Níl aon fháil ar mhéid an mhaoláin píopa"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Earráid agus \"spell\" á thosú"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Earráid agus \"sort -f\" á thosú"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Earráid agus \"uniq\" á thosú"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Chríochnaigh an litreoir"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Earráid agus \"%s\" á thosú"
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Rith an litreoir, má tá sé ar fáil"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Theip ar an litreoir: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Theip ar an litreoir: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Ná cuir carachtair líne nua ag deireadh comhad"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "Taispeáin an teachtaireacht seo"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "Taispeáin an teachtaireacht seo"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sFocail: %lu  Línte: %ld  Carachtair: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Sa Roghnúchán:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Ionchur Litriúil"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "cuimhne nano ídithe!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Ionchur Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Athraithe"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Amharc"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "COMHADLANN:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Comhad:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "líne %ld/%ld (%d%%), colún %lu/%lu (%d%%), carachtar %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Eagarthóir téacs nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "leagan"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Scríofa ag:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Táimid fíorbhuíoch de:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "As ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "agus de gach duine eile a ndearnamar dearmad orthu..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Go raibh maith agat as úsáid nano!"
 
+#~ msgid "Insert File"
+#~ msgstr "Ionsáigh Comhad"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Téigh chuig an scáileán roimhe seo"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Aimsigh an Lúibín Eile"
+
+# plural flags ignored in my version --kps
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(rinneadh neamhshuim orthu seo - comhoiriúnacht le Pico)"
+
+#~ msgid "Must specify menu bind key to (or \"all\")\n"
+#~ msgstr ""
+#~ "Ní mór duit an roghchlár a gceanglófar an eochair leis a thabhairt (nó "
+#~ "\"all\")\n"
+
+#~ msgid "Missing flag"
+#~ msgstr "Bratach ar iarraidh"
+
 #~ msgid "line split"
 #~ msgstr "líne a scoilt"
 
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Earráid inmheánach: cineál anaithnid.  Sábháil do chuid oibre"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "Earráid inmheánach: Theip ar shocrú athdhéanta.  Sábháil do chuid oibre"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Níorbh fhéidir píopa a dhéanamh"
+
 #~ msgid "line cut"
 #~ msgstr "líne a ghearradh"
 
@@ -2208,6 +2494,3 @@ msgstr "Go raibh maith agat as úsáid nano!"
 
 #~ msgid "Duplicate syntax name %s"
 #~ msgstr "Ainm dúblach comhréire %s"
-
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "Níorbh fhéidir comhad sealadach a chruthú: %s"
diff --git a/po/gl.gmo b/po/gl.gmo
index bd6cef8..aba2a0a 100644
--- a/po/gl.gmo
+++ b/po/gl.gmo
diff --git a/po/gl.po b/po/gl.po
index da60242..2de252b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,633 +1,638 @@
 # Galician translation of nano
-# Copyright (C) 2001, 2002, 2003, 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2006, 2008, 2011, 2012, 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
+#
 # Jacobo Tarrio <jtarrio@trasno.net>, 2001, 2002, 2003.
-# Francisco Javier Tsao Santin <tsao@enelparaiso.org>, 2006,2008.
+# Francisco Javier Tsao Santín <tsao@enelparaiso.org>, 2006, 2008, 2011, 2012, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.1.6pre1\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2008-09-23 18:42+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-18 23:36+0100\n"
 "Last-Translator: Francisco Javier Tsao Santín <tsao@enelparaiso.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Ir ó Directorio"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Non se pode saír de %s en modo restrinxido"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Erro lendo %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Non se pode ascender por un directorio"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(dir pai)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Busca"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Sensible ás Maiúsculas/Minúsculas]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Expreg]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Cara Atrás]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Buscando dende o Principio"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Esta é a única aparición"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Non hai patrón de busca"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"Non se puido determina-la miña identidade para bloquea-lo ficheiro (fallou "
+"getpwuid())"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Non se puido determina-lo nome do host para bloquea-lo ficheiro: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Erro escribindo ficheiro de bloqueo %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Erro borrando ficheiro de bloqueo %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Erro abrindo ficheiro de bloqueo %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "Erro lendo ficheiro de bloqueo %s: Non abondan datos para ler"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr "O ficheiro %s está sendo editado (por %s con %s, PID %d); ¿continuar?"
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Erro escribindo ficheiro de bloqueo: Non existe o directorio '%s'"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Non se pode inserir un ficheiro de fóra de %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Non hai máis ficheiros abertos"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Cambiouse a %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Novo buffer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Leuse %lu liña (Convertida dos formatos DOS e Mac)"
 msgstr[1] "Léronse %lu liñas (Convertidas dos formatos DOS e Mac)"
 
-#: src/files.c:638
-#, fuzzy, c-format
+#: src/files.c:879
+#, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
 "permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
 "permission)"
-msgstr[0] "Leuse %lu liña (Convertida dos formatos DOS e Mac)"
-msgstr[1] "Léronse %lu liñas (Convertidas dos formatos DOS e Mac)"
+msgstr[0] ""
+"Leuse %lu liña (Convertida dos formatos DOS e Mac - Advertencia: Non hai "
+"permiso de escritura)"
+msgstr[1] ""
+"Léronse %lu liñas (Convertidas dos formatos DOS e Mac - Advertencia: Non hai "
+"permiso de escritura)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Leuse %lu liña (Convertida de formato Mac)"
 msgstr[1] "Léronse %lu liñas (Convertidas de formato Mac)"
 
-#: src/files.c:648
-#, fuzzy, c-format
+#: src/files.c:889
+#, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "Leuse %lu liña (Convertida de formato Mac)"
-msgstr[1] "Léronse %lu liñas (Convertidas de formato Mac)"
+msgstr[0] ""
+"Leuse %lu liña (Convertida de formato Mac - Advertencia: Non hai permiso de "
+"escritura)"
+msgstr[1] ""
+"Léronse %lu liñas (Convertidas de formato Mac - Advertencia: Non hai permiso "
+"de escritura)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Leuse %lu liña (Convertida do formato DOS)"
 msgstr[1] "Léronse %lu liñas (Convertidas do formato DOS)"
 
-#: src/files.c:658
-#, fuzzy, c-format
+#: src/files.c:899
+#, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "Leuse %lu liña (Convertida do formato DOS)"
-msgstr[1] "Léronse %lu liñas (Convertidas do formato DOS)"
+msgstr[0] ""
+"Leuse %lu liña (Convertida do formato DOS - Advertencia: Non hai permiso de "
+"escritura)"
+msgstr[1] ""
+"Léronse %lu liñas (Convertidas do formato DOS - Advertencia: Non hai permiso "
+"de escritura)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Leuse %lu liña"
 msgstr[1] "Léronse %lu liñas"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Le-la liña %lu (Advertencia: non hai permiso de escritura)"
+msgstr[1] "Le-las liñas %lu (Advertencia: non hai permiso de escritura)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Lendo o Ficheiro"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Ficheiro Novo"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Non se atopou \"%s\""
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" é un directorio"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" é un ficheiro de dispositivo"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Comando a executar nun novo buffer [dende %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Comando a executar [dende %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Ficheiro a inserir nun novo buffer [dende %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Ficheiro a inserir [dende %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tecla non válida no modo sen multibuffer"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"Faio ó escribir ficheiro de respaldo, ¿continuar gravando? (Prema N se non "
+"está seguro)"
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Non se pode escribir fóra de %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 "Non se pode engadir ó principio ou ó final a unha ligazón simbólica "
 "establecendo --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Erro escribindo %s: %s"
+msgstr "Erro escribindo ficheiro de copia de seguridade %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "¿Demasiados ficheiros de copia de seguridade?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erro writing %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erro escribindo ficheiro temporal: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Escribiuse %lu liña"
 msgstr[1] "Escribíronse %lu liñas"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [CopiaSeg]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Engadir a Selección ó Ficheiro polo Principio"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Engadir a Selección ó Ficheiro polo Final"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Gravar a Selección no Ficheiro"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Ficheiro ó que Engadir polo Principio"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Ficheiro ó que Engadir polo final"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Ficheiro a Gravar"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "O ficheiro xa existe, ¿SOBREESCRIBIR? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "¿Gravar ficheiro baixo NOME DIFERENTE? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
+msgstr "O ficheiro foi modificado dende que o abriu, ¿continua gravando?"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(máis)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Prema Enter para seguir iniciando nano.\n"
+"Prema Enter para continuar.\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Substituir"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Incapaz de crear directorio %s: %s\n"
+"Requírese para gravar/cargar o historial de busca ou posición do cursor\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Non Subst"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"A ruta %s non é un directorio e o necesita ser.\n"
+"Nano será incapaz de cargar ou gravar o historial de busca ou posición do "
+"cursor\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "SensMa/min"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Detectouse un ficheiro de historial anticuado (%s) que tentei mover\n"
+"á localización preferente (%s) pero topei cun erro: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Cara atrás"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Detectouse un ficheiro de historial anticuado (%s) que movín\n"
+"á localización preferente (%s)\n"
+"(lea no FAQ de nano sobre este cambio)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "ExpReg"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Saír"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "HistPrevia"
+#: src/global.c:478
+msgid "Close"
+msgstr "Pechar"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "HistSeguin"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "RepórTexto"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Ir a Text"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "DeXustif"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "U-lo Seguint"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Pri Ficheiro"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Derrad Fich"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "A Ficheiros"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Formato DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Formato Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Engadir ó Final"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Engadir ó Inicio"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Copia Seguridade"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Executar Comando"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Ir ó Directorio"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Obter Axud"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Saír"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "¿U-lo?"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Páxina ant"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Páxina seg"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Prim liña"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Substituir"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Ult liña"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Ir á liña"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Suspender"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Liña Ant"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Prin Parág"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Seg Liña"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Fin Parágr"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Ler Fich"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "XustComplt"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Recargar"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Inser Fich"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Ir á liña"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Xustifica-lo parágrafo actual"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Cancela-la función actual"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Amosar este texto de axuda"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Pechar o ficheiro cargado actualmente / Saír de nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Saír de nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Grava-lo ficheiro actual no disco"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Inserir outro ficheiro no actual"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Buscar cadea ou experesión regular"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Pasar á pantalla anterior"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Buscar cadea"
 
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "Pasar á seguinte pantalla"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Subir unha pantalla"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Baixar unha pantalla"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Corta-la liña actual e gardala no buffer de cortado"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Desfacer corte do buffer de cortado na liña actual"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Amosa-la posición do cursor"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Chamar ó corrector ortográfico, se hai un"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Substituir unha cadea ou expresión regular"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Ir á liña e columna número"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Marcar texto na posición do cursor"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Marcar texto comenzando na posición do cursor"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr "Repeti-la última busca"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Copia-la liña actual e almacenala no buffer de cortado"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Sangra-la liña actual"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Elimina-la sangría da liña actual"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Desface-la última operación"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Reface-la última operación desfeita"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Avanzar un carácter"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Recuar un carácter"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Avanzar unha verba"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Recuar unha verba"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Pasar á liña previa"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Pasar á seguinte liña"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Pasar ó principio da liña actual"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Pasar ó final da liña actual"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Pasar ó principio do parágrafo, entón ó parágrafo previo"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Pasar xusto alén do parágrafo, entón ó seguinte parágrafo"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Pasar á primeira liña do ficheiro"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Pasar á derradeira liña do ficheiro"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Pasar ó paréntese correspondente"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Desprazar arriba unha liña sen despraza-lo cursor"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Desprazar unha liña abaixo sen despraza-lo cursor"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Cambiar ó anterior ficheiro"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Cambiar ó seguinte ficheiro"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Inseri-la seguinte pulsación literal"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Inserir unha lingüeta na posición do cursor"
 
@@ -635,333 +640,434 @@ msgstr "Inserir unha lingüeta na posición do cursor"
 msgid "Insert a newline at the cursor position"
 msgstr "Inserir unha nova liña na posición do cursor"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Borra-lo carácter baixo do cursor"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Borra-lo caracter á esquerda do cursor"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Cortar da posición do cursor ó final da liña"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Xustificar todo o ficheiro"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Conta-lo número de verbas, liñas e caracteres"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Actualiza-la pantalla actual"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Suspende-lo editor (se a suspensión está activada)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Selector de sensibilidade a maiúsculas/minúsculas na busca"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Reverti-la dirección da busca"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Selector de uso de expresións regulares"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Recupera-la anterior cadea de busca/sustitución"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Recupera-la seguinte cadea de busca/sustitución"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Ir ó navegador de ficheiros"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Selector de uso do formato DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Selector de uso do formato Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Selector de engadir ó final"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Selector de engadir previo"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Selector de copiado de seguridade do ficheiro orixinal"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Executar comando externo"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Selector de uso dun novo buffer"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Saír do navegador de ficheiros"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Pasar ó primeiro ficheiro da lista"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Pasar ó derradeiro ficheiro da lista"
 
-#: src/global.c:641
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "Pasar ó derradeiro ficheiro da lista"
-
-#: src/global.c:642
-#, fuzzy
+#: src/global.c:634
 msgid "Go to the previous file in the list"
-msgstr "Pasar ó primeiro ficheiro da lista"
+msgstr "Pasar ó anterior ficheiro da lista"
+
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Pasar ó seguinte ficheiro da lista"
 
-#: src/global.c:643
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Pasar ó directorio"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Pechar"
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Chamar ó analizador de sintaxe, se hai un"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Pasar á anterior mensaxe do analizador"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Pasar á anterior mensaxe do analizador"
+
+#: src/global.c:642
+msgid "Invoke formatter, if available"
+msgstr "Chamar ó corrector ortográfico, se hai un"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Obter Axud"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Cancelar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Gravar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Ir ó Directorio"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "CortarText"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Xustificar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Ler Fich"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Ortografía"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "CortarText"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Analizador"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "DeXustif"
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Formateador"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "RepórTexto"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "SensMa/min"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "ExpReg"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Cara atrás"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Non Subst"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "PosicAct"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Ortografía"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Páxina ant"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Páxina seg"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Prim liña"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Ult liña"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Ó delimitador"
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Marcar"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Copiar Texto"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Sangrar"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "De-Sangrar"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Desfacer"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Refacer"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Adiante"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Atrás"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Verba Seg"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Adiante"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Verba Ant"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Liña Ant"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Seg Liña"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Verba Seg"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Inicio"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Fin"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Busca-la parella"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Prin Parág"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Fin Parágr"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Desprazar Arriba"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Desprazar Abaixo"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "Ficheiro Anterior"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Ficheiro Seguinte"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+msgid "Verbatim"
 msgstr "Entrada Literal"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Lingüeta"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Entrar"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Retroceso"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "CortarAtaFin"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Conta Verbas"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Suspender"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "HistPrevia"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "HistSeguin"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Ir a Text"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Formato DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Formato Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Engadir ó Final"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Engadir ó Inicio"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Copia Seguridade"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Executar Comando"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "A Ficheiros"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Pri Ficheiro"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Derrad Fich"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Msg ant anlzr"
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "Msg seg anlzr"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Modo de axuda"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Posición do cursor constante"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Uso dunha liña máis para editar"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
-msgstr "Desprazar suavemente"
+msgstr "Desprazar mainamente"
+
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Acortado maino de liñas longas"
 
-#: src/global.c:1375
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Amosar espacios en branco"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Salientar sintaxe con cor"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Tecla de 'smart home'"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Autosangría"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Cortar ata o final"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Axuste de liñas longas"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Acortado forte de liñas longas"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversión de lingüetas escritas a espacios"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Facer copia de seguridade de ficheiros"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Múltiples ficheiros"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "permitir rato"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Non facer conversión de formato DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Suspensión"
 
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Axuste de liñas longas"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -983,7 +1089,7 @@ msgstr ""
 "Busca:. Premendo Intro sen introducir ningún texto executará a busca "
 "previa.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -997,7 +1103,7 @@ msgstr ""
 " As seguintes teclas de función están dispoñibles en modo Busca:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1017,7 +1123,7 @@ msgstr ""
 " As seguintes teclas de función están dispoñibles no modo Ir � Liña:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1040,7 +1146,7 @@ msgstr ""
 "se cargue nun buffer separado (empregue Meta-< e > para cambiar entre "
 "buffers de ficheiro).  "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1056,7 +1162,7 @@ msgstr ""
 "Ficheiro:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1085,7 +1191,7 @@ msgstr ""
 "Ficheiro:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1111,7 +1217,7 @@ msgstr ""
 "ficheiros:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1134,16 +1240,16 @@ msgstr ""
 "Busca:. Ó premer Intro sen introducir ningún texto farase a busca anterior.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-" As seguintes teclas de función están dispoñibles no modo de Busca do "
+" As seguintes teclas de función están dispoñibles no modo de Busca do "
 "Navegador:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1166,7 +1272,7 @@ msgstr ""
 "Navegador:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1190,7 +1296,7 @@ msgstr ""
 " Existen as seguintes funcións no modo Corrector Ortográfico:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1211,7 +1317,7 @@ msgstr ""
 "Externos:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1231,7 +1337,7 @@ msgstr ""
 "principal do editor, que amosa o ficheiro que se edita. A liña de estado é a "
 "terceira liña dende o fondo e amosa mensaxes importantes.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1251,7 +1357,7 @@ msgstr ""
 "introducidas usando as teclas Esc, Alt ou Meta dependendo da configuración "
 "do seu teclado.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1265,15 +1371,15 @@ msgstr ""
 "alternativas son amosadas entre parénteses\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "activar/desactivar"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Tecla non válida en modo ver"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1282,7 +1388,7 @@ msgstr ""
 "\n"
 "Gravouse o buffer en %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1291,7 +1397,7 @@ msgstr ""
 "\n"
 "Non se gravou o buffer en %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1300,11 +1406,11 @@ msgstr ""
 "\n"
 "Non se gravou o buffer: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "A fiestra é pequena de máis para nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1313,252 +1419,257 @@ msgstr ""
 "Uso: nano [OPCIÓNS] [[+LIÑA, COLUMNA] FICHEIRO]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opción\t\tOpción longa GNU\t\tSignificado\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opción\t\tSignificado\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Amosar esta mensaxe"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+LIÑA, COLUMNA"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Empezar na liña LIÑA, columna COLUMNA"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Activar tecla 'smart home'"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Gravar copias de seguridade dos ficheiros existentes"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Directorio para gravar ficheiros de copia de seguridade únicos"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Usar texto groso na vez de texto de video reverso"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Convertir as lingüetas escritas a espacios"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Admitir varios buffers de ficheiros"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Usar ficheiros de bloqueo (estilo vim)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Gravar e le-la historia de cadeas a buscar/substituír"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Non mirar nos ficheiros nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Solucionar problema de confusión de teclado numérico"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Non engadir novas liñas ó final dos ficheiros"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Non converti-los ficheiros do formato DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Usar un ou máis liñas para editar"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Rexistrar e ler a posición do cursor"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <cad>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<cad>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Cadea de citado"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Modo restrinxido"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Desprazar liña a liña en vez de media pantalla"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Establece-lo ancho de lingüeta a #cols columnas"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Facer baleirado rápido da barra de estado"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Amosar información sobre a versión e saír"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Detectar contornos das verbas máis axeitadamente"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <cad>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<cad>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Definición de sintaxe a empregar para corear"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Amosa-la posición do cursor constantemente"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Arranxa-lo problema de confusión Retroceso/Borrar"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Amosar este texto de axuda"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Sangra-las novas liñas automáticamente"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Cut from cursor to end of line"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Non segui-las ligazóns simbólicas, sobreescribir"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Emprega-lo rato"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Non ler o ficheiro (só escribir nel)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Establece-lo directorio de traballo"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Conserva-las teclas XON (^Q) e XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "Iñorar silenciosamente cuestións de inicio como errores no ficherio rc"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Establecer punto de corte na columna #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Establecer punto de corte forte na columna #cols"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Usar un corrector ortográfico alternativo"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Gravar ó saíren, sen preguntar"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Modo visualización (só lectura)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Non corta-las liñas longas"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Non facer cortado forte liñas longas"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Non amosa-las dúas liñas de axuda"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Permitir suspensión"
 
-#: src/nano.c:924
-#, fuzzy
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "Axuste de liñas longas"
+msgstr "Activar axuste suave de liñas"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(iñorado, por compatibilidade con Pico)"
-
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano versión %s (compilado %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano versión %s\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Correo-e: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1567,160 +1678,179 @@ msgstr ""
 "\n"
 "Opcións de compilación"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Sentímolo, desactivouse o soporte desta función"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Non hai nome de ficheiro"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "¿Grava-lo buffer modificado (SE RESPOSTA \"Non\" PERDERANSE OS CAMBIOS)?  "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "Non se puido reabri-la stdin dende o teclado, síntoo\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Lendo dende a stdin, ^C para abortar\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recibiuse SIGHUP ou SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Empregue \"fg\" para voltar a nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "activado"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "desactivado"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Comando Descoñecido"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "Iñórase XON, hmmmm..."
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "Iñórase XOFF, hmmmm..."
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "O tamaño de lingüeta solicitado \"%s\" non é válido"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "O tamaño de recheo solicitado \"%s\" non é válido"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Escriba '%s -h' para a lista de opcións dispoñibles.\n"
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "TtAa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Si"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Todo"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Non"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Erro en %s na liña %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "O argumento '%s' ten un \" sen rematar"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "As cadeas de expresión regular deben comezar e rematar cun carácter \" "
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Expresión regular \"%s\" incorrecta: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Falla o nome da sintaxe"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "A sintaxe \"none\" está reservada"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "A sintaxe \"default\" non debe tomar extensións"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Falla o nome de tecla"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-#, fuzzy
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
-"asociacións a combinacións de teclas deben comenzar con \"^\",\"M\", ou \"F"
-"\"\n"
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "O nome da tecla é demasiado curto"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "O nome de tecla debe comenzar con \"^\",\"M\", ou \"F\""
+
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "Debe especifica-la función para asociar á tecla"
 
-#: src/rcfile.c:407
-#, fuzzy
-msgid "Must specify function to bind key to"
-msgstr "Debe especifica-la función para asociar á tecla\n"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr "Debe especificar un menú (ou \"all\") no que asociar/liberar a tecla"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-#, fuzzy
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Debe especifica-lo menú de asociación de tecla (ou \"all\")\n"
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Non se puido sinalar o nome \"%s\" para unha función"
+
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Non se puido sinalar o nome \"%s\" para un menu"
 
-#: src/rcfile.c:426
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Non se puido sinalar o nome \"%s\" para unha función\n"
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "A función '%s' non existe no menú '%s'"
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Non se puido sinalar o nome \"%s\" para un menu\n"
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Síntoo, a combinación \"%s\" non se pode restablecer"
 
-#: src/rcfile.c:454
-#, fuzzy, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "Síntoo, keystr \"%s\" é una asociación ilegal\n"
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Erro expandindo %s: %s"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1735,138 +1865,195 @@ msgstr ""
 "\"black\", co prefixo opcional \"bright\".\n"
 "\"para cores de fronte."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 "Non se pode engadir unha directiva de cor sen unha directiva de sintaxe "
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Falla o nome da cor"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "A cor de fondo \"%s\" non pode ser relucinte"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Perdeuse a cadea de expreg"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" precisa dun \"end=\" correspondente"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "A cor de fondo \"%s\" non pode ser relucinte"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 "Non se pode engadir unha cabeceira de expresión regular sen unha directiva "
 "de sintaxe"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+"Non se pode engadir unha cadea máxica de expresión regular sen unha "
+"directiva de sintaxe"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Perdeuse o nome de cadea máxica"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "Non se pode engadir un analizador sen unha directiva de sintaxe"
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Falla a directiva de analizador"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "Non se pode engadir un formateador sen unha directiva de sintaxe "
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Directiva de formato non atopado"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Erro fatal: non hai teclas sinaladas para a función \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "Erro fatal: non hai teclas sinaladas para a función \"%s\". Saíndo.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Saíndo. Por favor, use nano coa opción -I se precisa axeita-la súa "
-"configuración no nanorc\n"
+"Se o precisa, use nano coa opción -I se precisa axeita-la súa configuración "
+"no nanorc\n"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Non se puido atopar sintaxe \"%s\" para extender"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr "O comando \"%s\" non se permite no ficheiro incluído"
+msgstr "A directiva \"%s\" non se permite no ficheiro incluído"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "A sintaxe \"%s\" non ten directiva de cor"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "Non se entende o comando \"%s\""
+msgstr "Non se entende a directiva \"%s\""
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Falla o indicador"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Opción non atopada"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "A opción \"%s\" precisa dun argumento"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "A opción non é unha cadea multibyte válida"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Se requiren caracteres non baleiros"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Se requiren dous caracteres de columna simple"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Non se pode desactiva-lo indicador \"%s\""
+msgid "Cannot unset option \"%s\""
+msgstr "Non se pode desactivar opción \"%s\""
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Indicador descoñecido \"%s\""
+msgid "Unknown option \"%s\""
+msgstr "Opción descoñecida \"%s\""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "¡Non podo atopa-lo meu directorio de inicio! ¡Aaagh!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Prema Enter para seguir iniciando nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "non se atopou \"%.*s%s\""
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Sensible ás Maiúsculas/Minúsculas]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Expreg]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Cara Atrás]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr "(para substituír) na selección"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr "(para substituír)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "¿Substituír?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Substituír por"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Fíxose %lu substitución"
 msgstr[1] "Fixéronse %lu substitucións"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Introduza liña número, columna número"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Número de liña ou columna non válida"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Non hai delimitador"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Non hai parella do delimitador"
 
@@ -1878,222 +2065,279 @@ msgstr "Marca activada"
 msgid "Mark Unset"
 msgstr "Marca desactivada"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Buffer para desfacer baleiro"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 "Erro interno: non podo atopar a liña %d. Por favor, grave o seu traballo "
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "engadir texto"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "borrar texto"
 
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Axuste de liñas longas"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "unir liña"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "cortar texto"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "repór texto"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr ""
+msgstr "ruptura de liña"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "inserir texto"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "substituir texto"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr "Erro interno: tipo descoñecido. Por favor, grave o seu traballo"
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Desfíxose a acción (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Nada para refacer"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
-"Erro interno: fallou a configuracion de refacer. Por favor, grave o seu "
-"traballo "
+"Erro interno: non podo arranxa-la reposición de texto. Por favor, grave o "
+"seu traballo."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "A Acción (%s) refíxose"
 
-#: src/text.c:766
-msgid "Could not pipe"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
 msgstr "Non se puido crear unha canle"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Non se puido iniciar outro proceso"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 "Erro interno: non podo arranxa-la reposición de texto. Por favor, grave o "
 "seu traballo."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Erro interno: tipo descoñecido. Por favor, grave o seu traballo"
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Cadea de cita %s incorrecta: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "¡Agora pode De-Xustificar!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Editar unha substitución"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Non se puido crear unha canle"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Creando a lista de palabras mal escritas, por favor, espere..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Non se puido obte-lo tamaño do buffer da canle"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Erro ó chamar \"spell\""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Erro ó chamar \"sort -f\""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Erro ó chamar \"uniq\""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Rematou a corrección ortográfica"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Erro ó chamar \"%s\""
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Chamar ó corrector ortográfico, agarde, por favor"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Fallou a revisión ortográfica: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Fallou a corrección ortográfica: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Non hai definido analizador para este tipo de ficheiros"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Gravar o buffer modificado antes da análise"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Invocando analizador de sintaxe, por favor, espere"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Atopáronse 0 liñas analizables pola directiva: %s"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr "Esta mensaxe é polo ficheiro pechado %s, ¿abrir nun novo buffer?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "No final da mensaxe"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "No comenzo da mensaxe"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Erro: non hai formateador definido"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Finalizado"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Chamando ó formateador, por favor, agarde"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Finalizou o formateado"
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sVerbas: %lu  Liñas: %ld  Caracteres: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "In Selección:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Entrada Literal"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "¡A nano esgotóuselle a memoria!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Entrada Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Modificado"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Ver"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Ficheiro:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Aviso: Modificando un ficheiro que non está bloqueado, ¿revisar os permisos "
+"do directorio?"
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "liña %ld/%ld (%d%%), col %lu/%lu (%d%%), car %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "O editor de texto nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "versión"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Por cortesía de:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Gracias en especial a:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "A Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "os moitos tradutores e o TP"
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Por ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "e a todos os que esquencemos..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "¡Gracias por usar nano!"
 
-#~ msgid "line split"
-#~ msgstr "dividir liña"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Erro interno: non podo atopar a liña %ld. Por favor, grave o seu traballo "
diff --git a/po/hu.gmo b/po/hu.gmo
index 278074e..2cc590d 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index bfbce8f..5a93e0f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,6 +1,6 @@
-# Hungarian translation of nano
-# This file is distributed under the same license as the nano package.
+# Hungarian translation of nano.
 # Copyright (C) 2001, 2002, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the nano package.
 #
 # Szabolcs Horvath <horvaths@fi.inf.elte.hu>, 2001.
 # Gergely Nagy <algernon@debian.org>, 2002.
@@ -10,116 +10,141 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.2.2pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2010-03-03 12:57+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Könyvtárváltás"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Megszakítva"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Korlátozott módban nem léphet ki a következőből: %s"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Hiba %s olvasásakor: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Nem lehet egy könyvtárral feljebb lépni"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(könyvtár)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(szülőkvt)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Keresés"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [kis/Nagy]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Regexp]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Vissza]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "A keresés körbeért"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Ez az egyetlen előfordulás"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Nincs keresési minta"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr ""
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Hiba a biztonságimentés-fájl (%s) írásakor: %s"
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Hiba a biztonságimentés-fájl (%s) írásakor: %s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Hiba a biztonságimentés-fájl (%s) írásakor: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, fuzzy, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Hiba a biztonságimentés-fájl (%s) írásakor: %s"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Nem szúrható be fájl a következőn kívülről: %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Nincs több nyitott fájlpuffer"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "�tváltva erre: %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Új puffer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "%lu sor beolvasva (DOS és Mac formátumról átalakítva)"
 msgstr[1] "%lu sor beolvasva (DOS és Mac formátumról átalakítva)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -134,14 +159,14 @@ msgstr[1] ""
 "%lu sor beolvasva (DOS és Mac formátumról átalakítva - Figyelmeztetés: nincs "
 "írásjog)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "%lu sor beolvasva (Mac formátumról átalakítva)"
 msgstr[1] "%lu sor beolvasva (Mac formátumról átalakítva)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -154,14 +179,14 @@ msgstr[1] ""
 "%lu sor beolvasva (Mac formátumról átalakítva - Figyelmeztetés: nincs "
 "írásjog)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "%lu sor beolvasva (DOS formátumról átalakítva)"
 msgstr[1] "%lu sor beolvasva (DOS formátumról átalakítva)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -174,476 +199,436 @@ msgstr[1] ""
 "%lu sor beolvasva (DOS formátumról átalakítva - Figyelmeztetés: nincs "
 "írásjog)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu sor beolvasva"
 msgstr[1] "%lu sor beolvasva"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] "%lu sor beolvasva (Figyelmeztetés: nincs írásjog)"
 msgstr[1] "%lu sor beolvasva (Figyelmeztetés: nincs írásjog)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Fájl beolvasása"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Új fájl"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "„%s� nem található"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s� egy könyvtár"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "A(z) „%s� egy eszközfájl"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Az új pufferben futtatandó parancs [ebből: %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Futtatandó parancs [ebből: %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Az új pufferbe szúrandó fájl [ebből: %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Beszúrandó fájl [ebből: %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "A billentyű illegális nem többpufferes módban"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Nem lehet a következőn kívülre írni: %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 "Nem lehet szimbolikus link elé vagy mögé szúrni, ha a --nofollow be van "
 "állítva"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Hiba a biztonságimentés-fájl (%s) írásakor: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Túl sok biztonsági mentés van?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Hiba „%s� írása közben: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Hiba az ideiglenes fájl írásakor: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%lu sor kiírva"
 msgstr[1] "%lu sor kiírva"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS formátum]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac formátum]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Biztonsági mentés]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "A kiválasztott rész beszúrása a szöveg elé"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "A kiválasztott rész hozzáfűzése a fájlhoz"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "A kiválasztott rész mentése fájlba"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Beszúrás ezen fájl elé"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Hozzáfűzés ehhez a fájlhoz"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Mentés ebbe a fájlba"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "A fájl már létezik, FELÜL�RJA? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Menti a fájlt M�S NÉVEN? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "A fájl módosult, mióta megnyitotta, folytatja a mentést?"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(tovább)"
 
-#: src/files.c:2694 src/rcfile.c:1220
-#, c-format
+#: src/files.c:2974
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
 "A nano indításának folytatásához nyomja le az Enter billentyűt.\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Mégsem"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Csere"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Nincs csere"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Kis/Nagy"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Vissza"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Regkif"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Kilépés"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "ElőzőElőzm"
+#: src/global.c:478
+msgid "Close"
+msgstr "Bezárás"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "KövElőzm"
+#: src/global.c:479
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Beillesztés"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Ugrás szövegre"
+#: src/global.c:481
+#, fuzzy
+msgid "Unjustify"
+msgstr "Nem sork."
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Következőre"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Első fájl"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Utolsó fájl"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Tallózás"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS formátum"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac formátum"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Hozzáfűz"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Elejére beszúrás"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Bizt. fájlmentés"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Parancs végrehajtása"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Könyvtárba"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Súgó"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Kilépés"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Keresés"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Előző old."
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Köv. old."
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Első sor"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Csere"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Utolsó sor"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Ugrás sorra"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Felfüggesztés"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Előző sor"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Bek. kezdete"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Köv. sor"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Bek. vége"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Beolvasás"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Sorkizár"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Frissít"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Fájl beszúrása"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Ugrás sorra"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Aktuális bekezdés sorkizárttá rendezése"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Aktuális művelet megszakítása"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Ezen súgószöveg megjelenítése"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Aktuális fájlpuffer bezárása/Kilépés a nanoból"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Kilépés a nanoból"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Az aktuális fájl lemezre mentése"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Másik fájl beszúrása"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Karakterlánc vagy reguláris kifejezés keresése"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Ugrás az előző oldalra"
+#: src/global.c:526
+#, fuzzy
+msgid "Search for a string"
+msgstr "Karakterlánc vagy reguláris kifejezés keresése"
 
-#: src/global.c:521
-msgid "Go to next screen"
+#: src/global.c:528
+#, fuzzy
+msgid "Go one screenful up"
 msgstr "Ugrás a következő oldalra"
 
-#: src/global.c:523
+#: src/global.c:529
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "Ugrás a következő oldalra"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Aktuális sor kivágása és tárolása a kivágási pufferben"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "A kivágási pufferben lévő sor beillesztése az aktuális sorba"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "A kurzor helyének megjelenítése"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "A helyesírás-ellenőrző indítása, ha elérhető"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Karakterlánc vagy reguláris kifejezés cseréje"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Ugrás megadott pozícióra"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "A kurzornál lévő szöveg kijelölése"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Az utolsó keresés megismétlése"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Aktuális sor másolása és tárolása a kivágási pufferben"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Aktuális sor behúzása"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Aktuális sor behúzásának megszüntetése"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Utolsó művelet visszavonása"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Az utoljára visszavont művelet ismétlése"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Egy karakterrel előre"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Egy karakterrel vissza"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Egy szóval előre"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Egy szóval vissza"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Az előző sorra"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "A következő sorra"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "A sor elejére"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "A sor végére"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "A bekezdés elejére; majd az előző bekezdésére"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "A bekezdés végére; majd a következő bekezdésére"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "A fájl első sorára"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "A fájl utolsó sorára"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Az illeszkedő zárójelre"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Görgetés egy sorral fel a kurzor görgetése nélkül"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Görgetés egy sorral le a kurzor görgetése nélkül"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Váltás az előző fájlpufferre"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Váltás a következő fájlpufferre"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "A következő billentyűleütés szó szerinti beszúrása"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Tabulátor beszúrása a kurzor helyére"
 
@@ -651,330 +636,448 @@ msgstr "Tabulátor beszúrása a kurzor helyére"
 msgid "Insert a newline at the cursor position"
 msgstr "Új sor beszúrása a kurzor helyére"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "A kurzor helyén lévő karakter törlése"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "A kurzor előtt álló karakter törlése"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Kivágás a kurzortól a fájl végéig"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Az egész fájl sorkizárttá rendezése"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "A szavak, sorok és karakterek megszámolása"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "A képernyő frissítése"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "A szerkesztő felfüggesztése (ha engedélyezett)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "A keresés kis- és nagybetűérzékenységének átváltása"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "A keresés irányának megfordítása"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Reguláris kifejezések használatának átváltása"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Az előző kereső- vagy cserekifejezés előhozása"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "A következő kereső- vagy cserekifejezés előhozása"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Tallózás"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "DOS formátum használatának átváltása"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Mac formátum használatának átváltása"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Hozzáfűzés átváltása"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Elejére beszúrás átváltása"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Eredeti fájlról biztonsági másolat készítésének átváltása"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Külső parancs végrehajtása"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Új puffer használatának átváltása"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Kilépés a fájlböngészőből"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Ugrás a lista első fájljára"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Ugrás a lista utolsó fájljára"
 
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "Ugrás a lista következő fájljára"
-
-#: src/global.c:642
+#: src/global.c:634
 msgid "Go to the previous file in the list"
 msgstr "Ugrás a lista előző fájljára"
 
-#: src/global.c:643
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Ugrás a lista következő fájljára"
+
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Könyvtárváltás"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Bezárás"
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "A helyesírás-ellenőrző indítása, ha elérhető"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Az előző sorra"
+
+#: src/global.c:641
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "A következő sorra"
+
+#: src/global.c:642
+#, fuzzy
+msgid "Invoke formatter, if available"
+msgstr "A helyesírás-ellenőrző indítása, ha elérhető"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Súgó"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Mégsem"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "Mentés"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Könyvtárba"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Kivágás"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Sorkizárás"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Beolvasás"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Helyes-e?"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Kivágás"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "Ugrás sorra"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Nem sork."
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS formátum"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Beillesztés"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Kis/Nagy"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Regkif"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Vissza"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Nincs csere"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Pozíció"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Helyes-e?"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Előző old."
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Köv. old."
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Első sor"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Utolsó sor"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Nem zárójel"
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Kijelöl"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Szöveg másolása"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Szövegbehúzás"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Szövegbehúzás megsz."
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Vissza"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Újra"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Előre"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Vissza"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Köv. szó"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Előre"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Előző szó"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Előző sor"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Köv. sor"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Köv. szó"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Eleje"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Vége"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Másik zárójel megkeresése"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Bek. kezdete"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Bek. vége"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Görgetés fel"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Görgetés le"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "Előző fájl"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Következő fájl"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
 msgstr "Szó szerinti bevitel"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tabulátor"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Visszalép"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "KivágAVégéig"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Szavak száma"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Felfüggesztés"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "ElőzőElőzm"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "KövElőzm"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Ugrás szövegre"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS formátum"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac formátum"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Hozzáfűz"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Elejére beszúrás"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Bizt. fájlmentés"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Parancs végrehajtása"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Tallózás"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Első fájl"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Utolsó fájl"
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Előző sor"
+
+#: src/global.c:979
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "Köv. sor"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Súgó mód"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Kurzor pozíciójának állandó mutatása"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Eggyel több sor használata a szerkesztéshez"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Egyenletes görgetés"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Ne tördelje a hosszú sorokat"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Üreshely karakterek megjelenítése"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Színes szintaxiskiemelés"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Intelligens home billentyű"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Automatikus igazítás"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Kivágás a végéig"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Hosszú sorok tördelése"
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Ne tördelje a hosszú sorokat"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Bevitt tabulátorok szóközzé alakítása"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Fájlok biztonsági mentése"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Több fájlpuffer"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Egér támogatása"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Ne legyen átalakítás DOS/Mac formátumból"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Felfüggesztés"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Laza sortördelés"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -995,7 +1098,7 @@ msgstr ""
 " Az előző keresési kifejezés a keresés után zárójelben meg lesz jelenítve. "
 "Új szöveg beírása nélkül Entert ütve az előző keresés lesz megismételve.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1009,7 +1112,7 @@ msgstr ""
 " Kereső módban a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1029,7 +1132,7 @@ msgstr ""
 " Sorra ugrás módban a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1052,7 +1155,7 @@ msgstr ""
 "külön pufferbe fog betöltődni (melyek között a Meta-< és > gombokkal lehet "
 "navigálni).  "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1066,7 +1169,7 @@ msgstr ""
 " Fájlbeszúrás módban a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1095,7 +1198,7 @@ msgstr ""
 " Fájlmentés módban a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1120,7 +1223,7 @@ msgstr ""
 " A fájlböngészőben a következő funkcióbillentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1144,7 +1247,7 @@ msgstr ""
 "kerül megismétlésre.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1152,7 +1255,7 @@ msgstr ""
 " A következő funkcióbillentyűk állnak rendelkezésre keresés módban:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1175,7 +1278,7 @@ msgstr ""
 "rendelkezésre:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1200,7 +1303,7 @@ msgstr ""
 "rendelkezésre:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1221,7 +1324,7 @@ msgstr ""
 " Parancs-végrehajtási módban a következő billentyűk állnak rendelkezésre:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1241,7 +1344,7 @@ msgstr ""
 "amely az épp szerkesztett fájl mutatja. Az állapotsor alulról a harmadik "
 "sor, és fontos üzeneteket jelenít meg.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1260,7 +1363,7 @@ msgstr ""
 "sorozatai a Meta (M) szimbólum jelöli és az Esc, Alt vagy Meta billentyűk "
 "egyikével vihető be, a billentyűzet beállításaitól függően.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1274,15 +1377,15 @@ msgstr ""
 "billentyűk zárójelben vannak megjelenítve:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "be/kikapcsolása"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "A billentyű illegális megjelenítés módban"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1291,7 +1394,7 @@ msgstr ""
 "\n"
 "A puffer a(z) %s fájlba írva\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1300,7 +1403,7 @@ msgstr ""
 "\n"
 "A puffer nem lett a(z) %s fájlba írva: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1309,11 +1412,11 @@ msgstr ""
 "\n"
 "A puffer nem került mentésre: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Az ablak mérete túl kicsi a nanonak…\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1322,279 +1425,287 @@ msgstr ""
 "Használat: nano [KAPCSOLÓK] [[+SOR,OSZLOP] F�JL]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Kapcsoló\t\tGNU hosszú kapcsoló\t\tJelentés\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Kapcsoló\t\tJelentés\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Ezen üzenet kiírása"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+SOR,OSZLOP"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "A SOR. sorban és OSZLOP. oszlopban kezd"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Okos home billentyű engedélyezése"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr ""
 "Meglévő fájlokról biztonsági másolatok\n"
 "\t\t\t\t\t  mentése"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <könyvtár>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<könyvtár>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr ""
 "Az egyedi biztonsági mentés fájlok\n"
 "\t\t\t\t\t  mentési könyvtára"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr ""
 "Félkövér használata invertált szöveg\n"
 "\t\t\t\t\t  helyett"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr ""
 "Beírt tab karakterek átalakítása\n"
 "\t\t\t\t\t  szóközökké"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Több fájlpuffer engedélyezése"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr ""
 "Keresés/csere előzményeinek naplózása\n"
 "\t\t\t\t\t  és olvasása"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "nanorc fájlok keresésének kihagyása"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr ""
 "A numerikus billentyűzet zavarainak\n"
 "\t\t\t\t\t  javítása"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Ne adjon új sorokat a fájlok végéhez"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr ""
 "Ne alakítsa át a fájlokat DOS/Mac\n"
 "\t\t\t\t\t  formátumról"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr ""
 "Eggyel több sor használata a\n"
 "\t\t\t\t\t  szerkesztéshez"
 
-#: src/nano.c:860
+#: src/nano.c:886
+#, fuzzy
+msgid "Log & read location of cursor position"
+msgstr "Tabulátor beszúrása a kurzor helyére"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <szöveg>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<szöveg>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Idézetszöveg"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Korlátozott mód"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Görgetés soronként fél képernyő helyett"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#oszlop>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#oszlop>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr ""
 "A tabulátorszélesség legyen #oszlop\n"
 "\t\t\t\t\t  oszlop"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Törölje gyorsan az állapotsort"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Verziószám kiírása és kilépés"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Szóhatárok pontosabb észlelése"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <szöveg>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<szöveg>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr ""
 "A színezéshez használandó\n"
 "\t\t\t\t\t  szintaxisleírás"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Kurzor pozíciójának állandó mutatása"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Visszatörlés/törlés zavarainak javítása"
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "Ezen súgószöveg megjelenítése"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Új sorok automatikus behúzása"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Kivágás a kurzor helyétől a sor végéig"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr ""
 "Szimbolikus linkek követése helyett\n"
 "\t\t\t\t\t  felülírás"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Egér használatának engedélyezése"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <könyvtár>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<könyvtár>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Munkakönyvtár beállítása"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr ""
 "XON (^Q) és XOFF (^S) billentyűk\n"
 "\t\t\t\t\t  megőrzése"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Indítási hibák, például rc-fájlhibák csendes mellőzése"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#oszlop>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#oszlop>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Töréspont beállítása a #oszlop oszlopnál"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr ""
 "Alternatív helyesírás-ellenőrző\n"
 "\t\t\t\t\t  használata"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Automatikus mentés kilépéskor"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "�ltalános visszavonás engedélyezése [K�SÉRLETI]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Megjelenítés mód (csak olvasható)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Ne tördelje a hosszú sorokat"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "A két súgósor elrejtése"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Felfüggesztés engedélyezése"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "Laza sortördelés engedélyezése"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr ""
-"(A Pico kompatibilitás érdekében\n"
-"\t\t\t\t\t mellőzve)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano %s verzió. (fordítva: %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " E-mail: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1603,157 +1714,181 @@ msgstr ""
 "\n"
 " Fordítási kapcsolók:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Elnézést, a funkció támogatása ki van kapcsolva"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Menti a változtatásokat („NEM� V�LASZ ESETÉN MINDEN MÓDOS�T�S ELVÉSZ)? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Az stdin nem nyitható újra a billentyűzetről.\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Olvasás stdinről, ^C megszakítja\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP vagy SIGTERM érkezett\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Az „fg� kiadásával visszatérhet a nanohoz.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "engedélyezve"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "kikapcsolva"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Ismeretlen parancs"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON kihagyva, ej-ej"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF kihagyva, ej-ej"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "A kért „%s� tabméret érvénytelen"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "A kért „%s� kitöltésméret érvénytelen"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr ""
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "IiYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "MmAa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Igen"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Mindet"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Nem"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Hiba a(z) %s %lu. sorában: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "A(z) „%s� argumentum lezáratlan \" jellel rendelkezik"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "A reguláris kifejezéseknek \" karakterekkel kezdődniük és végződniük"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Hibás regex: „%s�: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Hiányzó szintaxisnév"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "A „nincs� szintaxis fenn van tartva"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Az „alapértelmezett� szintaxis nem vehet fel kiterjesztéseket"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Hiányzó kulcsnév"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:463
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 "a billentyűtársításoknak a „^�, „M�, vagy „F� egyikével kell kezdődniük"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+#, fuzzy
+msgid "Must specify a function to bind the key to"
 msgstr "Meg kell adnia a funkciót, amelyhez billentyűt kíván kötni"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
-"Meg kell adnia a menüt, amelyhez billentyűt kíván kötni (vagy az „all� "
-"értéket)"
 
-#: src/rcfile.c:426
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#: src/rcfile.c:489
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
 msgstr "A név („%s�) nem képezhető le funkcióra"
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
+#: src/rcfile.c:496
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "A név („%s�) nem képezhető le menüre"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
+
+#: src/rcfile.c:543
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "A billentyű-karakterlánc („%s�) nem érvényes kötés"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Hiba %s olvasásakor: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1767,135 +1902,196 @@ msgstr ""
 "„white�, „yellow�, „cyan�, „magenta� és \n"
 "„black�, opcionális „bright� előtaggal az előtérszínekhez."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Nem adható meg színparancs szintaxissor nélkül"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Hiányzik a szín neve"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "A(z) „%s� háttérszín nem lehet világos"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Hiányzó regex karaktersorozat"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=� -hoz kell egy megfelelő „end=�"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "A(z) „%s� háttérszín nem lehet világos"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Nem adható meg fejléc regex szintaxisparancs nélkül"
 
-#: src/rcfile.c:874
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:921
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Nem adható meg fejléc regex szintaxisparancs nélkül"
+
+#: src/rcfile.c:926
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Hiányzó regex karaktersorozat"
+
+#: src/rcfile.c:985
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Nem adható meg fejléc regex szintaxisparancs nélkül"
+
+#: src/rcfile.c:990
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Hiányzik a szín neve"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Nem adható meg színparancs szintaxissor nélkül"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Végzetes hiba: nincsenek billentyűk leképezve a függvényhez („%s�)"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, fuzzy, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 "Kilépés. Használja a nanot a -I kapcsolóval, ha módosítani kívánja a nanorc "
 "beállításait\n"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "A név („%s�) nem képezhető le menüre"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "A(z) „%s� parancs nem engedélyezett a tartalmazott fájlban"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "A(z) „%s� szintaxis nem rendelkezik színparancsokkal"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "A(z) „%s� parancs nem értelmezhető"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Hiányzik a jelző"
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "Hiányzik a szín neve"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "A(z) „%s� kapcsoló egy paramétert igényel"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "A kapcsoló nem érvényes több bájtos karaktersorozat"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Nem üres karakterek szükségesek"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Két egyoszlopos karakter szükséges"
 
-#: src/rcfile.c:1114
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1339
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "A(z) „%s� jelző nem állítható vissza"
 
-#: src/rcfile.c:1123
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1345
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Ismeretlen jelző: „%s�"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nincs meg a saját könyvtár! Hopp!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"A nano indításának folytatásához nyomja le az Enter billentyűt.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "A(z) „%.*s%s� nem található"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [kis/Nagy]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Regexp]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Vissza]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (cseréhez) a kijelölésben"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (cseréhez)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Lecseréli ezt a találatot?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Csere ezzel"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%lu előfordulás cserélve"
 msgstr[1] "%lu előfordulás cserélve"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Kérem a sor, oszlop számát"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Érvénytelen sor- vagy oszlopszám"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Nem zárójel"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Nincs illeszkedő zárójel"
 
@@ -1907,214 +2103,319 @@ msgstr "Kijelölés kezdete"
 msgid "Mark Unset"
 msgstr "Kijelölés vége"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "A visszavonási puffer üres!"
 
-#: src/text.c:455 src/text.c:593
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+#: src/text.c:445 src/text.c:590
+#, fuzzy, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr "Belső hiba: a(z) %d. sor nem illeszthető. Mentse a munkáját."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "szöveg hozzáadása"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "szöveg törlése"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "sorok körbefuttatása"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "sorok egyesítése"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "szöveg kivágása"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "kivágás visszavonása"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "sortörés"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "szöveg beszúrása"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "szöveg cseréje"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr "Belső hiba: ismeretlen típus. Mentse a munkáját."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Művelet visszavonva (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Nincs mit ismételni."
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "Belső hiba: a visszavonás beállítása sikertelen. Mentse a munkáját."
+#: src/text.c:584
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr ""
+"Belső hiba: a kivágás visszavonása nem állítható be. Mentse a munkáját."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Művelet megismételve (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Nem küldhető tovább"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Nem hozható létre a cső"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Nem forkolható"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 "Belső hiba: a kivágás visszavonása nem állítható be. Mentse a munkáját."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Belső hiba: ismeretlen típus. Mentse a munkáját."
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Hibás idézetszöveg: %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Most már lehet nem sorkizárttá tenni!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "A helyettesítő érték módosítása"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Nem hozható létre a cső"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Elgépelt szavak listájának létrehozása, kis türelmet..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Nem kérhető le a csőpuffer mérete"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Hiba a „spell� meghívásakor"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Hiba a „sort -f� meghívásakor"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Hiba a „uniq� meghívásakor"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "A helyesírás-ellenőrzés befejeződött"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Hiba a(z) „%s� meghívásakor"
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "A helyesírás-ellenőrző indítása, ha elérhető"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "A helyesírás-ellenőrzés meghiúsult: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "A helyesírás-ellenőrzés meghiúsult: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Ne adjon új sorokat a fájlok végéhez"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "Ezen üzenet kiírása"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "Ezen üzenet kiírása"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sSzavak: %lu  Sorok: %ld  Karakterek: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "A kiválasztásban:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Szó szerinti bevitel"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano: elfogyott a memória!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Unicode bevitel"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Módosítva"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Nézet"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "Könyvtár:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Fájl:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "sor %ld/%ld (%d%%), oszlop %lu/%lu (%d%%), karakter %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "A nano szövegszerkesztő"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "verzió"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Fejlesztők:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Külön köszönet:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "A Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Az ncurses számára:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "és mindenkinek, akit kifelejtettünk volna..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Köszönjük, hogy a nano-t választotta!"
+
+#~ msgid "Insert File"
+#~ msgstr "Fájl beszúrása"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Ugrás az előző oldalra"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Másik zárójel megkeresése"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Hosszú sorok tördelése"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Laza sortördelés"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "�ltalános visszavonás engedélyezése [K�SÉRLETI]"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr ""
+#~ "(A Pico kompatibilitás érdekében\n"
+#~ "\t\t\t\t\t mellőzve)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr ""
+#~ "Meg kell adnia a menüt, amelyhez billentyűt kíván kötni (vagy az „all� "
+#~ "értéket)"
+
+#~ msgid "Missing flag"
+#~ msgstr "Hiányzik a jelző"
+
+#~ msgid "line wrap"
+#~ msgstr "sorok körbefuttatása"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Belső hiba: ismeretlen típus. Mentse a munkáját."
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr "Belső hiba: a visszavonás beállítása sikertelen. Mentse a munkáját."
+
+#~ msgid "Could not pipe"
+#~ msgstr "Nem küldhető tovább"
diff --git a/po/id.gmo b/po/id.gmo
index 1c84cd6..944f1f1 100644
--- a/po/id.gmo
+++ b/po/id.gmo
diff --git a/po/id.po b/po/id.po
index 8006e27..ed41f0f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,122 +1,147 @@
-# nano 1.2.1 (Indonesian)
+# Indonesian translation of nano.
 # Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-# Tedi Heriyanto <tedi_h@gmx.net>, 2001, 2002, 2003
 #
+# Tedi Heriyanto <tedi_h@gmx.net>, 2001, 2002, 2003
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2003-04-23 09:41+0000\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 #, fuzzy
 msgid "Go To Directory"
 msgstr "Ke Direktori"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Dibatalkan"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Tidak dapat keluar %s dalam mode terbatas"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, fuzzy, c-format
 msgid "Error reading %s: %s"
 msgstr "Quote string buruk %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Tidak dapat memindahkan direktori"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Cari"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Case Sensitive]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Regexp]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Backwards]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Pancarian Di-wrapped"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Hanya ini adanya"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr ""
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Tidak dapat menset permisi %o pada %s: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Kesalahan dalam %s pada baris %d: "
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Kesalahan dalam %s pada baris %d: "
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Kesalahan dalam %s pada baris %d: "
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Tidak dapat menyisipkan file dari luar %s"
 
-#: src/files.c:234
+#: src/files.c:467
 #, fuzzy
 msgid "No more open file buffers"
 msgstr "Tidak ada file yang terbuka lagi"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Beralih ke %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Buffer baru"
 
-#: src/files.c:633
+#: src/files.c:874
 #, fuzzy, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Baca %d baris (Dikonversi dari format Mac)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -126,13 +151,13 @@ msgid_plural ""
 "permission)"
 msgstr[0] "Baca %d baris (Dikonversi dari format Mac)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, fuzzy, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Baca %d baris (Dikonversi dari format Mac)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -140,13 +165,13 @@ msgid_plural ""
 "Read %lu lines (Converted from Mac format - Warning: No write permission)"
 msgstr[0] "Baca %d baris (Dikonversi dari format Mac)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, fuzzy, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Membaca %d baris (Konversi dari format DOS)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -154,506 +179,452 @@ msgid_plural ""
 "Read %lu lines (Converted from DOS format - Warning: No write permission)"
 msgstr[0] "Membaca %d baris (Konversi dari format DOS)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, fuzzy, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Membaca %d baris"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] ""
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Membaca File"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "File Baru"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" tidak ditemukan"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" adalah sebuah direktori"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "File \"%s\" adalah sebuah file device"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, fuzzy, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "File yang akan disisipkan ke buffer baru [dari %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, fuzzy, c-format
 msgid "Command to execute [from %s] "
 msgstr "Perintah untuk dieksekusi "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "File yang akan disisipkan ke buffer baru [dari %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "File yang akan disisipkan [dari %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 #, fuzzy
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Kunci ilegal dalam mode non-multibuffer"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Tidak dapat menulis di luar %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 #, fuzzy
 msgid "Too many backup files?"
 msgstr ""
 "\n"
 "No %s ditulis (terlalu banyak file backup?)\n"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, fuzzy, c-format
 msgid "Error writing %s: %s"
 msgstr "Quote string buruk %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Menulis %d baris"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS Format]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac Format]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Backup]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Menambahkan Pilihan ke File"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Menambahkan Pilihan ke File"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Menulis Pilihan ke File"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Nama file yang akan ditambah ke"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Nama file yang akan ditambah ke"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Nama File untuk di-Tulis"
 
-#: src/files.c:2153
+#: src/files.c:2427
 #, fuzzy
 msgid "File exists, OVERWRITE ? "
 msgstr "File ada, DITIMPA ?"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(lagi)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
-msgstr ""
-"\n"
-"Tekan return untuk lanjut memulai nano\n"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Batal"
+"Press Enter to continue\n"
+msgstr "Tekan return untuk lanjut\n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "Ganti"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Tiada Replace"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Case Sens"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
 
-#: src/global.c:421
-#, fuzzy
-msgid "Backwards"
-msgstr " [Backwards]"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Regexp"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Keluar"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-#, fuzzy
-msgid "PrevHstory"
-msgstr "Sejarah"
+#: src/global.c:478
+msgid "Close"
+msgstr "Tutup"
 
-#: src/global.c:452
+#: src/global.c:479
 #, fuzzy
-msgid "NextHstory"
-msgstr "Sejarah"
+msgid "Uncut Text"
+msgstr "UnCut Teks"
 
-#: src/global.c:453
+#: src/global.c:481
 #, fuzzy
-msgid "Go To Text"
-msgstr "Ke baris"
+msgid "Unjustify"
+msgstr "UnJustifikasi"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 #, fuzzy
 msgid "WhereIs Next"
 msgstr "Di mana"
 
-#: src/global.c:457
-#, fuzzy
-msgid "First File"
-msgstr "Baris pertama"
-
-#: src/global.c:458
-#, fuzzy
-msgid "Last File"
-msgstr "Baris terakhir"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Ke File"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Format DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Format Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Tambah"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Tambah"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Backup File"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Eksekusi Perintah"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Ke Direktori"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Bantuan"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Keluar"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Di mana"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Hlm sebelumnya"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Hlm berikutnya"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Baris pertama"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Ganti"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Baris terakhir"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Ke baris"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Tunda"
+#: src/global.c:495
+#, fuzzy
+msgid "Prev Line"
+msgstr "Hlm sebelumnya"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr ""
+#: src/global.c:496
+#, fuzzy
+msgid "Next Line"
+msgstr "File Sesudahnya"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr ""
+#: src/global.c:497
+msgid "Read File"
+msgstr "Baca File"
 
-#: src/global.c:491
+#: src/global.c:499
 #, fuzzy
 msgid "FullJstify"
 msgstr "Justifikasi"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Refresh"
 
-#: src/global.c:495
-#, fuzzy
-msgid "Insert File"
-msgstr "File Sesudahnya"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Ke baris"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Justifikasi paragraf saat ini"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Batalkan fungsi ini"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:509
+#: src/global.c:513
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Tutup file yang sedang dimuat/Keluar dari nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Keluar dari nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Tulis file sekarang ke disk"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Sertakan file lain ke file saat ini"
 
-#: src/global.c:519
+#: src/global.c:523
 #, fuzzy
 msgid "Search for a string or a regular expression"
 msgstr "Gunakan Regular expression"
 
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Pindah ke layar sebelumnya"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr ""
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Pindah ke layar berikutnya"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr ""
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Hapus baris saat ini dan taruh dalam cutbuffer"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Kembalikan dari cutbuffer ke baris saat ini"
 
-#: src/global.c:527
+#: src/global.c:534
 #, fuzzy
 msgid "Display the position of the cursor"
 msgstr "Tampilkan posisi kursor"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Panggil spell checker (jika ada)"
 
-#: src/global.c:531
+#: src/global.c:538
 #, fuzzy
 msgid "Replace a string or a regular expression"
 msgstr "Gunakan Regular expression"
 
-#: src/global.c:532
+#: src/global.c:539
 #, fuzzy
 msgid "Go to line and column number"
 msgstr "Ke nomor baris tertentu"
 
-#: src/global.c:534
+#: src/global.c:541
 #, fuzzy
-msgid "Mark text at the cursor position"
+msgid "Mark text starting from the cursor position"
 msgstr "Tandai teks pada lokasi kursor saat ini"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr ""
 
-#: src/global.c:537
+#: src/global.c:544
 #, fuzzy
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Hapus baris saat ini dan taruh dalam cutbuffer"
 
-#: src/global.c:538
+#: src/global.c:545
 #, fuzzy
 msgid "Indent the current line"
 msgstr "Tambahkan ke file saat ini"
 
-#: src/global.c:539
+#: src/global.c:546
 #, fuzzy
 msgid "Unindent the current line"
 msgstr "Tambahkan ke file saat ini"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:543
+#: src/global.c:550
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Pindah satu karakter ke depan"
 
-#: src/global.c:544
+#: src/global.c:551
 #, fuzzy
 msgid "Go back one character"
 msgstr "Pindah satu karakter ke belakang"
 
-#: src/global.c:546
+#: src/global.c:553
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Ke depan satu kata"
 
-#: src/global.c:547
+#: src/global.c:554
 #, fuzzy
 msgid "Go back one word"
 msgstr "Ke belakang satu kata"
 
-#: src/global.c:549
+#: src/global.c:556
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Pindah ke layar sebelumnya"
 
-#: src/global.c:550
+#: src/global.c:557
 #, fuzzy
 msgid "Go to next line"
 msgstr "Turun satu baris"
 
-#: src/global.c:551
+#: src/global.c:558
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Pindah ke awal baris ini"
 
-#: src/global.c:552
+#: src/global.c:559
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Pindah ke akhir baris ini"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Ke baris terawal file"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Ke baris terakhir file"
 
-#: src/global.c:564
+#: src/global.c:569
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Tidak ada tanda kurung yang cocok"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:572
+#: src/global.c:576
 #, fuzzy
 msgid "Switch to the previous file buffer"
 msgstr "Pindah ke layar sebelumnya"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:579
+#: src/global.c:580
 #, fuzzy
 msgid "Insert a tab at the cursor position"
 msgstr "Sertakan carriage return di posisi kursor"
@@ -663,353 +634,469 @@ msgstr "Sertakan carriage return di posisi kursor"
 msgid "Insert a newline at the cursor position"
 msgstr "Sertakan carriage return di posisi kursor"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Hapus karakter pada kursor"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Hapus satu karakter di kiri kursor"
 
-#: src/global.c:588
+#: src/global.c:587
 #, fuzzy
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Kembalikan dari cutbuffer ke baris saat ini"
 
-#: src/global.c:591
+#: src/global.c:590
 #, fuzzy
 msgid "Justify the entire file"
 msgstr "Justifikasi paragraf saat ini"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Refresh (redraw) layar saat ini"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr ""
 
-#: src/global.c:605
+#: src/global.c:604
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "Tampilkan posisi kursor"
 
-#: src/global.c:609
+#: src/global.c:608
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Gunakan Regular expression"
 
-#: src/global.c:613
+#: src/global.c:612
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Edit string search/replace sebelumnya"
 
-#: src/global.c:615
+#: src/global.c:614
 #, fuzzy
 msgid "Recall the next search/replace string"
 msgstr "Edit string search/replace sebelumnya"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Ke browser file"
 
-#: src/global.c:621
+#: src/global.c:620
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Tulis file dalam format DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Tulis file dalam format Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Eksekusi perintah eksternal"
 
-#: src/global.c:633
+#: src/global.c:628
 #, fuzzy
 msgid "Toggle the use of a new buffer"
 msgstr "Pilih insert ke buffer baru"
 
-#: src/global.c:636
+#: src/global.c:631
 #, fuzzy
 msgid "Exit from the file browser"
 msgstr "Ke browser file"
 
-#: src/global.c:638
+#: src/global.c:632
 #, fuzzy
 msgid "Go to the first file in the list"
 msgstr "Ke baris terawal file"
 
-#: src/global.c:640
+#: src/global.c:633
 #, fuzzy
 msgid "Go to the last file in the list"
 msgstr "Ke baris terakhir file"
 
-#: src/global.c:641
+#: src/global.c:634
+#, fuzzy
+msgid "Go to the previous file in the list"
+msgstr "Ke baris terawal file"
+
+#: src/global.c:635
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Ke baris terakhir file"
 
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Ke Direktori"
+
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Panggil spell checker (jika ada)"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Ke nomor baris tertentu"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr ""
+
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Ke baris terawal file"
+msgid "Invoke formatter, if available"
+msgstr "Panggil spell checker (jika ada)"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Ke Direktori"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Bantuan"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Tutup"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Batal"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "Tulis"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Ke Direktori"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Ptng Teks"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Justifikasi"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Baca File"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Mengeja"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Ptng Teks"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "Ke baris"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "UnJustifikasi"
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "Format DOS"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Case Sens"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Regexp"
+
+#: src/global.c:755
 #, fuzzy
-msgid "UnCut Text"
-msgstr "UnCut Teks"
+msgid "Backwards"
+msgstr " [Backwards]"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Tiada Replace"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Pos Kursor"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Mengeja"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Hlm sebelumnya"
 
-#: src/global.c:771
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Hlm berikutnya"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Baris pertama"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Baris terakhir"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Bukan tanda kurung"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Tandai Teks"
 
-#: src/global.c:777
+#: src/global.c:800
 #, fuzzy
 msgid "Copy Text"
 msgstr "Ptng Teks"
 
-#: src/global.c:780
+#: src/global.c:803
 #, fuzzy
 msgid "Indent Text"
 msgstr "Ptng Teks"
 
-#: src/global.c:783
-#, fuzzy
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "UnCut Teks"
+msgstr ""
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Depan"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Belakang"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Kata Berikut"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Depan"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Kata Sebelum"
 
-#: src/global.c:824
-#, fuzzy
-msgid "Prev Line"
-msgstr "Hlm sebelumnya"
-
-#: src/global.c:827
-#, fuzzy
-msgid "Next Line"
-msgstr "File Sesudahnya"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Kata Berikut"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Awal"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Akhir"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Cari Kurung Lain"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr ""
 
-#: src/global.c:848
-msgid "Scroll Up"
+#: src/global.c:846
+msgid "End of Par"
 msgstr ""
 
 #: src/global.c:851
+msgid "Scroll Up"
+msgstr ""
+
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "File Sebelumnya"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "File Sesudahnya"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Tunda"
+
+#: src/global.c:910
+#, fuzzy
+msgid "PrevHstory"
+msgstr "Sejarah"
+
+#: src/global.c:913
+#, fuzzy
+msgid "NextHstory"
+msgstr "Sejarah"
+
+#: src/global.c:917
+#, fuzzy
+msgid "Go To Text"
+msgstr "Ke baris"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Format DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Format Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Tambah"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Tambah"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Backup File"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Eksekusi Perintah"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Ke File"
+
+#: src/global.c:964
+#, fuzzy
+msgid "First File"
+msgstr "Baris pertama"
+
+#: src/global.c:966
+#, fuzzy
+msgid "Last File"
+msgstr "Baris terakhir"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr ""
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr ""
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Mode bantuan"
 
-#: src/global.c:1369
+#: src/global.c:1229
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Posisi kursor konstan"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Scrolling halus"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Jangan wrap baris panjang"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Pewarnaan sintaks"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Inden otomatis"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Cut hingga akhir"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr ""
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Jangan wrap baris panjang"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1389
+#: src/global.c:1251
 #, fuzzy
 msgid "Backup files"
 msgstr "Backup File"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Buffer file multi"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Dukungan mouse"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Tidak ada konversi dari format DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 #, fuzzy
 msgid "Suspension"
 msgstr "Tunda"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr ""
-
-#: src/help.c:236
+#: src/help.c:205
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -1034,7 +1121,7 @@ msgstr ""
 " Tombol-tombol fungsi berikut tersedia dalam mode Search:\n"
 "\n"
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1043,7 +1130,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1063,7 +1150,7 @@ msgstr ""
 " Tombol-tombol fungsi berikut tersedia dalam mode Goto Line:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1094,7 +1181,7 @@ msgstr ""
 " Kunci-kunci fungsi berikut tersedia dalam mode Insert File:\n"
 "\n"
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1103,7 +1190,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:275
+#: src/help.c:244
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1132,7 +1219,7 @@ msgstr ""
 " Kunci-kunci fungsi berikut tersedia dalam mode Write File:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1156,7 +1243,7 @@ msgstr ""
 " Kunci-kunci fungsi berikut tersedia dalam file browser:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1182,13 +1269,13 @@ msgstr ""
 " Tombol-tombol fungsi berikut tersedia dalam mode Search:\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:315
+#: src/help.c:284
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1211,7 +1298,7 @@ msgstr ""
 "  Kunci-kunci fungsi berikut tersedia di dalam mode Browser GotoDir :\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1236,7 +1323,7 @@ msgstr ""
 "Check:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1256,7 +1343,7 @@ msgstr ""
 " Kunci-kunci berikut tersedia dalam mode ini:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1286,7 +1373,7 @@ msgstr ""
 "ditunjukkan dalam tanda kurung:\n"
 "\n"
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1297,7 +1384,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1306,16 +1393,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "enable/disable"
 
-#: src/nano.c:587
+#: src/nano.c:601
 #, fuzzy
 msgid "Key invalid in view mode"
 msgstr "Kunci ilegal dalam mode VIEW"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1324,7 +1411,7 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1333,7 +1420,7 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1342,286 +1429,291 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Ukuran window terlalu kecil bagi nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, fuzzy, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opsi\t\tOpsi Panjang\t\tArti\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opsi\t\tArti\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Tampilkan pesan ini"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr ""
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 #, fuzzy
 msgid "Start at line LINE, column COLUMN"
 msgstr "Mulai pada nomor baris LINE"
 
-#: src/nano.c:828
+#: src/nano.c:849
 #, fuzzy
 msgid "Enable smart home key"
 msgstr "Aktifkan mouse"
 
-#: src/nano.c:829
+#: src/nano.c:850
 #, fuzzy
 msgid "Save backups of existing files"
 msgstr "Backup file yang ada ketika menyimpan"
 
-#: src/nano.c:830
-#, fuzzy
+#: src/nano.c:851
 msgid "-C <dir>"
-msgstr "-o [dir]"
+msgstr ""
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr ""
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr ""
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr ""
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr ""
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Aktifkan multiple file buffer"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Log dan baca sejarah pencarian/penggantian string"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Jangan lihat file nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr ""
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr ""
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Jangan konversi file dari format DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:886
 #, fuzzy
+msgid "Log & read location of cursor position"
+msgstr "Posisi kursor konstan"
+
+#: src/nano.c:889
 msgid "-Q <str>"
-msgstr "-Q [str]"
+msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:889
 #, fuzzy
 msgid "--quotestr=<str>"
 msgstr "--quotestr=[str]"
 
-#: src/nano.c:861
+#: src/nano.c:890
 #, fuzzy
 msgid "Quoting string"
 msgstr "String kuote, default \"> \""
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr ""
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:897
 #, fuzzy
 msgid "-T <#cols>"
 msgstr "-r [#cols]"
 
-#: src/nano.c:868
+#: src/nano.c:897
 #, fuzzy
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=[num]"
 
-#: src/nano.c:869
+#: src/nano.c:898
 #, fuzzy
 msgid "Set width of a tab to #cols columns"
 msgstr "Set lebar tab ke num"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr ""
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Cetak informasi versi dan keluar"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr ""
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "-Y <str>"
-msgstr "-Y [str]"
+msgstr ""
 
-#: src/nano.c:880
+#: src/nano.c:909
 #, fuzzy
 msgid "--syntax=<str>"
 msgstr "--syntax [str]"
 
-#: src/nano.c:881
+#: src/nano.c:910
 #, fuzzy
 msgid "Syntax definition to use for coloring"
 msgstr "Definisi sintaks untuk digunakan"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Menampilkan posisi kursor secara konstan"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr ""
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "Tampilkan pesan ini"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Inden baris baru secara otomatis"
 
-#: src/nano.c:889
+#: src/nano.c:919
 #, fuzzy
 msgid "Cut from cursor to end of line"
 msgstr "Biarkan ^K memotong dari kursor hingga akhir baris"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Jangan ikuti link simbolik, timpa"
 
-#: src/nano.c:894
+#: src/nano.c:924
 #, fuzzy
 msgid "Enable the use of the mouse"
 msgstr "Aktifkan mouse"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
-msgstr "-o [dir]"
+msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:928
 #, fuzzy
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=[dir]"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Set direktori operasi"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Preserve kunci XON (^Q) dan XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 #, fuzzy
 msgid "-r <#cols>"
 msgstr "-r [#cols]"
 
-#: src/nano.c:905
+#: src/nano.c:938
 #, fuzzy
 msgid "--fill=<#cols>"
 msgstr "--fill=[#cols]"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
 msgstr ""
 
-#: src/nano.c:909
+#: src/nano.c:942
 #, fuzzy
 msgid "-s <prog>"
 msgstr "-s [prog]"
 
-#: src/nano.c:909
+#: src/nano.c:942
 #, fuzzy
 msgid "--speller=<prog>"
 msgstr "--speller=[prog]"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Aktifkan speller alternatif"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Auto save saat keluar, jangan tanya"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 #, fuzzy
 msgid "View mode (read-only)"
 msgstr "Mode view (hanya baca)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Jangan wrap baris panjang"
 
-#: src/nano.c:922
+#: src/nano.c:951
 #, fuzzy
 msgid "Don't show the two help lines"
 msgstr "Jangan tampilkan jendela bantuan"
 
-#: src/nano.c:923
+#: src/nano.c:952
 #, fuzzy
 msgid "Enable suspension"
 msgstr "Aktifkan suspend"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(abaikan, untuk kompatibilitas dengan Pico)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr "GNU nano versi %s (dikompilasi %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1630,157 +1722,181 @@ msgstr ""
 "\n"
 " Option kompilasi:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Maaf, dukungan untuk fungsi ini telah ditiadakan"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Simpan buffer termodifikasi (JAWAB \"No\" AKAN MENGHAPUS PERUBAHAN) ?"
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Menerima SIGHUP atau SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, fuzzy, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Gunakan \"fg\" untuk kembali ke nano"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "adakan"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "tiadakan"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr ""
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 #, fuzzy
 msgid "XON ignored, mumble mumble"
 msgstr "XON diabaikan, mumble mumble."
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 #, fuzzy
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF diabaikan, mumble mumble."
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, fuzzy, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "ukuran tab yang diminta %d tidak valid"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, fuzzy, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "ukuran fill yang diminta %d tidak valid"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr ""
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Tt"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Ya"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Semua"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Tidak"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, fuzzy, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Kesalahan dalam %s pada baris %d: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, fuzzy, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "argumen %s telah selesai.\""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 #, fuzzy
 msgid "Regex strings must begin and end with a \" character"
 msgstr "String regexp harus dimulai dan diakhiri dengan sebuah karakter \"\n"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex jelek \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Nama sintaks tidak ada"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr ""
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 #, fuzzy
 msgid "Missing key name"
 msgstr "Nama sintaks tidak ada"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr ""
 
-#: src/rcfile.c:426
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Tidak dapat membuka %s untuk menulis: %s"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Tidak dapat memanggil \"%s\""
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr ""
+
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr ""
+
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr ""
+
+#: src/rcfile.c:672
 #, fuzzy, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1794,137 +1910,197 @@ msgstr ""
 "\"white\", \"yellow\", \"cyan\", \"magenta\" dan \n"
 "\"black\", dengan prefiks opsional \"bright\".\n"
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 #, fuzzy
 msgid "Cannot add a color command without a syntax command"
 msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Nama warna tidak ada"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr ""
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr ""
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" membutuhkan \"end=\" yang sesuai"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr ""
+
+#: src/rcfile.c:865
 #, fuzzy
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:921
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
+
+#: src/rcfile.c:926
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Nama warna tidak ada"
+
+#: src/rcfile.c:985
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
+
+#: src/rcfile.c:990
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Nama warna tidak ada"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Tidak dapat menambah direktif warna tanpa baris sintaks"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Tidak dapat membuka %s untuk menulis: %s"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, fuzzy, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Perintah %s tidak dipahami"
 
-#: src/rcfile.c:972
+#: src/rcfile.c:1186
 #, fuzzy
-msgid "Missing flag"
+msgid "Missing option"
 msgstr "Nama warna tidak ada"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, fuzzy, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "opsi %s membutuhkan sebuah argumen"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, fuzzy, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "unset flag %d!\n"
+msgid "Cannot unset option \"%s\""
+msgstr "Tidak dapat menganti ukuran jendela atas"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
+msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Saya tidak dapat menemukan direktori home!  Wah!"
 
+#: src/rcfile.c:1442
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Tekan return untuk lanjut memulai nano\n"
+
 #: src/search.c:96
 #, fuzzy, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%s\" tidak ditemukan"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Case Sensitive]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Regexp]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Backwards]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 #, fuzzy
 msgid " (to replace) in selection"
 msgstr " (ganti)"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (ganti)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Ganti kata ini?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Ganti dengan"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, fuzzy, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%d tempat terganti"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 #, fuzzy
 msgid "Enter line number, column number"
 msgstr "Masukkan nomor baris"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Bukan tanda kurung"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Tidak ada tanda kurung yang cocok"
 
@@ -1937,223 +2113,281 @@ msgstr "Set Tanda"
 msgid "Mark Unset"
 msgstr "Unset Tanda"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 #, fuzzy
 msgid "text delete"
 msgstr "File Sesudahnya"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr ""
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 #, fuzzy
 msgid "text insert"
 msgstr "File Sesudahnya"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 #, fuzzy
 msgid "text replace"
 msgstr " (ganti)"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Tidak dapat mem-pipe"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Tidak dapat membuat pipe"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Tidak dapat mem-fork"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Quote string buruk %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Sekarang dapat melakukan UnJustify"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Edit pengganti"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Tidak dapat membuat pipe"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Membuat daftar kata yang misspelled, silakan tunggu..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Tidak dapat menentukan ukuran buffer pipe"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Gagal memanggil \"spell\""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Gagal memanggil \"sort -f\""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Gagal memanggil \"uniq\""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Selesai memeriksa ejaan"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "Gagal memanggil \"spell\""
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Panggil spell checker (jika ada)"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Spell checking gagal: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, fuzzy, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Spell checking gagal: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr ""
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "Tampilkan pesan ini"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "Tampilkan pesan ini"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3031
+#: src/text.c:3439
 #, fuzzy
 msgid "In Selection:  "
 msgstr "Menambahkan Pilihan ke File"
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr ""
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano kehabisan memori!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 #, fuzzy
 msgid "Modified"
 msgstr " Dimodifikasi "
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 #, fuzzy
 msgid "View"
 msgstr " View "
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 #, fuzzy
 msgid "DIR:"
 msgstr " DIR: "
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 #, fuzzy
 msgid "File:"
 msgstr "File: "
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, fuzzy, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "baris %ld/%ld (%d%%), kol %lu/%lu (%d%%), char %lu/%ld (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Nano teks editor"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 #, fuzzy
 msgid "version"
 msgstr "versi "
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Dibuat untuk anda oleh:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Ucapan terima kasih khusus kepada:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Untuk ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "dan orang lain yang kami lupa...."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "Terima kasih telah menggunakan nano!\n"
@@ -2209,12 +2443,9 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ msgid "Could not reopen %s: %s"
 #~ msgstr "Tidak dapat membuka kembali %s: %s"
 
-#~ msgid "Could not open %s for prepend: %s"
+#~ msgid "Could not open %s for writing: %s"
 #~ msgstr "Tidak dapat membuka %s untuk menulis: %s"
 
-#~ msgid "Could not set permissions %o on %s: %s"
-#~ msgstr "Tidak dapat menset permisi %o pada %s: %s"
-
 #~ msgid "Can't open \"%s\": %s"
 #~ msgstr "Tidak dapat membuka \"%s\": %s"
 
@@ -2251,6 +2482,9 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ msgid "Search for text within the editor"
 #~ msgstr "Cari teks dalam editor"
 
+#~ msgid "Move to the next screen"
+#~ msgstr "Pindah ke layar berikutnya"
+
 #~ msgid "Move up one line"
 #~ msgstr "Naik satu baris"
 
@@ -2290,6 +2524,9 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ msgid "Down"
 #~ msgstr "Turun"
 
+#~ msgid "Find Other Bracket"
+#~ msgstr "Cari Kurung Lain"
+
 #~ msgid "Direction"
 #~ msgstr "Arah"
 
@@ -2316,30 +2553,45 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ msgid "Use alternate keypad routines"
 #~ msgstr "Gunakan rutin keypad alternatif"
 
+#~ msgid "-Q [str]"
+#~ msgstr "-Q [str]"
+
 #~ msgid "Do regular expression searches"
 #~ msgstr "Lakukan pencarian ekspresi reguler"
 
 #~ msgid "-T [num]"
 #~ msgstr "-T [num]"
 
+#~ msgid "-Y [str]"
+#~ msgstr "-Y [str]"
+
+#~ msgid "-o [dir]"
+#~ msgstr "-o [dir]"
+
 #~ msgid "Set fill cols to (wrap lines at) #cols"
 #~ msgstr "Set fill cols ke (wrap baris di) #cols"
 
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(abaikan, untuk kompatibilitas dengan Pico)"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Tidak dapat mem-pipe"
+
 #~ msgid "current->data now = \"%s\"\n"
 #~ msgstr "current->data sekarang =\"%s\"\n"
 
 #~ msgid "After, data = \"%s\"\n"
 #~ msgstr "Setelah, data= \"%s\"\n"
 
+#~ msgid "Could not invoke \"%s\""
+#~ msgstr "Tidak dapat memanggil \"%s\""
+
 #~ msgid "Could not create a temporary filename: %s"
 #~ msgstr "Tidak dapat membuat nama file sementara: %s"
 
 #~ msgid "Spell checking failed: unable to write temp file!"
 #~ msgstr "Spell checking gagal: tidak dapat menulis file temp!"
 
-#~ msgid "Cannot resize top win"
-#~ msgstr "Tidak dapat menganti ukuran jendela atas"
-
 #~ msgid "Cannot move top win"
 #~ msgstr "Tidak dapat memindahkan jendela atas"
 
@@ -2414,6 +2666,9 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ msgid "set flag %d!\n"
 #~ msgstr "set flag %d!\n"
 
+#~ msgid "unset flag %d!\n"
+#~ msgstr "unset flag %d!\n"
+
 #~ msgid "Errors found in .nanorc file"
 #~ msgstr "Kesalahan ditemukan dalam file .nanorc"
 
@@ -2509,9 +2764,6 @@ msgstr "Terima kasih telah menggunakan nano!\n"
 #~ "tentang perubahan ini...\n"
 #~ "\n"
 
-#~ msgid "Press return to continue\n"
-#~ msgstr "Tekan return untuk lanjut\n"
-
 #~ msgid "Generic error"
 #~ msgstr "Kesalahan generik"
 
diff --git a/po/it.gmo b/po/it.gmo
index f96a5e5..7b8bd4c 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index fa6d980..9cb9338 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,123 +1,151 @@
 # Italian messages for nano.
-# Copyright (C) 2001-2006, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2001-2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# Marco Colombo <m.colombo@ed.ac.uk>, 2001-2010.
-# $Id: it.po,v 1.116 2006/06/09 09:37:06 jordi Exp $
 #
+# Marco Colombo <m.colombo@ed.ac.uk>, 2001-2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-04-07 18:30+0100\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 10:22+0000\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Vai alla directory"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Annullato"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Impossibile uscire da %s in modalità ristretta"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Errore durante la lettura di %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Impossibile risalire la directory"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(dir super)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Ricerca"
 
-# FIXME
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Maiuscole/Minuscole]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Espressione regolare]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [All'indietro]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Ricerca ricominciata"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Questa è l'unica occorrenza"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Nessun pattern di ricerca attivo"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"Impossibile determinare la propria identità per il file di lock (getpwuid() "
+"non riuscito)"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Impossibile determinare il nome dell'host per il file di lock: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Errore durante la scrittura del file di lock %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Errore durante l'eliminazione del file di lock %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Errore durante l'apertura del file di lock %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+"Errore durante la lettura del file di lock %s: letti non abbastanza dati"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+"Il file %s sta venendo modificato (da %s usando %s, PID %d). Continuare?"
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+"Errore durante la scrittura del file di lock: directory \"%s\" non esiste"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Impossibile inserire il file dall'esterno di %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Nessun altro buffer aperto"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Passato a %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Nuovo buffer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Letta %lu riga (Convertita dal formato DOS e Mac)"
 msgstr[1] "Lette %lu righe (Convertite dal formato DOS e Mac)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -132,14 +160,14 @@ msgstr[1] ""
 "Lette %lu righe (Convertite dal formato DOS e Mac - Senza permesso di "
 "scrittura)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Letta %lu riga (Convertita dal formato Mac)"
 msgstr[1] "Lette %lu righe (Convertite dal formato Mac)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -150,14 +178,14 @@ msgstr[0] ""
 msgstr[1] ""
 "Lette %lu righe (Convertite dal formato Mac - Senza permesso di scrittura)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Letta %lu riga (Convertita dal formato DOS)"
 msgstr[1] "Lette %lu righe (Convertite dal formato DOS)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -168,479 +196,441 @@ msgstr[0] ""
 msgstr[1] ""
 "Lette %lu righe (Convertite dal formato DOS - Senza permesso di scrittura)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Letta %lu riga"
 msgstr[1] "Lette %lu righe"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] "Letta %lu riga (Attenzione: permessi di scrittura mancanti)"
 msgstr[1] "Lette %lu righe (Attenzione: permessi di scrittura mancanti)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Lettura file"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Nuovo file"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" non trovato"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" è una directory"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" è un file di device"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Comando da eseguire in un nuovo buffer [da %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Comando da eseguire [da %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "File da inserire in un nuovo buffer [da %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "File da inserire [da %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Chiave non valida in modalità non multibuffer"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"Scrittura del file di backup non riuscita, continuare il salvataggio? (In "
+"dubbio, rispondere N) "
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Impossibile salvare fuori da %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "Impossibile aggiungere in testa/coda a un collegamento con --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Errore durante la scrittura del file di backup %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Troppi file di backup?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Errore durante la scrittura di %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Errore durante la scrittura del file temporaneo: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Scritta %lu riga"
 msgstr[1] "Scritte %lu righe"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Backup]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Inserisce selezione in testa al file"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Accoda selezione al file"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Salva selezione nel file"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Nome del file in cui inserire in testa"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Nome del file a cui accodare"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Nome del file in cui salvare"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Il file esiste, SOVRASCRIVERE?"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Salvare il file con un NOME DIFFERENTE?"
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Il file è stato modificato dall'apertura. Continuare a salvare? "
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(ancora)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Premere Invio per continuare l'avvio di nano.\n"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Annulla"
+"Premere Invio per continuare\n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "Sostituisci"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Impossibile creare la directory %s: %s\n"
+"È richiesta per salvare/caricare le ricerche o le posizioni del cursore.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Non sost."
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"Il percorso %s non è una directory, ma è necessario che lo sia.\n"
+"Nano non sarà in grado di caricare o salvare le ricerche o le posizioni del "
+"cursore.\n"
 
-# FIXME
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Maius/Minus"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Riscontrato un file di nano obsoleto (%s): si è cercato di spostarlo\n"
+"al percorso preferito (%s) ma si è verificato un errore: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Indietro"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Trovato un file di nano obsoleto (%s) e spostato nel percorso\n"
+"preferito (%s)\n"
+"(vedere la FAQ di nano a proposito di questo cambiamento)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Espr.Reg."
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Esci"
 
-# FIXME
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "Precedente"
+#: src/global.c:478
+msgid "Close"
+msgstr "Chiudi"
 
-# FIXME
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "Successivo"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Incolla"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Vai al testo"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Degiustif."
 
 # FIXME
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Successivo"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Primo file"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Ultimo file"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Sfoglia"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Formato DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Formato Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Accoda"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Scrivi in testa"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "File di backup"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Esegui comando"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Vai alla directory"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Guida"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Esci"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Cerca"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Pag Prec."
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Pag Succ."
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Prima riga"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Sostituisci"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Ultima riga"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Vai a riga"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Sospendi"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Riga prec."
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Iniz.Par."
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Riga succ."
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Fine Par."
+#: src/global.c:497
+msgid "Read File"
+msgstr "Inserisci"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Giust.File"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Inserisci file"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Vai a riga"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Giustifica il paragrafo corrente"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Annulla la funzione corrente"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Mostra questo messaggio di aiuto"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Chiude il file corrente / Esce da nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Esce da nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Salva il file corrente su disco"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Inserisce un altro file nel corrente"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Cerca una stringa o un'espressione regolare"
 
-#: src/global.c:520
-msgid "Go to previous screen"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Cerca una stringa"
+
+#: src/global.c:528
+msgid "Go one screenful up"
 msgstr "Va alla schermata precedente"
 
-#: src/global.c:521
-msgid "Go to next screen"
+#: src/global.c:529
+msgid "Go one screenful down"
 msgstr "Va alla schermata successiva"
 
-#: src/global.c:523
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Taglia la riga corrente e la memorizza nel cutbuffer"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Incolla dal cutbuffer nella riga corrente"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Mostra la posizione del cursore"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Esegue il correttore ortografico, se disponibile"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Sostituisce una stringa o un'espressione regolare"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Va a un numero di riga e di colonna specifico"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Marca testo alla posizione del cursore"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Marca testo partendo dalla posizione del cursore"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr "Ripete l'ultima ricerca"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Copia la riga corrente e la memorizza nel cutbuffer"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Applica indentazione alla riga corrente"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Toglie indentazione dalla riga corrente"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Annulla l'ultima operazione"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Ripete l'ultima operazione"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Avanza di un carattere"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Arretra di un carattere"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Avanza di una parola"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Arretra di una parola"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Va alla riga precedente"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Va alla riga successiva"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Va all'inizio della riga corrente"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Va alla fine della riga corrente"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Va all'inizio del paragrafo; poi al paragrafo precedente"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Va alla fine del paragrafo; poi al paragrafo successivo"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Va alla prima riga del file"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Va all'ultima riga del file"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Va alla parentesi corrispondente"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Scorre in alto di una riga senza muovere il cursore"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Scorre in basso di una riga senza muovere il cursore"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Va al buffer precedente"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Va al buffer successivo"
 
 # NdT: di fatto funziona per un solo carattere alla volta.
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Inserisce un carattere letteralmente"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Inserisce una tabulazione alla posizione del cursore"
 
@@ -648,340 +638,446 @@ msgstr "Inserisce una tabulazione alla posizione del cursore"
 msgid "Insert a newline at the cursor position"
 msgstr "Inserisce un ritorno a capo alla posizione del cursore"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Elimina il carattere sotto il cursore"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Elimina il carattere a sinistra del cursore"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Taglia dal cursore alla fine del file"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Giustifica l'intero file"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Conta il numero di parole, righe e caratteri"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Aggiorna la schermata corrente"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Sospende l'editor (se la sospensione è abilitata)"
 
 # FIXME
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Considera maiuscole/minuscole nella ricerca"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Inverte la direzione di ricerca"
 
 # FIXME
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Attiva/disattiva uso di espressioni regolari"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Richiama la stringa di ricerca/sostituzione precedente"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Richiama la stringa di ricerca/sostituzione successiva"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Va al browser di file"
 
 # FIXME
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Usa il formato DOS"
 
 # FIXME
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Usa il formato Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Attiva/disattiva scrittura in coda al file"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Attiva/disattiva scrittura in testa al file"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Attiva/disattiva creazione copia di backup del file originale"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Esegue un comando esterno"
 
 # FIXME
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Usa un nuovo buffer"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Esce dal browser di file"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Va al primo file dell'elenco"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Va all'ultimo file dell'elenco"
 
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "Va al prossimo file dell'elenco"
-
-#: src/global.c:642
+#: src/global.c:634
 msgid "Go to the previous file in the list"
 msgstr "Va al precedente file dell'elenco"
 
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Va al prossimo file dell'elenco"
+
 # NdT: questo messaggio è usato come comando.
-#: src/global.c:643
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Va alla directory"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Chiudi"
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Esegue il linter, se disponibile"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Va alla messaggio precedente del linter"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Va al messaggio successivo del linter"
+
+#: src/global.c:642
+msgid "Invoke formatter, if available"
+msgstr "Esegue il formattatore, se disponibile"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Guida"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Annulla"
+
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Salva"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Vai alla directory"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Taglia"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Giustifica"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Inserisci"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Ortografia"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Taglia"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Linter"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "DeGiustif."
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Formattatore"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Incolla"
+# FIXME
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Maius/Minus"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Espr.Reg."
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Indietro"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Non sost."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Posizione"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Ortografia"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Pag Prec."
 
-#: src/global.c:771
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Pag Succ."
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Prima riga"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Ultima riga"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Parentesi"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Marca testo"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Copia"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Indenta"
 
 # FIXME
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Deindenta"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Annulla"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Ripeti"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Avanti"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Indietro"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Parola succ."
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Avanti"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Parola prec."
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Riga prec."
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Riga succ."
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Parola succ."
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Inizio"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Fine"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Trova la parentesi corrispondente"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Iniz.Par."
 
-#: src/global.c:848
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Fine Par."
+
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Scorri su"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Scorri giù"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "File prec."
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "File succ."
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Input letterale"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Letterale"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Invio"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Backspace"
 
 # FIXME
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "TagliaAFine"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Conta parole"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Sospendi"
+
+# FIXME
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Precedente"
+
+# FIXME
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Successivo"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Vai al testo"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Formato DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Formato Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Accoda"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Scrivi in testa"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "File di backup"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Esegui comando"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Sfoglia"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Primo file"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Ultimo file"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Msg lint prec."
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "Msg lint succ."
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Barra dei comandi"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Mostra sempre la posizione del cursore"
 
 # FIXME
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Usa una riga in più per le modifiche"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Scorrimento continuo"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "A capo automatico morbido delle righe lunghe"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Mostra spazi bianchi"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Sintassi colorata"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Tasto Inizio intelligente"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Indentazione automatica"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Taglia fino a fine riga"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "A capo automatico"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "A capo automatico delle righe lunghe"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversione delle tabulazioni in spazi"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "File di backup"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "File multipli"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Supporto per il mouse"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Nessuna conversione dai formati DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Sospensione"
 
-# FIXME
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "A capo morbido"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1003,7 +1099,7 @@ msgstr ""
 "prompt di ricerca. Premendo Invio senza inserire nulla, verrà eseguita la "
 "ricerca precedente. "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1017,7 +1113,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Cerca:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1037,7 +1133,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Vai a Riga:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1060,7 +1156,7 @@ msgstr ""
 "provocherà il caricamento in un buffer separato (usare Meta-< e > per "
 "muoversi tra i buffer). "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1074,7 +1170,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Inserisci:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1101,7 +1197,7 @@ msgstr ""
 "\n"
 " Le seguenti funzioni sono disponibili in modalità Salva:\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1125,7 +1221,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili nel file browser\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1150,7 +1246,7 @@ msgstr ""
 "\n"
 
 # FIXME
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1158,7 +1254,7 @@ msgstr ""
 "Le seguenti funzioni sono disponibili in modalità Cerca:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1180,7 +1276,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Vai alla Directory:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1204,7 +1300,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Ortografia:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1224,7 +1320,7 @@ msgstr ""
 " Le seguenti funzioni sono disponibili in modalità Esegui comando:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1244,7 +1340,7 @@ msgstr ""
 "mostra il contenuto del file che si sta modificando. La barra di stato è la "
 "terza riga dal basso e mostra importanti messaggi.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1263,7 +1359,7 @@ msgstr ""
 "(M) possono essere inserite usato alternativamente il tasto Esc, Alt o Meta, "
 "a seconda della configurazione della tastiera.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1277,15 +1373,15 @@ msgstr ""
 "sequenze alternative sono mostrate tra parentesi:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "abilita/disabilita"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Chiave non valida in modalità Visualizza"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1294,7 +1390,7 @@ msgstr ""
 "\n"
 "Buffer scritto su %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1303,7 +1399,7 @@ msgstr ""
 "\n"
 "Buffer scritto su %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1312,11 +1408,11 @@ msgstr ""
 "\n"
 "Buffer scritto: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "La finestra è troppo piccola per nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1325,261 +1421,265 @@ msgstr ""
 "Uso: nano [OPZIONI] [[+RIGA,COLONNA] FILE]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opzione\t\tOpzione lunga\t\tSignificato\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opzione\t\tSignificato\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Mostra questo messaggio"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+RIGA,COLONNA"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Inizia alla riga numero RIGA, colonna numero COLONNA"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Abilita il tasto Inizio intelligente"
 
 # Questo messaggio è stato tradotto come uno simile più in alto.
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Crea una copia di backup dei file esistenti"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Directory in cui salvare i file di backup"
 
 # FIXME
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Usa grassetto invece di testo inverso"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Converte le tabulazioni in spazi"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Abilita buffer multipli"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Usa file di lock come vim"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "Salva le stringhe di ricerca/sostituzione"
+msgstr "Salva e leggi le stringhe di ricerca/sostituzione"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Non considera i file nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Risolve il problema di confusione del tastierino numerico"
 
 # FIXME
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Non aggiunge caratteri newline in fondo ai file"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Non converte i file dai formati DOS/Mac"
 
 # FIXME
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Usa una riga in più per le modifiche"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Salva e legge la posizione del cursore"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Stringa di quoting"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Modalità ristretta"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Scorrimento a ogni riga invece che a ogni metà schermata"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Imposta la lunghezza della tabulazione a #cols"
 
 # FIXME
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Svuota la barra di stato velocemente"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Stampa informazioni sulla versione ed esce"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Rileva più precisamente i limiti delle parole"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<str>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Definizione di sintassi da usare per la colorazione"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Mostra sempre la posizione del cursore"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Risolve il problema Backspace/Canc"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Mostra questo messaggio di aiuto"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Indenta automaticamente le nuove righe"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Taglia dal cursore a fine riga"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Non segue i collegamenti simbolici, sovrascrive"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Abilita l'uso del mouse"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Non legge il file (solo scrittura)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Imposta la directory operativa"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Rispetta XON (^Q) e XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Ignora i problemi all'avvio come gli errori nel file rc"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
 # FIXME
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Imposta l'interruzione delle righe a #cols"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Attiva correttore ortografico alternativo"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Salvataggio automatico in uscita senza conferma"
 
-# FIXME
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Abilita annullamento generico (SPERIMENTALE)"
-
 # "Visualizza" è il nome della modalità. Appare in alto a destra.
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Visualizza (sola lettura)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
 msgstr "Non interrompe le righe lunghe"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Non mostra la barra dei comandi"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Abilita sospensione"
 
 # FIXME
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "Abilita interruzione morbida delle righe"
 
-# NdT: Più di un'opzione viene ignorata.
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorate, per compatibilità con Pico)"
-
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano versione %s (compilato %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano versione %s\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1588,155 +1688,178 @@ msgstr ""
 "\n"
 " Opzioni di compilazione:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Il supporto per questa funzionalità è stato disabilitato"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Nessun nome di file"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Salvare il buffer modificato? (RISPONDERE \"No\" PER ANNULLARE LE MODIFICHE) "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Impossibile riaprire stdin da tastiera\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lettura dallo stdin, ^C per interrompere\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Ricevuto SIGHUP o SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Usare \"fg\" per tornare a nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "abilitato"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "disabilitato"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Comando sconosciuto"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorato, mmm..."
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorato, mmm..."
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Lunghezza della tabulazione \"%s\" non valida"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Lunghezza del riempimento \"%s\" non valida"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Usare \"%s -h\" per elencare le opzioni disponibili.\n"
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "SsYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Sì"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Tutti"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "No"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Errore in %s alla riga %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "L'argomento \"%s\" ha un \" non terminato"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "L'espressione regolare deve iniziare e finire con il carattere \""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Espressione regolare non corretta \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Nome di sintassi mancante"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "La sintassi \"none\" è riservata"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "La sintassi \"default\" non accetta estensioni"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Nome di chiave mancante"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "le chiavi devono cominciare con \"^\", \"M\", o \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Il nome di chiave è troppo corto"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "I nomi di chiavi devono cominciare con \"^\", \"M\", o \"F\""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr "Occorre specificare una funzione a cui associare la chiave"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Occorre specificare un menù a cui associare la chiave (oppure \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr "Occorre specificare un menù (oppure \"all\") a cui associare la chiave"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:489
 #, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Cannot map name \"%s\" to a function"
 msgstr "Impossibile associare il nome \"%s\" a una funzione"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "Impossibile associare il nome \"%s\" a un menù"
 
-# FIXME
-#: src/rcfile.c:454
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "La funzione \"%s\" non esiste nel menù \"%s\""
+
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "La chiave \"%s\" non può essere reimpostata"
+
+#: src/rcfile.c:629
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "La chiave \"%s\" è un binding non consentito"
+msgid "Error expanding %s: %s"
+msgstr "Errore durante l'espansione di %s: %s"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1751,139 +1874,199 @@ msgstr ""
 "\"black\", con il prefisso opzionale \"bright\"\n"
 "per i colori di primo piano."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 "Impossibile aggiungere una direttiva di colore senza una riga di sintassi"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Nome del colore mancante"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Il colore di sfondo \"%s\" non può essere \"bright\""
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Stringa di espressione regolare mancante"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" richiede un \"end=\" corrispondente"
 
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Il colore di sfondo \"%s\" non può essere \"bright\""
+
 # FIXME
-#: src/rcfile.c:804
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 "Impossibile aggiungere un'intestazione regex senza una riga di sintassi"
 
-#: src/rcfile.c:874
+# FIXME
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+"Impossibile aggiungere un'intestazione regex senza una riga di sintassi"
+
+# FIXME
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Stringa di intestazione mancante"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "Impossibile aggiungere un linter senza una riga di sintassi"
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Comando del linter mancante"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "Impossibile aggiungere un formattatore senza una riga di sintassi"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Comando del formattatore mancante"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Errore fatale: nessuna chiave associata alla funzione \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr ""
+"Errore fatale: nessuna chiave associata alla funzione \"%s\". Uscita.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Uscita. Usare nano con l'opzione -I se occorre modificare le impostazioni di "
-"nanorc\n"
+"Usare nano con l'opzione -I se occorre modificare le impostazioni di "
+"nanorc.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Impossibile trovare sintassi \"%s\" da estendere"
 
 # FIXME
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Comando \"%s\" non permesso nel file incluso"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "La sintassi \"%s\" non ha direttive di colore"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Comando \"%s\" non riconosciuto"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Flag mancante"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Opzione mancante"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "L'opzione \"%s\" richiede un argomento"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "L'opzione non è una stringa multibyte valida"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Sono richiesti caratteri non di spaziatura"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Sono richiesti due caratteri a colonna singola"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Impossibile rimuovere il flag \"%s\""
+msgid "Cannot unset option \"%s\""
+msgstr "Impossibile rimuovere l'opzione \"%s\""
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Flag \"%s\" sconosciuto"
+msgid "Unknown option \"%s\""
+msgstr "Opzione \"%s\" sconosciuta"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Impossibile trovare la directory home."
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Premere Invio per continuare l'avvio di nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" non trovato"
 
-#: src/search.c:205
+# FIXME
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Maiuscole/Minuscole]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Espressione regolare]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [All'indietro]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (sostituisci) nella selezione"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (sostituisci)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Sostituire questa occorrenza?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Sostituire con"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%lu sostituzione effettuata"
 msgstr[1] "%lu sostituzioni effettuate"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Inserire il numero di riga, numero di colonna"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Numero di riga o di colonna non valido"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Non è una parentesi"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Parentesi corrispondente non trovata"
 
@@ -1895,269 +2078,280 @@ msgstr "Marcatura impostata"
 msgid "Mark Unset"
 msgstr "Marcatura disattivata"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Buffer di annullamento vuoto."
 
 # FIXME
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 "Errore interno: impossibile trovare la corrispondenza della riga %d. Salvare "
-"il lavoro"
+"il lavoro."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "aggiunta testo"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "rimozione testo"
 
-# FIXME
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "a capo riga"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "unione riga"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "taglio testo"
 
 # FIXME
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "incolla testo"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "interruzione riga"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "inserimento testo"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "sostituzione testo"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Errore interno: tipo sconosciuto. Salvare il lavoro"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Errore interno: tipo sconosciuto. Salvare il lavoro."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Azione annullata (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Niente da ripetere."
 
-# FIXME
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "Errore interno: ripetizione non riuscita. Salvare il lavoro"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "Errore interno: impossibile ripetere. Salvare il lavoro."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Ripetuta azione (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Impossibile effettuare una pipe"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Impossibile creare la pipe"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Impossibile effettuare un fork"
 
-# FIXME
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr "Errore interno: impossibile incollare. Salvare il lavoro."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Errore interno: tipo sconosciuto. Salvare il lavoro."
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Stringa di quoting non corretta %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "È ora possibile togliere la giustificazione."
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Modifica sostituzione"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Impossibile creare la pipe"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Creazione della lista delle parole non corrette, attendere..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Impossibile ottenere la dimensione del buffer della pipe"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Errore nel chiamare \"spell\""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Errore nel chiamare \"sort -f\""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Errore nel chiamare \"uniq\""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Controllo ortografico terminato"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Errore nel chiamare \"%s\""
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Esecuzione del correttore ortografico, attendere"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Controllo ortografico non riuscito: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Controllo ortografico non riuscito: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Nessun linter definito per questo tipo di file!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Salvare il buffer prima dell'esecuzione del linter?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Esecuzione del linter, attendere"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Ricevute 0 righe dal comando: %s"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+"Questo messaggio è per il file non aperto %s, aprire in un nuovo buffer?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Ultimo messaggio"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Primo messaggio"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Errore: nessun formattatore definito"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Completato"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Esecuzione del formattatore, attendere"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Formattazione completata"
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sParole: %lu  Righe: %ld  Caratteri: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Nella selezione:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Input letterale"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano ha esaurito la memoria."
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Input Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Modificato"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Visualizza"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "Dir:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "File:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Attenzione: modificazione di un file non bloccato, controllare i permessi "
+"della directory?"
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "Riga %ld/%ld (%d%%), colonna %lu/%lu (%d%%), carattere %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "L'editor di testi nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "versione"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Creato per voi da:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Ringraziamenti speciali a:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "La Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "i numeriso traduttori e il Translation Project"
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Per ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "e chiunque altro abbiamo dimenticato..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Grazie di usare nano!"
 
-#~ msgid "Error writing backup file %s: File owner mismatch"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
 #~ msgstr ""
-#~ "Errore scrivendo il file di backup %s: il proprietario non corrisponde"
-
-#~ msgid "line split"
-#~ msgstr "divisione riga"
-
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "Configura riempimento colonne (interrompe righe) a #cols"
-
-#~ msgid "No lines selected, nothing to do!"
-#~ msgstr "Nessuna riga selezionata, niente da fare!"
-
-#~ msgid "Refusing zero-length regex match"
-#~ msgstr "Rifiutato il risultato di un'espressione regolare di lunghezza 0"
-
-#~ msgid "Make the current search/replace go backwards"
-#~ msgstr "Ricerca/sostituzione all'indietro"
-
-#~ msgid "Prepend to the current file"
-#~ msgstr "Scrive in testa al file corrente"
-
-#~ msgid "Back up original file when saving"
-#~ msgstr "Crea una copia di backup al salvataggio"
-
-#~ msgid "Insert into new buffer"
-#~ msgstr "Inserisce in un nuovo buffer"
-
-#~ msgid "Prepending to %s failed: %s"
-#~ msgstr "Inserimento in testa a %s non riuscito: %s"
-
-#~ msgid "Invoke the help menu"
-#~ msgstr "Mostra la guida"
-
-#~ msgid "Search for text within the editor"
-#~ msgstr "Cerca testo all'interno dell'editor"
-
-#~ msgid "Replace text within the editor"
-#~ msgstr "Sostituisce testo all'interno dell'editor"
-
-#~ msgid "Find matching bracket"
-#~ msgstr "Trova la parentesi corrispondente"
-
-#~ msgid "Duplicate syntax name %s"
-#~ msgstr "Nome della sintassi %s duplicato"
-
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "Impossibile creare file temporaneo: %s"
+#~ "Errore interno: corrispondenza della riga %ld non trovata. Salvare il "
+#~ "lavoro."
diff --git a/po/ja.gmo b/po/ja.gmo
new file mode 100644
index 0000000..a98ef82
--- /dev/null
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
new file mode 100644
index 0000000..6d08a24
--- /dev/null
+++ b/po/ja.po
@@ -0,0 +1,2351 @@
+# Japanese messages for nano
+# Copyright (C) 2011 Free Software Foundation, Inc.
+# This file is distributed under the same license as the nano package.
+#
+# Yasuaki Taniguchi <yasuakit@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: nano 2.3.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2011-07-09 09:01+0900\n"
+"Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
+"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
+msgid "Go To Directory"
+msgstr "ディレクトリ�移動"
+
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
+msgid "Cancelled"
+msgstr "�り消����"
+
+#: src/browser.c:246 src/browser.c:293
+#, c-format
+msgid "Can't go outside of %s in restricted mode"
+msgstr "制�モード�� %s �外部�移動����ん"
+
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "%s: %s �読�込��失敗����"
+
+#: src/browser.c:283
+msgid "Can't move up a directory"
+msgstr "上��ディレクトリ�移動����ん"
+
+#. TRANSLATORS: Try to keep this at most 7
+#. * characters.
+#: src/browser.c:626 src/browser.c:635
+msgid "(dir)"
+msgstr "(dir)"
+
+#. TRANSLATORS: Try to keep this at most 12
+#. * characters.
+#: src/browser.c:632
+msgid "(parent dir)"
+msgstr "(parent dir)"
+
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
+msgid "Search"
+msgstr "検索"
+
+#: src/browser.c:812 src/search.c:382
+msgid "Search Wrapped"
+msgstr "先頭�ら検索���"
+
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
+msgid "This is the only occurrence"
+msgstr "他�見��り��ん"
+
+#: src/browser.c:915 src/search.c:569
+msgid "No current search pattern"
+msgstr "検索語�指定�れ����ん"
+
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr ""
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "�ックアップファイル %s �書�込�エラー: %s"
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "�ックアップファイル %s �書�込�エラー: %s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "�ックアップファイル %s �書�込�エラー: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, fuzzy, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "�ックアップファイル %s �書�込�エラー: %s"
+
+#: src/files.c:339
+#, c-format
+msgid "Can't insert file from outside of %s"
+msgstr "%s �外部�らファイルを挿入����ん"
+
+#: src/files.c:467
+msgid "No more open file buffers"
+msgstr "ファイルを開�����ッファ��り��ん"
+
+#: src/files.c:484
+#, c-format
+msgid "Switched to %s"
+msgstr "%s �切り替���"
+
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
+msgid "New Buffer"
+msgstr "新���ッファ"
+
+#: src/files.c:874
+#, c-format
+msgid "Read %lu line (Converted from DOS and Mac format)"
+msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
+msgstr[0] "%lu 行を読�込���（DOS ��� Mac �フォーマットを変�）"
+
+#: src/files.c:879
+#, c-format
+msgid ""
+"Read %lu line (Converted from DOS and Mac format - Warning: No write "
+"permission)"
+msgid_plural ""
+"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+"permission)"
+msgstr[0] ""
+"%lu 行を読�込���（DOS ��� Mac �フォーマットを変� - 警告: 書�込�権"
+"���り��ん）"
+
+#: src/files.c:885
+#, c-format
+msgid "Read %lu line (Converted from Mac format)"
+msgid_plural "Read %lu lines (Converted from Mac format)"
+msgstr[0] "%lu 行を読�込���（Mac フォーマットを変�）"
+
+#: src/files.c:889
+#, c-format
+msgid ""
+"Read %lu line (Converted from Mac format - Warning: No write permission)"
+msgid_plural ""
+"Read %lu lines (Converted from Mac format - Warning: No write permission)"
+msgstr[0] ""
+"%lu 行を読�込���（Mac フォーマットを変� - 警告: 書�込�権���り��"
+"ん）"
+
+#: src/files.c:895
+#, c-format
+msgid "Read %lu line (Converted from DOS format)"
+msgid_plural "Read %lu lines (Converted from DOS format)"
+msgstr[0] "%lu 行を読�込���（DOS フォーマットを変�）"
+
+#: src/files.c:899
+#, c-format
+msgid ""
+"Read %lu line (Converted from DOS format - Warning: No write permission)"
+msgid_plural ""
+"Read %lu lines (Converted from DOS format - Warning: No write permission)"
+msgstr[0] ""
+"%lu 行を読�込���（DOS フォーマットを変� - 警告: 書�込�権���り��"
+"ん）"
+
+#: src/files.c:905
+#, c-format
+msgid "Read %lu line"
+msgid_plural "Read %lu lines"
+msgstr[0] "%lu 行を読�込���"
+
+#: src/files.c:908
+#, c-format
+msgid "Read %lu line ( Warning: No write permission)"
+msgid_plural "Read %lu lines (Warning: No write permission)"
+msgstr[0] "%lu 行を読�込���(警告: 書�込�権���り��ん)"
+
+#: src/files.c:943 src/files.c:980
+msgid "Reading File"
+msgstr "ファイルを読�込ん����"
+
+#: src/files.c:950
+msgid "New File"
+msgstr "新��ファイル"
+
+#: src/files.c:953
+#, c-format
+msgid "\"%s\" not found"
+msgstr "\"%s\" �見��り��ん"
+
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
+#, c-format
+msgid "\"%s\" is a directory"
+msgstr "\"%s\" �ディレクトリ��"
+
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
+#, c-format
+msgid "\"%s\" is a device file"
+msgstr "\"%s\" �デ�イスファイル��"
+
+#: src/files.c:1060
+#, c-format
+msgid "Command to execute in new buffer [from %s] "
+msgstr "新���ッファ�コマンドを実行 [from %s] "
+
+#: src/files.c:1062
+#, c-format
+msgid "Command to execute [from %s] "
+msgstr "コマンドを実行 [from %s] "
+
+#: src/files.c:1069
+#, c-format
+msgid "File to insert into new buffer [from %s] "
+msgstr "新���ッファ�ファイルを読�込� [from %s] "
+
+#: src/files.c:1071
+#, c-format
+msgid "File to insert [from %s] "
+msgstr "�在��ッファ�ファイルを読�込� [from %s] "
+
+#: src/files.c:1320
+msgid "Key invalid in non-multibuffer mode"
+msgstr "マル��ッファモード��無効キー"
+
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"�ックアップファイル�書�込��失敗����。�存を継続����? (分�ら��"
+"場�� N �������) "
+
+#: src/files.c:1746
+#, c-format
+msgid "Can't write outside of %s"
+msgstr "%s �外部�ら書�込���ん"
+
+#: src/files.c:1761
+msgid "Cannot prepend or append to a symlink with --nofollow set"
+msgstr "--nofollow �設定�れ��る状態��リンク先を変更����ん"
+
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
+#, c-format
+msgid "Error writing backup file %s: %s"
+msgstr "�ックアップファイル %s �書�込�エラー: %s"
+
+#: src/files.c:1844 src/nano.c:719
+msgid "Too many backup files?"
+msgstr "�ックアップファイル�多����ん�?"
+
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
+#, c-format
+msgid "Error writing %s: %s"
+msgstr "%s �書�込�エラー: %s"
+
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
+#, c-format
+msgid "Error writing temp file: %s"
+msgstr "テン�ラリファイル�書�込�エラー: %s"
+
+#: src/files.c:2173
+#, c-format
+msgid "Wrote %lu line"
+msgid_plural "Wrote %lu lines"
+msgstr[0] "%lu 行を書�込����"
+
+#: src/files.c:2278
+msgid " [DOS Format]"
+msgstr " [DOS フォーマット]"
+
+#: src/files.c:2279
+msgid " [Mac Format]"
+msgstr " [Mac フォーマット]"
+
+#: src/files.c:2281
+msgid " [Backup]"
+msgstr " [�ックアップ]"
+
+#: src/files.c:2289
+msgid "Prepend Selection to File"
+msgstr "ファイル�先頭�追加"
+
+#: src/files.c:2290
+msgid "Append Selection to File"
+msgstr "ファイル�末尾�追加"
+
+#: src/files.c:2291
+msgid "Write Selection to File"
+msgstr "ファイル�書�込�"
+
+#: src/files.c:2294
+msgid "File Name to Prepend to"
+msgstr "先頭�追加�るファイル"
+
+#: src/files.c:2295
+msgid "File Name to Append to"
+msgstr "末尾�追加�るファイル"
+
+#: src/files.c:2296
+msgid "File Name to Write"
+msgstr "書�込むファイル"
+
+#: src/files.c:2427
+msgid "File exists, OVERWRITE ? "
+msgstr "ファイルを上書���よ����？ "
+
+#: src/files.c:2436
+msgid "Save file under DIFFERENT NAME ? "
+msgstr "������存����？ "
+
+#: src/files.c:2450
+msgid "File was modified since you opened it, continue saving ? "
+msgstr "ファイルを開��後�修正�入り�����存����？ "
+
+#: src/files.c:2882
+msgid "(more)"
+msgstr "(続�)"
+
+#: src/files.c:2974
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue\n"
+msgstr ""
+"\n"
+"継続�る��� Enter を押������\n"
+
+#: src/files.c:2989
+#, fuzzy, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"ディレクトリ %s �作��失敗����: %s\n"
+"�れ�検索履歴�よ�カーソル�置��存�必��ディレクトリ��。\n"
+
+#: src/files.c:2995
+#, fuzzy, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"パス %s �ディレクトリ��る必���り����ディレクトリ���り��ん\n"
+"Nano �検索�よ�カーソル�置履歴�読�込���存�����ん。\n"
+
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "終了"
+
+#: src/global.c:478
+msgid "Close"
+msgstr "閉�る"
+
+#: src/global.c:479
+#, fuzzy
+msgid "Uncut Text"
+msgstr "貼り付�"
+
+#: src/global.c:481
+#, fuzzy
+msgid "Unjustify"
+msgstr "両端��"
+
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
+msgid "WhereIs Next"
+msgstr "次�移動"
+
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
+msgid "Where Is"
+msgstr "移動"
+
+#: src/global.c:493
+msgid "Replace"
+msgstr "置�"
+
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "行を指定"
+
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "��行"
+
+#: src/global.c:496
+msgid "Next Line"
+msgstr "次�行"
+
+#: src/global.c:497
+msgid "Read File"
+msgstr "読�込�"
+
+#: src/global.c:499
+msgid "FullJstify"
+msgstr "全��等化"
+
+#: src/global.c:501
+msgid "Refresh"
+msgstr "æ›´æ–°"
+
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
+msgid "Justify the current paragraph"
+msgstr "段�を�等化"
+
+#: src/global.c:509
+msgid "Cancel the current function"
+msgstr "動作を�り消���"
+
+#: src/global.c:510
+msgid "Display this help text"
+msgstr "ヘルプを表示"
+
+#: src/global.c:513
+msgid "Close the current file buffer / Exit from nano"
+msgstr "�在�ファイルを閉�� nano を終了"
+
+#: src/global.c:515
+msgid "Exit from nano"
+msgstr "nano を終了"
+
+#: src/global.c:519
+msgid "Write the current file to disk"
+msgstr "�在�ファイルをディスク�書�込�"
+
+#: src/global.c:521
+msgid "Insert another file into the current one"
+msgstr "ファイル�ら読�込�"
+
+#: src/global.c:523
+msgid "Search for a string or a regular expression"
+msgstr "正�表��文字列を検索"
+
+#: src/global.c:526
+#, fuzzy
+msgid "Search for a string"
+msgstr "正�表��文字列を検索"
+
+#: src/global.c:528
+#, fuzzy
+msgid "Go one screenful up"
+msgstr "次�ページ�移動"
+
+#: src/global.c:529
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "次�ページ�移動"
+
+#: src/global.c:531
+msgid "Cut the current line and store it in the cutbuffer"
+msgstr "行�切り�り"
+
+#: src/global.c:533
+msgid "Uncut from the cutbuffer into the current line"
+msgstr "貼り付�"
+
+#: src/global.c:534
+msgid "Display the position of the cursor"
+msgstr "カーソル�置を表示"
+
+#: src/global.c:536
+msgid "Invoke the spell checker, if available"
+msgstr "スペル�ェッカを起動 (利用�能�場�)"
+
+#: src/global.c:538
+msgid "Replace a string or a regular expression"
+msgstr "正�表�置�"
+
+#: src/global.c:539
+msgid "Go to line and column number"
+msgstr "指定�置�移動"
+
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
+msgstr "�在�置をマーク"
+
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
+msgstr "次を検索"
+
+#: src/global.c:544
+msgid "Copy the current line and store it in the cutbuffer"
+msgstr "行�コピー"
+
+#: src/global.c:545
+msgid "Indent the current line"
+msgstr "行�インデント"
+
+#: src/global.c:546
+msgid "Unindent the current line"
+msgstr "インデント�削除"
+
+#: src/global.c:547
+msgid "Undo the last operation"
+msgstr "直���作を�り消� (undo)"
+
+#: src/global.c:548
+msgid "Redo the last undone operation"
+msgstr "�り消��直���作をやり直� (redo)"
+
+#: src/global.c:550
+msgid "Go forward one character"
+msgstr "次�文字�進む"
+
+#: src/global.c:551
+msgid "Go back one character"
+msgstr "��文字�戻る"
+
+#: src/global.c:553
+msgid "Go forward one word"
+msgstr "次��語�進む"
+
+#: src/global.c:554
+msgid "Go back one word"
+msgstr "���語�戻る"
+
+#: src/global.c:556
+msgid "Go to previous line"
+msgstr "��行�移動�る"
+
+#: src/global.c:557
+msgid "Go to next line"
+msgstr "次�行�移動�る"
+
+#: src/global.c:558
+msgid "Go to beginning of current line"
+msgstr "�在行�先頭�移動"
+
+#: src/global.c:559
+msgid "Go to end of current line"
+msgstr "�在行�末尾�移動"
+
+#: src/global.c:562
+msgid "Go to beginning of paragraph; then of previous paragraph"
+msgstr "段��先頭�移動�カーソル����置��る場�����段��移動"
+
+#: src/global.c:564
+msgid "Go just beyond end of paragraph; then of next paragraph"
+msgstr ""
+"段��末尾�次��置�移動�カーソル����置��る場���次�段��移動"
+
+#: src/global.c:566
+msgid "Go to the first line of the file"
+msgstr "ファイル�先頭行�移動"
+
+#: src/global.c:567
+msgid "Go to the last line of the file"
+msgstr "ファイル�最終行�移動"
+
+#: src/global.c:569
+msgid "Go to the matching bracket"
+msgstr "対応�る括弧�移動"
+
+#: src/global.c:571
+msgid "Scroll up one line without scrolling the cursor"
+msgstr "カーソル�置を変����ッファを一行逆スクロール��る"
+
+#: src/global.c:573
+msgid "Scroll down one line without scrolling the cursor"
+msgstr "カーソル�置を変����ッファを一行スクロール��る"
+
+#: src/global.c:576
+msgid "Switch to the previous file buffer"
+msgstr "���ッファ�切替�"
+
+#: src/global.c:577
+msgid "Switch to the next file buffer"
+msgstr "次��ッファ�切替�"
+
+#: src/global.c:579
+msgid "Insert the next keystroke verbatim"
+msgstr "次�キーを�語的�入力"
+
+#: src/global.c:580
+msgid "Insert a tab at the cursor position"
+msgstr "タブ文字�挿入"
+
+#: src/global.c:581
+msgid "Insert a newline at the cursor position"
+msgstr "行�挿入"
+
+#: src/global.c:582
+msgid "Delete the character under the cursor"
+msgstr "カーソル�置�文字を削除"
+
+#: src/global.c:584
+msgid "Delete the character to the left of the cursor"
+msgstr "カーソル���文字を削除"
+
+#: src/global.c:587
+msgid "Cut from the cursor position to the end of the file"
+msgstr "カーソル�置�らファイル終端��を切り�り"
+
+#: src/global.c:590
+msgid "Justify the entire file"
+msgstr "ファイル全体を�等化"
+
+#: src/global.c:594
+msgid "Count the number of words, lines, and characters"
+msgstr "�語数�行数�文字数を表示"
+
+#: src/global.c:597
+msgid "Refresh (redraw) the current screen"
+msgstr "画��更新"
+
+#: src/global.c:599
+msgid "Suspend the editor (if suspend is enabled)"
+msgstr "編集を一時中断�る (有効�場�)"
+
+#: src/global.c:602
+msgid "Toggle the case sensitivity of the search"
+msgstr "検索時�大文字�文字を区別を�る�����を切り替�る"
+
+#: src/global.c:604
+msgid "Reverse the direction of the search"
+msgstr "検索方��順逆を切り替�る"
+
+#: src/global.c:608
+msgid "Toggle the use of regular expressions"
+msgstr "正�表�を使用�る�����を切り替�る"
+
+#: src/global.c:612
+msgid "Recall the previous search/replace string"
+msgstr "��検索文字 / 置�文字列を呼�出�"
+
+#: src/global.c:614
+msgid "Recall the next search/replace string"
+msgstr "次�検索文字 / 置�文字列を呼�出�"
+
+#: src/global.c:617
+msgid "Go to file browser"
+msgstr "ファイルブラウザ�起動"
+
+#: src/global.c:620
+msgid "Toggle the use of DOS format"
+msgstr "DOS フォーマット�切替�"
+
+#: src/global.c:621
+msgid "Toggle the use of Mac format"
+msgstr "Mac フォーマット�切替�"
+
+#: src/global.c:622
+msgid "Toggle appending"
+msgstr "ファイル末尾�追加�る動作�切り替�る"
+
+#: src/global.c:623
+msgid "Toggle prepending"
+msgstr "ファイル先頭�追加�る動作�切り替�る"
+
+#: src/global.c:624
+msgid "Toggle backing up of the original file"
+msgstr "元ファイル��ックアップを作��る動作�切り替�る"
+
+#: src/global.c:625
+msgid "Execute external command"
+msgstr "外部コマンド�実行"
+
+#: src/global.c:628
+msgid "Toggle the use of a new buffer"
+msgstr "新���ッファ�切替�"
+
+#: src/global.c:631
+msgid "Exit from the file browser"
+msgstr "ファイルブラウザ�終了"
+
+#: src/global.c:632
+msgid "Go to the first file in the list"
+msgstr "リスト�先頭�移動"
+
+#: src/global.c:633
+msgid "Go to the last file in the list"
+msgstr "リスト�末尾�移動"
+
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "リスト���ファイル�移動"
+
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "リスト�次�ファイル�移動"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "ディレクトリ�移動"
+
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "スペル�ェッカを起動 (利用�能�場�)"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "��行�移動�る"
+
+#: src/global.c:641
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "次�行�移動�る"
+
+#: src/global.c:642
+#, fuzzy
+msgid "Invoke formatter, if available"
+msgstr "スペル�ェッカを起動 (利用�能�場�)"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "ヘルプ"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "�消"
+
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
+msgstr "�存"
+
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "ディレクトリ�移動"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "切り�り"
+
+#: src/global.c:728
+msgid "Justify"
+msgstr "両端��"
+
+#: src/global.c:733
+msgid "To Spell"
+msgstr "スペル確�"
+
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "行を指定"
+
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS フォーマット"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "大/�文字"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "正�表�"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "後方�"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "置����"
+
+#: src/global.c:770
+msgid "Cur Pos"
+msgstr "�置"
+
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "��ページ"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "次�ページ"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "先頭行"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "最終行"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "大括弧���り��ん"
+
+#: src/global.c:797
+msgid "Mark Text"
+msgstr "マーク"
+
+#: src/global.c:800
+msgid "Copy Text"
+msgstr "コピー"
+
+#: src/global.c:803
+msgid "Indent Text"
+msgstr "インデント"
+
+#: src/global.c:805
+msgid "Unindent Text"
+msgstr "インデント削除"
+
+#: src/global.c:808
+msgid "Undo"
+msgstr "Undo"
+
+#: src/global.c:810
+msgid "Redo"
+msgstr "Redo"
+
+#: src/global.c:814 src/global.c:820
+msgid "Back"
+msgstr "戻る"
+
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "進む"
+
+#: src/global.c:827
+msgid "Prev Word"
+msgstr "���語"
+
+#: src/global.c:829
+msgid "Next Word"
+msgstr "次��語"
+
+#: src/global.c:833
+msgid "Home"
+msgstr "先頭"
+
+#: src/global.c:835
+msgid "End"
+msgstr "末尾"
+
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "段��始点"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "段��終点"
+
+#: src/global.c:851
+msgid "Scroll Up"
+msgstr "上�スクロール"
+
+#: src/global.c:853
+msgid "Scroll Down"
+msgstr "下�スクロール"
+
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
+msgstr "��ファイル"
+
+#: src/global.c:860
+msgid "Next File"
+msgstr "次�ファイル"
+
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
+msgstr "�次入力"
+
+#: src/global.c:872
+msgid "Tab"
+msgstr "タブ"
+
+#: src/global.c:874
+msgid "Enter"
+msgstr "Enter"
+
+#: src/global.c:876
+msgid "Delete"
+msgstr "削除"
+
+#: src/global.c:878
+msgid "Backspace"
+msgstr "�ックスペース"
+
+#: src/global.c:888
+msgid "CutTillEnd"
+msgstr "末尾��切り�り"
+
+#: src/global.c:898
+msgid "Word Count"
+msgstr "�語��計数"
+
+#: src/global.c:905
+msgid "Suspend"
+msgstr ""
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "��履歴"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "次�履歴"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "検索"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS フォーマット"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac フォーマット"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "末尾�追加"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "先頭�追加"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "�ックアップ"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "コマンドを実行"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "ファイラ"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "先頭�"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "末尾�"
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "��行"
+
+#: src/global.c:979
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "次�行"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
+msgid "Help mode"
+msgstr "ヘルプ"
+
+#: src/global.c:1229
+msgid "Constant cursor position display"
+msgstr "常�カーソル�置を表示"
+
+#: src/global.c:1231
+msgid "Use of one more line for editing"
+msgstr "編集用�一行余分�使用�る"
+
+#: src/global.c:1233
+msgid "Smooth scrolling"
+msgstr "スムーズ�スクロール"
+
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "長�行�折り返�を�止"
+
+#: src/global.c:1237
+msgid "Whitespace display"
+msgstr "空白を表示"
+
+#: src/global.c:1239
+msgid "Color syntax highlighting"
+msgstr "�語�強調"
+
+#: src/global.c:1241
+msgid "Smart home key"
+msgstr "スマートホームキー"
+
+#: src/global.c:1243
+msgid "Auto indent"
+msgstr "自動インデント"
+
+#: src/global.c:1245
+msgid "Cut to end"
+msgstr "改行����削除"
+
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "長�行�折り返�を�止"
+
+#: src/global.c:1249
+msgid "Conversion of typed tabs to spaces"
+msgstr "タブをスペース�変�"
+
+#: src/global.c:1251
+msgid "Backup files"
+msgstr "�ックアップファイル"
+
+#: src/global.c:1253
+msgid "Multiple file buffers"
+msgstr "複数��ッファ"
+
+#: src/global.c:1255
+msgid "Mouse support"
+msgstr "マウス�サ�ート"
+
+#: src/global.c:1257
+msgid "No conversion from DOS/Mac format"
+msgstr "DOS/Mac フォーマットを変����"
+
+#: src/global.c:1259
+msgid "Suspension"
+msgstr "一時中断"
+
+#: src/help.c:205
+msgid ""
+"Search Command Help Text\n"
+"\n"
+" Enter the words or characters you would like to search for, and then press "
+"Enter.  If there is a match for the text you entered, the screen will be "
+"updated to the location of the nearest match for the search string.\n"
+"\n"
+" The previous search string will be shown in brackets after the search "
+"prompt.  Hitting Enter without entering any text will perform the previous "
+"search.  "
+msgstr ""
+"検索コマンド�ヘルプ\n"
+"\n"
+" 検索����語�文字を入力��エンターを押������。も�検索語�マッ��"
+"るテキスト�見�����ら��カーソル�見����テキスト��置�移動��"
+"�。\n"
+"\n"
+" テキストを検索�る方��検索プロンプト�表示�見分�る�������。検索語"
+"を何も入力���エンターを押����回�検索語�使用�れ��。  "
+
+#: src/help.c:214
+msgid ""
+"If you have selected text with the mark and then search to replace, only "
+"matches in the selected text will be replaced.\n"
+"\n"
+" The following function keys are available in Search mode:\n"
+"\n"
+msgstr ""
+"テキスト�置�を行�場����択範囲内�テキスト�対����マッ��行�れ�"
+"�。\n"
+"\n"
+" 検索モード��以下�ファンクションキー�使用����。\n"
+"\n"
+
+#: src/help.c:220
+msgid ""
+"Go To Line Help Text\n"
+"\n"
+" Enter the line number that you wish to go to and hit Enter.  If there are "
+"fewer lines of text than the number you entered, you will be brought to the "
+"last line of the file.\n"
+"\n"
+" The following function keys are available in Go To Line mode:\n"
+"\n"
+msgstr ""
+"指定行�移動�ヘルプ\n"
+"\n"
+" 移動��行番�を入力��エンターを押������。も�テキスト全体�行数より"
+"も大��数字を入力��場���最終行�移動���。\n"
+"\n"
+" 指定行�移動�るモード��以下�ファンクションキー�使用����。\n"
+"\n"
+
+#: src/help.c:229
+msgid ""
+"Insert File Help Text\n"
+"\n"
+" Type in the name of a file to be inserted into the current file buffer at "
+"the current cursor location.\n"
+"\n"
+" If you have compiled nano with multiple file buffer support, and enable "
+"multiple file buffers with the -F or --multibuffer command line flags, the "
+"Meta-F toggle, or a nanorc file, inserting a file will cause it to be loaded "
+"into a separate buffer (use Meta-< and > to switch between file buffers).  "
+msgstr ""
+"ファイル�ら�読�込��ヘルプ\n"
+"\n"
+" 読�込むファイル�を入力������。ファイル��在��ッファ�カーソル�置"
+"�読�込�れ��。\n"
+"\n"
+" も�nano�マル�プル�ッファ�サ�ートを有効���コンパイル�れ��り�-F�"
+"��--multibufferオプションを���実行�れ��る�ら��ファイル�別��ッ"
+"ファ�読�込�れ��(Meta-<�Meta->キー��ッファを切り替�る������"
+"�)。  "
+
+#: src/help.c:238
+msgid ""
+"If you need another blank buffer, do not enter any filename, or type in a "
+"nonexistent filename at the prompt and press Enter.\n"
+"\n"
+" The following function keys are available in Insert File mode:\n"
+"\n"
+msgstr ""
+"も�別�空��ッファ�必��ら��ファイル�を入力���エンターを押���存"
+"在���ファイル�を入力���らエンターを押������。\n"
+"\n"
+" ファイル�ら�読�込�モード��以下�ファンクションキー�使用����。\n"
+"\n"
+
+#: src/help.c:244
+msgid ""
+"Write File Help Text\n"
+"\n"
+" Type the name that you wish to save the current file as and press Enter to "
+"save the file.\n"
+"\n"
+" If you have selected text with the mark, you will be prompted to save only "
+"the selected portion to a separate file.  To reduce the chance of "
+"overwriting the current file with just a portion of it, the current filename "
+"is not the default in this mode.\n"
+"\n"
+" The following function keys are available in Write File mode:\n"
+"\n"
+msgstr ""
+"ファイル��書�込��ヘルプ\n"
+"\n"
+" �存�るファイル�を入力��エンターキーを押������。\n"
+"\n"
+" も�テキストを�択��状態����場���択��部分を別�ファイル�書�込む"
+"�������。ファイルを上書�������険を少���る����在�ファイ"
+"ル��デフォルト�入力�れ��る����り��ん。\n"
+"\n"
+" ファイル��書�込�モード��以下�ファンクションキー�使用����。\n"
+"\n"
+
+#: src/help.c:258
+msgid ""
+"File Browser Help Text\n"
+"\n"
+" The file browser is used to visually browse the directory structure to "
+"select a file for reading or writing.  You may use the arrow keys or Page Up/"
+"Down to browse through the files, and S or Enter to choose the selected file "
+"or enter the selected directory.  To move up one level, select the directory "
+"called \"..\" at the top of the file list.\n"
+"\n"
+" The following function keys are available in the file browser:\n"
+"\n"
+msgstr ""
+"ファイルブラウザ�ヘルプ\n"
+"\n"
+" ファイルブラウザ�ディレクトリ構造をビジュアル�表示��読�込����書�込"
+"�対象��るファイル��択を容易����。矢�キー�PageUp/Downキー�ファイル"
+"を�択��Sキー�エンターキー�決定���。親ディレクトリ�移動���場��リ"
+"スト�先頭��る\"..\"を�択������。\n"
+"\n"
+" ファイルブラウザ��以下�ファンクションキー�使用����。\n"
+"\n"
+
+#: src/help.c:271
+msgid ""
+"Browser Search Command Help Text\n"
+"\n"
+" Enter the words or characters you would like to search for, and then press "
+"Enter.  If there is a match for the text you entered, the screen will be "
+"updated to the location of the nearest match for the search string.\n"
+"\n"
+" The previous search string will be shown in brackets after the search "
+"prompt.  Hitting Enter without entering any text will perform the previous "
+"search.\n"
+"\n"
+msgstr ""
+"検索コマンド（ファイルブラウザ）�ヘルプ\n"
+"\n"
+" 検索���文字��語を入力��エンターキーを押������。入力�マッ��る"
+"ファイル���ディレクトリ�見����場��該当�るファイル���ディレクト"
+"リ�カーソル�移動���。\n"
+"\n"
+" 検索プロンプト�後�括弧�中����回検索�れ�語�表示�れ����。新��"
+"検索語を入力���エンターキーを押����度��語�検索を行���。\n"
+"\n"
+
+#: src/help.c:280
+msgid ""
+" The following function keys are available in Browser Search mode:\n"
+"\n"
+msgstr ""
+" ファイルブラウザ�検索コマンド��以下�ファンクションキー�使用����。\n"
+"\n"
+
+#: src/help.c:284
+msgid ""
+"Browser Go To Directory Help Text\n"
+"\n"
+" Enter the name of the directory you would like to browse to.\n"
+"\n"
+" If tab completion has not been disabled, you can use the Tab key to "
+"(attempt to) automatically complete the directory name.\n"
+"\n"
+" The following function keys are available in Browser Go To Directory mode:\n"
+"\n"
+msgstr ""
+"ディレクトリ�移動コマンド（ファイルブラウザ）�ヘルプ\n"
+"\n"
+" 移動���ディレクトリ���を入力��エンターキーを押������。\n"
+"\n"
+" Tab補完機能�有効�����る�ら��Tabキーを押����ディレクトリ�を自動"
+"的�補完�る�������。\n"
+"\n"
+" ファイルブラウザ�ディレクトリ�移動コマンド��以下�ファンクションキー�使"
+"用����。\n"
+"\n"
+
+#: src/help.c:297
+msgid ""
+"Spell Check Help Text\n"
+"\n"
+" The spell checker checks the spelling of all text in the current file.  "
+"When an unknown word is encountered, it is highlighted and a replacement can "
+"be edited.  It will then prompt to replace every instance of the given "
+"misspelled word in the current file, or, if you have selected text with the "
+"mark, in the selected text.\n"
+"\n"
+" The following function keys are available in Spell Check mode:\n"
+"\n"
+msgstr ""
+"スペル�ェック�ヘルプ\n"
+"\n"
+" スペル�ェッカ��在�ファイル�中�全���語を�ェック���。も�未知��"
+"語�見�����ら��スペル�ェッカ�該当�る部分を強調表示��編集用�プロ"
+"ンプトを表示���。�語を修正��エンターキーを押���該当�る部分�修正�"
+"��語�置���られ��。も�テキスト�一部分を�択��状態����場��ス"
+"ペル�ェッカ��択範囲内�テキスト��を対象�動作���。\n"
+"\n"
+" スペル�ェック��以下�ファンクションキー�使用����。\n"
+"\n"
+
+#: src/help.c:312
+msgid ""
+"Execute Command Help Text\n"
+"\n"
+" This mode allows you to insert the output of a command run by the shell "
+"into the current buffer (or a new buffer in multiple file buffer mode).  If "
+"you need another blank buffer, do not enter any command.\n"
+"\n"
+" The following function keys are available in Execute Command mode:\n"
+"\n"
+msgstr ""
+"コマンド実行�ヘルプ\n"
+"\n"
+" ��モード���シェル�ら実行�れ�コマンド�出力を�在��ッファ (も��"
+"��複数ファイル�ッファモード��新���ッファ) �挿入�る�������。"
+"空��ッファ�必��場���コマンドを入力��������。\n"
+"\n"
+" コマンド実行モード��以下�ファンクションキー�使用����。\n"
+"\n"
+
+#: src/help.c:325
+msgid ""
+"Main nano help text\n"
+"\n"
+" The nano editor is designed to emulate the functionality and ease-of-use of "
+"the UW Pico text editor.  There are four main sections of the editor.  The "
+"top line shows the program version, the current filename being edited, and "
+"whether or not the file has been modified.  Next is the main editor window "
+"showing the file being edited.  The status line is the third line from the "
+"bottom and shows important messages.  "
+msgstr ""
+"nano�ヘルプ\n"
+"\n"
+" nano�ワシントン大学�開発�れ�Picoエディタ�機能性�使�や��を見習��開"
+"発�れ���。nano�画���4��セクション��り�一番上�行��nano��ー"
+"ジョン�編集中�ファイル��最後��存�れ��ら変更�行�れ�����表示�"
+"れ����。次�ファイルを編集�る領域��り��。下�ら三行目�ステータス行"
+"�����メッセージ�表示�れ��。  "
+
+#: src/help.c:335
+msgid ""
+"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 and can be entered either by using the Control "
+"(Ctrl) key or pressing the Escape (Esc) key twice.  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.  "
+msgstr ""
+"画�下部�二行���一般的�使�れるショートカットキー�表示�れ����。\n"
+"\n"
+" ショートカットキー�記法�以下�通り��。(^)�表記�れ��るショートカット"
+"�Ctrlキーを押���Escキーを二回続��押���を表�����。(M-)�表記�れ"
+"��るショートカット�Altキー�Escキー���メタキーを押���を表����"
+"�。  "
+
+#: src/help.c:344
+msgid ""
+"Also, pressing Esc twice and then typing a three-digit decimal number from "
+"000 to 255 will enter the character with the corresponding value.  The "
+"following keystrokes are available in the main editor window.  Alternative "
+"keys are shown in parentheses:\n"
+"\n"
+msgstr ""
+"���Escキーを二回押��後�000�ら255����進数を入力�る����コード�"
+"対応�る文字を入力�る�������。以下�キーストローク�主�エディタ�"
+"ウィンドウ�使用����。代替�キーストローク�括弧�囲��表記�れ��。\n"
+"\n"
+
+#: src/help.c:376 src/help.c:448
+msgid "enable/disable"
+msgstr "有効/無効"
+
+#: src/nano.c:601
+msgid "Key invalid in view mode"
+msgstr "ビューモード���キー入力�無効��"
+
+#: src/nano.c:713
+#, c-format
+msgid ""
+"\n"
+"Buffer written to %s\n"
+msgstr ""
+"\n"
+"�ッファを %s �書�込����\n"
+
+#: src/nano.c:715
+#, c-format
+msgid ""
+"\n"
+"Buffer not written to %s: %s\n"
+msgstr ""
+"\n"
+"�ッファを書�込���ん %s: %s\n"
+
+#: src/nano.c:718
+#, c-format
+msgid ""
+"\n"
+"Buffer not written: %s\n"
+msgstr ""
+"\n"
+"�ッファを %s �書�込���ん\n"
+
+#: src/nano.c:743
+msgid "Window size is too small for nano...\n"
+msgstr "ウィンドウ�サイズ�������\n"
+
+#: src/nano.c:836
+#, c-format
+msgid ""
+"Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
+"\n"
+msgstr ""
+"使用法: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
+"\n"
+
+#: src/nano.c:839
+#, c-format
+msgid "Option\t\tGNU long option\t\tMeaning\n"
+msgstr "オプション\t\tGNU�長�形��オプション\t\t説明\n"
+
+#: src/nano.c:841
+#, c-format
+msgid "Option\t\tMeaning\n"
+msgstr "オプション\t\t説明\n"
+
+#: src/nano.c:844
+msgid "+LINE,COLUMN"
+msgstr "+行,列"
+
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
+msgid "Start at line LINE, column COLUMN"
+msgstr "起動時�カーソル�置 (行,列)"
+
+#: src/nano.c:849
+msgid "Enable smart home key"
+msgstr "スマートホームキー有効"
+
+#: src/nano.c:850
+msgid "Save backups of existing files"
+msgstr "既存ファイル��ックアップを�存�る"
+
+#: src/nano.c:851
+msgid "-C <dir>"
+msgstr "-C <dir>"
+
+#: src/nano.c:851
+msgid "--backupdir=<dir>"
+msgstr "--backupdir=<dir>"
+
+#: src/nano.c:852
+msgid "Directory for saving unique backup files"
+msgstr "�ックアップファイルを作��るディレクトリ"
+
+#: src/nano.c:855
+msgid "Use bold instead of reverse video text"
+msgstr "�転文字を太字�表示"
+
+#: src/nano.c:858
+msgid "Convert typed tabs to spaces"
+msgstr "タブをスペース�変�"
+
+#: src/nano.c:861
+msgid "Enable multiple file buffers"
+msgstr "複数ファイル�ッファ有効"
+
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
+msgid "Log & read search/replace string history"
+msgstr "検索/置���文字列�履歴を記録�よ�読��り"
+
+#: src/nano.c:873
+msgid "Don't look at nanorc files"
+msgstr "nanorc ファイルを�照���"
+
+#: src/nano.c:876
+msgid "Fix numeric keypad key confusion problem"
+msgstr "テンキーパッド�混乱��題を修正�る"
+
+#: src/nano.c:878
+msgid "Don't add newlines to the ends of files"
+msgstr "ファイル末尾�空行を追加���"
+
+#: src/nano.c:881
+msgid "Don't convert files from DOS/Mac format"
+msgstr "DOS/Mac フォーマットを変����"
+
+#: src/nano.c:883
+msgid "Use one more line for editing"
+msgstr "編集エリアを一行広��る"
+
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "カーソル�置を記録・読�込��る"
+
+#: src/nano.c:889
+msgid "-Q <str>"
+msgstr "-Q <str>"
+
+#: src/nano.c:889
+msgid "--quotestr=<str>"
+msgstr "--quotestr=<str>"
+
+#: src/nano.c:890
+msgid "Quoting string"
+msgstr ""
+
+#: src/nano.c:892
+msgid "Restricted mode"
+msgstr "制�モード"
+
+#: src/nano.c:895
+msgid "Scroll by line instead of half-screen"
+msgstr "�画�������1行��スクロール�る"
+
+#: src/nano.c:897
+msgid "-T <#cols>"
+msgstr "-T <#cols>"
+
+#: src/nano.c:897
+msgid "--tabsize=<#cols>"
+msgstr "--tabsize=<#cols>"
+
+#: src/nano.c:898
+msgid "Set width of a tab to #cols columns"
+msgstr "タブ幅を #cols �指定"
+
+#: src/nano.c:900
+msgid "Do quick statusbar blanking"
+msgstr "ステータス�ー�表示を早�消�"
+
+#: src/nano.c:903
+msgid "Print version information and exit"
+msgstr "�ージョン情報を表示��終了�る"
+
+#: src/nano.c:906
+msgid "Detect word boundaries more accurately"
+msgstr "�語�境界を正確�抽出�る"
+
+#: src/nano.c:909
+msgid "-Y <str>"
+msgstr "-Y <str>"
+
+#: src/nano.c:909
+msgid "--syntax=<str>"
+msgstr "--syntax=<str>"
+
+#: src/nano.c:910
+msgid "Syntax definition to use for coloring"
+msgstr "表示色を決�る���構文定義"
+
+#: src/nano.c:912
+msgid "Constantly show cursor position"
+msgstr "常�カーソル�置を表示"
+
+#: src/nano.c:914
+msgid "Fix Backspace/Delete confusion problem"
+msgstr "Del キーを�ックスペース���扱�"
+
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "ヘルプを表示"
+
+#: src/nano.c:918
+msgid "Automatically indent new lines"
+msgstr "改行�自動インデント"
+
+#: src/nano.c:919
+msgid "Cut from cursor to end of line"
+msgstr "行削除時�改行文字を削除���"
+
+#: src/nano.c:922
+msgid "Don't follow symbolic links, overwrite"
+msgstr "上書�時�シンボリックリンクを辿ら��"
+
+#: src/nano.c:924
+msgid "Enable the use of the mouse"
+msgstr "マウスを有効��る"
+
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
+msgid "-o <dir>"
+msgstr "-o <dir>"
+
+#: src/nano.c:928
+msgid "--operatingdir=<dir>"
+msgstr "--operatingdir=<dir>"
+
+#: src/nano.c:929
+msgid "Set operating directory"
+msgstr "作業ディレクトリを指定"
+
+#: src/nano.c:932
+msgid "Preserve XON (^Q) and XOFF (^S) keys"
+msgstr "XON (^Q) �よ� XOFF (^S) キーを維��る"
+
+#: src/nano.c:935
+msgid "Silently ignore startup issues like rc file errors"
+msgstr "rcファイルエラー��起動時��題を無視�る"
+
+#: src/nano.c:938
+msgid "-r <#cols>"
+msgstr "-r <#cols>"
+
+#: src/nano.c:938
+msgid "--fill=<#cols>"
+msgstr "--fill=<#cols>"
+
+#: src/nano.c:939
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
+msgstr "折り返��数を指定�る"
+
+#: src/nano.c:942
+msgid "-s <prog>"
+msgstr "-s <prog>"
+
+#: src/nano.c:942
+msgid "--speller=<prog>"
+msgstr "--speller=<prog>"
+
+#: src/nano.c:943
+msgid "Enable alternate speller"
+msgstr "別�スペル�ェッカを指定�る"
+
+#: src/nano.c:946
+msgid "Auto save on exit, don't prompt"
+msgstr "終了時�破棄������を���"
+
+#: src/nano.c:947
+msgid "View mode (read-only)"
+msgstr "ビューモード(読�込�専用)"
+
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
+msgstr "長�行�折り返�を�止"
+
+#: src/nano.c:951
+msgid "Don't show the two help lines"
+msgstr "キー�ガイドを表示���"
+
+#: src/nano.c:952
+msgid "Enable suspension"
+msgstr "一時中断を有効化�る"
+
+#: src/nano.c:954
+msgid "Enable soft line wrapping"
+msgstr "�や��行�折り返�を有効��る"
+
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano �ージョン %s (コンパイル日時: %s, %s)\n"
+
+#: src/nano.c:966
+#, c-format
+msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
+msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
+
+#: src/nano.c:967
+#, c-format
+msgid ""
+"\n"
+" Compiled options:"
+msgstr ""
+"\n"
+" コンパイルオプション:"
+
+#: src/nano.c:1096
+msgid "Sorry, support for this function has been disabled"
+msgstr "��機能�無効��"
+
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
+msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+msgstr "変更�れ��ッファを�存���� (�存����変更�破棄�れ��)？ "
+
+#: src/nano.c:1189
+msgid "Couldn't reopen stdin from keyboard, sorry\n"
+msgstr "申�訳�り��ん��キーボード�ら�標準入力を�オープン����ん。\n"
+
+#: src/nano.c:1213
+#, c-format
+msgid "Reading from stdin, ^C to abort\n"
+msgstr "標準入力�ら読�込ん����。中止�る場�� ^C を入力������\n"
+
+#: src/nano.c:1279
+msgid "Received SIGHUP or SIGTERM\n"
+msgstr "SIGHUP ��� SIGTERM を�信����\n"
+
+#: src/nano.c:1301
+#, c-format
+msgid "Use \"fg\" to return to nano.\n"
+msgstr "\"fg\" �タイプ�る��� nano を�開����。\n"
+
+#: src/nano.c:1481
+msgid "enabled"
+msgstr "使用�る"
+
+#: src/nano.c:1481
+msgid "disabled"
+msgstr "使用���"
+
+#: src/nano.c:1635 src/winio.c:1283
+msgid "Unknown Command"
+msgstr "�明�コマンド"
+
+#: src/nano.c:1747
+msgid "XON ignored, mumble mumble"
+msgstr "XON �効���よ・・・����"
+
+#: src/nano.c:1752
+msgid "XOFF ignored, mumble mumble"
+msgstr "XOFF �効���よ・・・����"
+
+#: src/nano.c:2310 src/rcfile.c:1325
+#, c-format
+msgid "Requested tab size \"%s\" is invalid"
+msgstr "�求�れ�タブ�サイズ \"%s\" ��正��"
+
+#: src/nano.c:2374 src/rcfile.c:1250
+#, c-format
+msgid "Requested fill size \"%s\" is invalid"
+msgstr "�求�れ�サイズ \"%s\" ��正��"
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr ""
+
+#. TRANSLATORS: For the next three strings, if possible, specify
+#. * the single-byte shortcuts for both your language and English.
+#. * For example, in French: "OoYy" for "Oui".
+#: src/prompt.c:1055
+msgid "Yy"
+msgstr "Yy"
+
+#: src/prompt.c:1056
+msgid "Nn"
+msgstr "Nn"
+
+#: src/prompt.c:1057
+msgid "Aa"
+msgstr "Aa"
+
+#: src/prompt.c:1071
+msgid "Yes"
+msgstr "��"
+
+#: src/prompt.c:1076
+msgid "All"
+msgstr "全�"
+
+#: src/prompt.c:1081
+msgid "No"
+msgstr "���"
+
+#: src/rcfile.c:137
+#, c-format
+msgid "Error in %s on line %lu: "
+msgstr "エラー検出 %s � %lu 行目: "
+
+#: src/rcfile.c:196
+#, c-format
+msgid "Argument '%s' has an unterminated \""
+msgstr "引数 '%s' � \" �終端�����ん"
+
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
+msgid "Regex strings must begin and end with a \" character"
+msgstr "正�表�文字列� \" �括������"
+
+#: src/rcfile.c:249 src/search.c:62
+#, c-format
+msgid "Bad regex \"%s\": %s"
+msgstr "�正�正�表� \"%s\": %s"
+
+#: src/rcfile.c:269
+msgid "Missing syntax name"
+msgstr "構文���り��ん"
+
+#: src/rcfile.c:340
+msgid "The \"none\" syntax is reserved"
+msgstr "\"none\" 構文�予約語��"
+
+#: src/rcfile.c:347
+msgid "The \"default\" syntax must take no extensions"
+msgstr ""
+
+#: src/rcfile.c:433
+msgid "Missing key name"
+msgstr "キー�����り��ん"
+
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:463
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "キー�インド� \"^\", \"M\" ��� \"F\" �始������"
+
+#: src/rcfile.c:472
+#, fuzzy
+msgid "Must specify a function to bind the key to"
+msgstr ""
+"キー�インドを有効��るメニューを指定������ (も��� \"all\" を指定�"
+"�����)"
+
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
+
+#: src/rcfile.c:489
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "\"%s\" �対応�る機能��り��ん"
+
+#: src/rcfile.c:496
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "\"%s\" �対応�るメニュー��り��ん"
+
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
+
+#: src/rcfile.c:543
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "申�訳�り��ん��キー \"%s\" �無効��インディング��"
+
+#: src/rcfile.c:629
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "%s: %s �読�込��失敗����"
+
+#: src/rcfile.c:672
+#, c-format
+msgid ""
+"Color \"%s\" not understood.\n"
+"Valid colors are \"green\", \"red\", \"blue\",\n"
+"\"white\", \"yellow\", \"cyan\", \"magenta\" and\n"
+"\"black\", with the optional prefix \"bright\"\n"
+"for foreground colors."
+msgstr ""
+"色\"%s\"�サ�ート�れ����ん。\n"
+"�景色�使用��る色�\"green\"�\"red\"\n"
+"\"blue\"�\"white\"�\"yellow\"�\"cyan\"\n"
+"\"magenta\"�\"black\"���れ�れ�任��\n"
+"接頭語\"bright\"を��る���出���。"
+
+#: src/rcfile.c:694
+msgid "Cannot add a color command without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:699
+msgid "Missing color name"
+msgstr "色�����り��ん"
+
+#: src/rcfile.c:709 src/rcfile.c:870
+msgid "Missing regex string"
+msgstr "正�表�文字列����り��ん"
+
+#: src/rcfile.c:785
+msgid "\"start=\" requires a corresponding \"end=\""
+msgstr "\"start=\" ��対応�る \"end=\" �必���"
+
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "背景色 \"%s\" �明る�色���り��ん"
+
+#: src/rcfile.c:865
+msgid "Cannot add a header regex without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr ""
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:990
+#, fuzzy
+msgid "Missing linter command"
+msgstr "色�����り��ん"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "致命的�エラー: \"%s\" �機能�対応�るキー��り��ん"
+
+#: src/rcfile.c:1047
+#, fuzzy, c-format
+msgid ""
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
+msgstr ""
+"終了���。nanorc �設定を調整�る必���る場��� -I オプションを指定�"
+"� nano を使用������。\n"
+
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "\"%s\" �対応�るメニュー��り��ん"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "コマンド \"%s\" �インクルードファイル内��許��れ����ん"
+
+#: src/rcfile.c:1149 src/rcfile.c:1350
+#, c-format
+msgid "Syntax \"%s\" has no color commands"
+msgstr "構文 \"%s\" �色�コマンド���り��ん"
+
+#: src/rcfile.c:1171
+#, c-format
+msgid "Command \"%s\" not understood"
+msgstr "コマンド \"%s\" を解釈����ん"
+
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "色�����り��ん"
+
+#: src/rcfile.c:1208
+#, c-format
+msgid "Option \"%s\" requires an argument"
+msgstr "オプション \"%s\" ��引数�必���"
+
+#: src/rcfile.c:1226
+msgid "Option is not a valid multibyte string"
+msgstr "オプション�有効�マル��イト文字���り��ん"
+
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
+msgid "Non-blank characters required"
+msgstr "�空白類文字�必���"
+
+#: src/rcfile.c:1273
+msgid "Two single-column characters required"
+msgstr ""
+
+#: src/rcfile.c:1339
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "\"%s\" フラグを解除����ん"
+
+#: src/rcfile.c:1345
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
+msgstr "未知�フラグ \"%s\""
+
+#: src/rcfile.c:1404
+msgid "I can't find my home directory!  Wah!"
+msgstr "ホームディレクトリ�見��り��ん"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"エンターキー�開始���\n"
+
+#: src/search.c:96
+#, c-format
+msgid "\"%.*s%s\" not found"
+msgstr "\"%.*s%s\" �見��り��ん"
+
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [大文字��文字を区別�る]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [正�表�]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [戻る]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
+msgid " (to replace) in selection"
+msgstr ""
+
+#: src/search.c:199
+msgid " (to replace)"
+msgstr ""
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
+msgid "Replace this instance?"
+msgstr ""
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
+msgid "Replace with"
+msgstr "置�候補"
+
+#: src/search.c:986
+#, c-format
+msgid "Replaced %lu occurrence"
+msgid_plural "Replaced %lu occurrences"
+msgstr[0] "%lu 個置��れ���"
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
+msgid "Enter line number, column number"
+msgstr "行番��列番�を入力"
+
+#: src/search.c:1054
+msgid "Invalid line or column number"
+msgstr "無効�行���列番���"
+
+#: src/search.c:1207
+msgid "Not a bracket"
+msgstr "大括弧���り��ん"
+
+#: src/search.c:1274
+msgid "No matching bracket"
+msgstr "大括弧�一致���ん"
+
+#: src/text.c:54
+msgid "Mark Set"
+msgstr "マークセット"
+
+#: src/text.c:58
+msgid "Mark Unset"
+msgstr "マーク解除"
+
+#: src/text.c:439
+msgid "Nothing in undo buffer!"
+msgstr "undo �ッファ�何も�り��ん!"
+
+#: src/text.c:445 src/text.c:590
+#, fuzzy, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "内部エラー: 行 %d �一致���ん。作業を�存������"
+
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
+msgid "text add"
+msgstr "テキスト�追加"
+
+#: src/text.c:467 src/text.c:612
+msgid "text delete"
+msgstr "テキスト�削除"
+
+#: src/text.c:491 src/text.c:641
+msgid "line join"
+msgstr "行���"
+
+#: src/text.c:505 src/text.c:657
+msgid "text cut"
+msgstr "テキスト�切り�り"
+
+#: src/text.c:510 src/text.c:661
+msgid "text uncut"
+msgstr "テキスト�貼り付�"
+
+#: src/text.c:515 src/text.c:623
+msgid "line break"
+msgstr "改行"
+
+#: src/text.c:528 src/text.c:672
+msgid "text insert"
+msgstr "テキスト挿入"
+
+#: src/text.c:549 src/text.c:665
+msgid "text replace"
+msgstr "テキスト�置�"
+
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "内部エラー: �明�型��。作業を�存������。"
+
+#: src/text.c:561
+#, c-format
+msgid "Undid action (%s)"
+msgstr "�作 (%s) を�り消����"
+
+#: src/text.c:580
+msgid "Nothing to re-do!"
+msgstr "やり直��作��り��ん!"
+
+#: src/text.c:584
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "内部エラー: uncut �セットアップ�失敗����。作業を�存������"
+
+#: src/text.c:684
+#, c-format
+msgid "Redid action (%s)"
+msgstr "�作 (%s) をやり直����"
+
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "pipe を作�����ん"
+
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
+msgid "Could not fork"
+msgstr "fork����ん"
+
+#: src/text.c:969
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
+msgstr "内部エラー: uncut �セットアップ�失敗����。作業を�存������"
+
+#: src/text.c:1806
+#, c-format
+msgid "Bad quote string %s: %s"
+msgstr ""
+
+#: src/text.c:2207
+msgid "Can now UnJustify!"
+msgstr ""
+
+#: src/text.c:2404
+msgid "Edit a replacement"
+msgstr ""
+
+#: src/text.c:2492
+msgid "Creating misspelled word list, please wait..."
+msgstr "スペルミス��る�語リストを作������。��ら��待�����..."
+
+#: src/text.c:2584 src/text.c:3022
+msgid "Could not get size of pipe buffer"
+msgstr "pipe �ッファ�サイズを�得����ん���"
+
+#: src/text.c:2635
+msgid "Error invoking \"spell\""
+msgstr "\"spell\" �呼�出��失敗"
+
+#: src/text.c:2638
+msgid "Error invoking \"sort -f\""
+msgstr "\"sort -f\" �呼�出��失敗"
+
+#: src/text.c:2641
+msgid "Error invoking \"uniq\""
+msgstr "\"uniq\" �呼�出��失敗"
+
+#: src/text.c:2696 src/text.c:2907
+msgid "Finished checking spelling"
+msgstr "スペル�ェック完了"
+
+#: src/text.c:2759 src/text.c:3340
+#, c-format
+msgid "Error invoking \"%s\""
+msgstr "\"%s\" �呼�出��失敗"
+
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "スペル�ェッカを起動 (利用�能�場�)"
+
+#: src/text.c:2902
+#, c-format
+msgid "Spell checking failed: %s"
+msgstr "スペル�ェック失敗: %s"
+
+#: src/text.c:2904
+#, c-format
+msgid "Spell checking failed: %s: %s"
+msgstr "スペル�ェック失敗: %s: %s"
+
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "ファイル末尾�空行を追加���"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "��メッセージを表示"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "��メッセージを表示"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
+#, c-format
+msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgstr "%s�語数: %lu  行数: %ld  文字数: %lu"
+
+#: src/text.c:3439
+msgid "In Selection:  "
+msgstr "�択範囲内:  "
+
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "�次入力"
+
+#: src/utils.c:410 src/utils.c:422
+msgid "nano is out of memory!"
+msgstr "nano �メモリ�足り���り���!"
+
+#. TRANSLATORS: This is displayed during the input of a
+#. * six-digit hexadecimal Unicode character code.
+#: src/winio.c:1583
+msgid "Unicode Input"
+msgstr "ユニコード入力"
+
+#: src/winio.c:2142 src/winio.c:2146
+msgid "Modified"
+msgstr "変更済�"
+
+#: src/winio.c:2143
+msgid "View"
+msgstr "表示"
+
+#: src/winio.c:2157
+msgid "DIR:"
+msgstr "ディレクトリ:"
+
+#: src/winio.c:2164
+msgid "File:"
+msgstr "ファイル:"
+
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
+#, c-format
+msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
+msgstr "行 %ld/%ld (%d%%), 列 %lu/%lu (%d%%), 文字 %lu/%lu (%d%%)"
+
+#: src/winio.c:3507
+msgid "The nano text editor"
+msgstr "nano テキストエディタ"
+
+#: src/winio.c:3508
+msgid "version"
+msgstr "�ージョン"
+
+#: src/winio.c:3509
+msgid "Brought to you by:"
+msgstr "貢献���れ�方々:"
+
+#: src/winio.c:3510
+msgid "Special thanks to:"
+msgstr "スペシャルサンクス:"
+
+#: src/winio.c:3511
+msgid "The Free Software Foundation"
+msgstr "The Free Software Foundation"
+
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
+msgid "For ncurses:"
+msgstr "ncurses �関��:"
+
+#: src/winio.c:3514
+msgid "and anyone else we forgot..."
+msgstr "�よ�他�����方々..."
+
+#: src/winio.c:3515
+msgid "Thank you for using nano!"
+msgstr "nano を使用�������り��������!"
+
+#~ msgid "Insert File"
+#~ msgstr "ファイルを挿入"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "��ページ�移動"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "対応�る括弧を探�"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "長�行を折り返�"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "一般的� undo を許��る [実験的]"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(Pico ��互�性����オプション。無視�れ��)"
+
+#~ msgid "Missing flag"
+#~ msgstr "フラグ����り��ん"
+
+#~ msgid "line wrap"
+#~ msgstr "行�折り返�"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "内部エラー: �明�型��。作業を�存������"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "内部エラー: redo �セットアップ�失敗����。作業を�存������"
+
+#~ msgid "Could not pipe"
+#~ msgstr "pipe ����ん"
diff --git a/po/ms.gmo b/po/ms.gmo
index ef75adf..5db8eac 100644
--- a/po/ms.gmo
+++ b/po/ms.gmo
diff --git a/po/ms.po b/po/ms.po
index c42ed74..950e917 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -1,121 +1,146 @@
 # Nano Editor Bahasa Melayu (Malay) (ms).
 # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009.
 #
+# Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 2.1.7pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2009-01-06 00:48+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
+"Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Pergi Ke Direktori"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Dibatalkan"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Tidak boleh ke luar dari %s dalam mod terhad"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Ralat membaca %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Tidak dapat pindah naik direktori"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(dir induk)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Cari"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Case Sensitif]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Regexp]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Undur]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Pancarian diulangi dari awal"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Hanya inilah sahaja yang dijumpai"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Tiada corak carian semasa"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr ""
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Ralat menulis fail salinan %s: %s"
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Ralat menulis fail salinan %s: %s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Ralat menulis fail salinan %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, fuzzy, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Ralat menulis fail salinan %s: %s"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Tidak dapat memasukkan fail luar daripada %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Tiada lagi buffer fail terbuka"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Ditukar kepada %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Buffer Baru"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "%lu baris dibaca (Ditukar daripada format Mac dan DOS)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -125,13 +150,13 @@ msgid_plural ""
 "permission)"
 msgstr[0] "%lu baris dibaca (Ditukar daripada format Mac dan DOS)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "%lu baris dibaca (Ditukar daripada format Mac)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -139,13 +164,13 @@ msgid_plural ""
 "Read %lu lines (Converted from Mac format - Warning: No write permission)"
 msgstr[0] "%lu baris dibaca (Ditukar daripada format Mac)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "%lu baris dibaca (Ditukar daripada format DOS)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -153,473 +178,433 @@ msgid_plural ""
 "Read %lu lines (Converted from DOS format - Warning: No write permission)"
 msgstr[0] "%lu baris dibaca (Ditukar daripada format DOS)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu baris dibaca"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] ""
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Membaca fail"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Fail Baru"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" tidak dijumpai"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" adalah sebuah direktori"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" adalah sebuah fail peranti"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Arahan untuk dilaksanakan dalam buffer baru [daripada %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Arahan untuk dilaksanakan [dari %s]"
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fail untuk dimasukkan kedalam buffer baru [daripada %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fail untuk dimasukkan [daripada %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Kekunci tidak sah dalam mod bukan multibuffer"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Tidak dapat menulis diluar daripada %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "Tidak dapat tambah awal atau tambah ke symlink dengan set --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Ralat menulis fail salinan %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Terlalu banyak fail salinan?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Ralat menulis %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Ralat menulis fail sementara: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%lu baris ditulis"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Salinan]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Tambahan Awalan Pilihan ke Fail"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Tambahan Akhiran Pilihan ke Fail"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Tulis Pilihan ke Fail"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Nama Fail untuk di Tambah Awalan"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Nama Fail untuk di Tambah Akhiran"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Nama Fail untuk di Tulis"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Fail telah wujud, TINDIH ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Simpan fail dengan NAMA BERLAINAN ? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Fail telah diubahsuai semenjak anda membukanya, teruskan menyimpan ?"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(lagi)"
 
-#: src/files.c:2694 src/rcfile.c:1220
-#, c-format
+#: src/files.c:2974
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
 "Tekan Enter untuk meneruskan memulakan nano.\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Batal"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Ganti"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Jangan Ganti"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Case Sens"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Kebelakang"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Regexp"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Keluar"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "SjrhUndur"
+#: src/global.c:478
+msgid "Close"
+msgstr "Tutup"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "SjrhMaju"
+#: src/global.c:479
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Nyahpotong Teks"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Ke Teks"
+#: src/global.c:481
+#, fuzzy
+msgid "Unjustify"
+msgstr "UnJustifikasi"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Dimana Seterusnya"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Fail Pertama"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Fail Terakhir"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Ke Fail"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Format DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Format Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Tambah"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Tambahan awalan"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Fail Salinan"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Laksanakan Arahan"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Pergi Ke Dir"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Bantuan"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Keluar"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Di mana"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Terdahulu"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Berikut"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Brs Awal"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Ganti"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Brs Akhir"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Ke Baris"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Gantung"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Baris Terdahulu"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Minta untuk Par"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Baris Berikut"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Pengakhir Par"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Baca Fail"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "JustifiPenuh"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Segarkan"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Selit Fail"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Ke Baris"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Justifikasi perenggan semasa"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Batal fungsi semasa"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Papar teks bantuan ini"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Tutup fail penimbal semasa / Keluar dari nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Keluar dari nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Tulis fail semasa ke cakera"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Masukkan fail lain ke file semasa"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Cari rentetan atau regular expression"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Pergi ke skrin terdahulu"
+#: src/global.c:526
+#, fuzzy
+msgid "Search for a string"
+msgstr "Cari rentetan atau regular expression"
+
+#: src/global.c:528
+#, fuzzy
+msgid "Go one screenful up"
+msgstr "Pergi ke skrin berikutnya"
 
-#: src/global.c:521
-msgid "Go to next screen"
+#: src/global.c:529
+#, fuzzy
+msgid "Go one screenful down"
 msgstr "Pergi ke skrin berikutnya"
 
-#: src/global.c:523
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Potong baris semasa dan simpan dalam cutbuffer"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Kembalikan dari cutbuffer ke baris semasa"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Papar posisi kursor"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Panggil penyemak ejaan, jika ada"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Ganti rentetan atau regular expression"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Pergi ke nombor baris dan lajur"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "Tanda teks pada lokasi kursor"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "Ulang carian terakhir"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Salin baris semasa dan simpan dalam cutbuffer"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Inden baris semasa"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Nyahindent baris semasa"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Nyahbuat tindakan terakhir"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Buat semula tindakan nyahbuat terakhir"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Maju ke depan satu aksara"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Undur ke belakang satu aksara"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Maju ke depan satu perkataan"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Undur belakang satu perkataan"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Pergi ke baris terdahulu"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Pergi ke baris berikutnya"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Pergi ke permulaan baris semasa"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Pergi ke penghujung baris semasa"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 "Pergi hingga ke permulaan perenggan semasa; kemudian ke perenggan sebelumnya"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 "Pergi hingga ke penghujung perenggan semasa; kemudian ke perenggan seterusnya"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Pergi ke baris pertama fail"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Pergi ke baris terakhir fail"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Pergi ke braket sepadan"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Skrol atas satu baris tanpa skrol kursor"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Skrol bawah satu baris tanpa skrol kursor"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Tukar ke buffer fail terdahulu"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Tukar ke buffer fail berikut"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Selit kekunci seterusnya setiap satu"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Masukkan tab di kedudukan kursor"
 
@@ -627,333 +612,450 @@ msgstr "Masukkan tab di kedudukan kursor"
 msgid "Insert a newline at the cursor position"
 msgstr "Masukkan baris baru di kedudukan kursor"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Padam aksara dibawah kursor"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Padam aksara di kiri kursor"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Potong dari kedudukan kursor hingga ke akhir fail"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Justifi keseluruhan fail"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Kira jumlah perkataan, baris, dan aksara"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Segarkan (lukis semula) skrin semasa"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Gantung penyunting (jika gantung dihidupkan)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Toggle pencarian case sensitif"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Terbalikkan arah carian"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Toggle penggunaan ungkapan nalar"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Panggil semula rentetan cari/ganti terdahulu"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Panggil semula rentetan cari/ganti seterusnya"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Pergi ke pelayar fail"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Toggle penggunaan format DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Toggle penggunaan format Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Toggle tambahan akhiran"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Toggle tambahan awalan"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Toggle salinan fail asal"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Laksanakan arahan luaran"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Toggle kegunaan buffer baru"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Keluar dari pelayar fail"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Pergi ke fail pertama dalam senarai"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Pergi ke fail terakhir dalam senarai"
 
-#: src/global.c:641
+#: src/global.c:634
+#, fuzzy
+msgid "Go to the previous file in the list"
+msgstr "Pergi ke fail pertama dalam senarai"
+
+#: src/global.c:635
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Pergi ke fail terakhir dalam senarai"
 
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Pergi ke direktori"
+
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Panggil penyemak ejaan, jika ada"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Pergi ke baris terdahulu"
+
+#: src/global.c:641
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Pergi ke baris berikutnya"
+
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Pergi ke fail pertama dalam senarai"
+msgid "Invoke formatter, if available"
+msgstr "Panggil penyemak ejaan, jika ada"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Pergi ke direktori"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Bantuan"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Tutup"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Batal"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "Tulis"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Pergi Ke Dir"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Kerat Teks"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Justifikasi"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Baca Fail"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Ke Pengeja"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Kerat Teks"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "Ke Baris"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "UnJustifikasi"
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "Format DOS"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Nyahpotong Teks"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Case Sens"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Regexp"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Kebelakang"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Jangan Ganti"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Pos Kursor"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Ke Pengeja"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Terdahulu"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Berikut"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Brs Awal"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Brs Akhir"
 
-#: src/global.c:771
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Bukan kurungan"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Tanda Teks"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Salin Teks"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Teks Indent"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Teks Tidak Indent"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Nyahbuat"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Buat semula"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Maju"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Undur"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Perkataan Selepas"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Maju"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Perkataan Terdahulu"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Baris Terdahulu"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Baris Berikut"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Perkataan Selepas"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Asal"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Akhir"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Cari Lain-lain Tanda Kurungan"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Minta untuk Par"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Pengakhir Par"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Skrol Atas"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Skrol Bawah"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "Fail Sebelum"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Fail Selepas"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
 msgstr "Masukan Verbatim"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Padam"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "PtngHnggAkhr"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Kiraan Perkataan"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Gantung"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "SjrhUndur"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "SjrhMaju"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Ke Teks"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Format DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Format Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Tambah"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Tambahan awalan"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Fail Salinan"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Laksanakan Arahan"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Ke Fail"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Fail Pertama"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Fail Terakhir"
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Baris Terdahulu"
+
+#: src/global.c:979
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "Baris Berikut"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Mod bantuan"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Paparan posisi tetap kursor"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Guna satu lagi baris untuk menyunting"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Gulungan lancar"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Jangan lilit baris panjang"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Papar ruangputih"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Sorotan warna sintaks"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Kekunci Home pintar"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Auto indent"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Potong hingga akhir"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Lilit baris panjang"
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Jangan lilit baris panjang"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Penukaran tab ditaip kepada ruang"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Salinan fail"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Buffer fail berganda"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Sokongan tetikus"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Tiada pertukaran dari format DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Gantungan"
 
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Lilit baris panjang"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -975,7 +1077,7 @@ msgstr ""
 "carian.  Menekan Enter tanpa memasukkan sebarang teks akan melaksanakan "
 "carian terdahulu."
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -989,7 +1091,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Cari:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1009,7 +1111,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Pergi Ke Baris:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1032,7 +1134,7 @@ msgstr ""
 "menyebabkannya dimuatkan ke dalam buffer berlainan (guna Meta-< dan > untuk "
 "menukar diantara buffer fail)."
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1046,7 +1148,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Sisipan Fail:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1074,7 +1176,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Menulis Fail:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1098,7 +1200,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam pelayar fail:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1122,7 +1224,7 @@ msgstr ""
 "carian terdahulu.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1130,7 +1232,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat dalam mod Pencarian Pelayar:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1153,7 +1255,7 @@ msgstr ""
 "  Kekunci fungsi berikut terdapat didalam mod Pelayar Pergi ke Direktori:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1177,7 +1279,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Penyemak Ejaan:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1198,7 +1300,7 @@ msgstr ""
 " Kekunci fungsi berikut terdapat didalam mod Laksana Arahan:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1218,7 +1320,7 @@ msgstr ""
 "penyunting yang menunjukkan fail yang sedang disunting.  Baris status adalah "
 "baris ketiga dari bawah dan menunjukkan mesej-mesej penting."
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1238,7 +1340,7 @@ msgstr ""
 "menggunakan kekunci Esc, Alt atau Meta bergantung pada tetapan papan kekunci "
 "anda."
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1252,15 +1354,15 @@ msgstr ""
 "dalam kurungan:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "enable/disable"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Kekunci tidak sah dalam mod lihat"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1269,7 +1371,7 @@ msgstr ""
 "\n"
 "Buffer ditulis ke %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1278,7 +1380,7 @@ msgstr ""
 "\n"
 "Buffer tidak ditulis ke %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1287,11 +1389,11 @@ msgstr ""
 "\n"
 "Buffer tidak ditulis: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Saiz tetingkap terlalu kecil bagi nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1300,252 +1402,262 @@ msgstr ""
 "Penggunaan: nano [PILIHAN] [[+BARIS[,LAJUR]] FAIL]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Pilihan\t\tPilihan panjang GNU\t\tMaksud\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Pilihan\t\tMakna\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Papar mesej ini"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+BARIS,LAJUR"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Mula pada baris BARIS, lajur LAJUR"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Aktifkan kekunci home pintar"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Simpan salinan fail sediawujud"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <dir>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Direktori untuk menyimpan fail salinan unik"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Guna tebal berbanding teks video terbalik"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Tukar tab ditaip kepada ruang"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Benarkan beberapa buffer fail"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Tulis & baca sejarah carian/gantian rentetan"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Jangan lihat pada fail nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Betulkan masalah kekeliruan pad kekunci bernombor"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Jangan tambah baris baru pada penghujung fail"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Jangan tukar fail dari format DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Guna satu lagi baris untuk menyunting"
 
-#: src/nano.c:860
+#: src/nano.c:886
+#, fuzzy
+msgid "Log & read location of cursor position"
+msgstr "Masukkan tab di kedudukan kursor"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Rentetan petikan"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Mod terhad"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Gulung mengikut baris berbanding separuh skrin"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Tetapkan lebar tab dalam ke #lajur lajur"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Laksana pengosongan bar status pantas"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Papar maklumat versi dan keluar"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Kesan sempadan perkataan lebih tepat"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<str>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Takrifan sintaks untuk digunakan bagi mewarna"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Sentiasa papar kedudukan kursor"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Betulkan masalah kekeliruan Backspace/Delete"
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "Papar teks bantuan ini"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Indent baris baru secara automatik"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Potong dari kursor hingga ke akhir baris"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Jangan ikut pautan simbolik, tulisemula"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Aktifkan penggunaan tetikus"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Tetapkan direktori operasi"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Pelihara kekunci XON (^Q) dan XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#cols>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#cols>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Tetapkan titik gulungan pada lajur #lajur"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Aktifkan pengeja lain"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Auto simpan ketika keluar, jangan maklum"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Mod lihat (baca sahaja)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Jangan lilit baris panjang"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Jangan papar dua baris bantuan"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Aktifkan gantungan"
 
-#: src/nano.c:924
+#: src/nano.c:954
 #, fuzzy
 msgid "Enable soft line wrapping"
 msgstr "Lilit baris panjang"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(diabaikan, untuk kesesuaian Pico)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano versi %s (compiled %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Emel: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1554,157 +1666,180 @@ msgstr ""
 "\n"
 " Pilihan kompilasi:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Maaf, sokongan untuk fungsi ini telah dimatikan"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Simpan buffer ubahsuai (JAWAB \"Tidak\" AKAN MENGHILANGKAN PERUBAHAN) ? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP atau SIGTERM diterima\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Guna \"fg\" untuk kembali ke nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "dihidupkan"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "dimatikan"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Arahan Tidak Diketahui"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON diabaikan, mumble mumble"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF diabaikan, mumble mumble"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Saiz tab \"%s\" yang diminta tidak sah"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Saiz isian \"%s\" yang diminta tidak sah"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr ""
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Tt"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Ss"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Ya"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Semua"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Tidak"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Ralat dalam %s pada baris %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Hujah '%s' tiada pengakhiran \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Rentetan regex mesti bermula dan tamat dengan aksara \""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Regex tidak sah \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Nama sintaks tiada"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "Sintaks \"none\" adalah dikhaskan"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Sintaks \"default\" mesti tidak mempunyai sambungan"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Nama kekunci hilang"
 
-#: src/rcfile.c:398 src/rcfile.c:499
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:463
 #, fuzzy
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "ikatankekunci mesti bermula dengan \"^\", \"M\", atau \"F\"\n"
 
-#: src/rcfile.c:407
+#: src/rcfile.c:472
 #, fuzzy
-msgid "Must specify function to bind key to"
+msgid "Must specify a function to bind the key to"
 msgstr "Mesti menyatakan fungsi untuk mengikat kekunci ke\n"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-#, fuzzy
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Mesti menyatakan kekunci ikat ke menu (atau \"semua\")\n"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:426
+#: src/rcfile.c:489
 #, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Cannot map name \"%s\" to a function"
 msgstr "Tidak dapat memetakan nama \"%s\" ke fungsi\n"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:496
 #, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "Tidak dapat memetakan nama \"%s\" ke menu\n"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
+
+#: src/rcfile.c:543
 #, fuzzy, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Maaf, kekunci \"%s\" adalah ikatan tidak sah\n"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Ralat membaca %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1719,134 +1854,195 @@ msgstr ""
 "\"black\", dengan prefiks pilihan \"bright\"\n"
 "untuk warna latar hadapan."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Tidak dapat menambah arahan warna tanpa arahan sintaks"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Nama warna tiada"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Warna latarbelakang \"%s\" tidak boleh terang"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Rentetan regex hilang"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" memerlukan padanan \"end=\""
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Warna latarbelakang \"%s\" tidak boleh terang"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
 
-#: src/rcfile.c:874
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:921
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
+
+#: src/rcfile.c:926
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Rentetan regex hilang"
+
+#: src/rcfile.c:985
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Tidak dapat menambah pengepala regex tanpa arahan sintaks"
+
+#: src/rcfile.c:990
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Nama warna tiada"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Tidak dapat menambah arahan warna tanpa arahan sintaks"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "Ralat maut: tiada kekunci dipetakan untuk fungsi \"%s\""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, fuzzy, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 "Keluar. Sila guna nano dengan pilihan -I jika perlu untuk mengubah tetapan "
 "nanorc anda\n"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Tidak dapat memetakan nama \"%s\" ke menu\n"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Arahan \"%s\" tidak dibenarkan dalam fail diselitkan"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintaks \"%s\" tidak mempunyai arahan warna"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Arahan \"%s\" tidak difahami"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Penanda hilang"
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "Nama warna tiada"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Pilihan \"%s\" memerlukan hujah"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Pilihan bukan rentetan pelbagai byte yang sah"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Aksara bukan-kosong diperlukan"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Dua aksara satu-lajur diperlukan"
 
-#: src/rcfile.c:1114
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1339
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "Tidak dapat nyahtetap penanda \"%s\""
 
-#: src/rcfile.c:1123
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1345
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "Penanda \"%s\" tidak diketahui"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Saya tidak dapat mencari direktori utama!  Wah!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Tekan Enter untuk meneruskan memulakan nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" tidak dijumpai"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Case Sensitif]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Regexp]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Undur]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (untuk mengganti) dalam pilihan"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (untuk mengganti)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Ganti dikedudukan ini?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Ganti dengan"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%lu tempat telah diganti"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Masukkan nombor baris, nombor lajur"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Nombor baris atau lajur tidak sah"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Bukan kurungan"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Tiada padanan kurungan"
 
@@ -1858,218 +2054,306 @@ msgstr "Tetapkan Tanda"
 msgid "Mark Unset"
 msgstr "Nyahtetap Tanda"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Tiada apa dalam buffer nyahbuat!"
 
-#: src/text.c:455 src/text.c:593
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+#: src/text.c:445 src/text.c:590
+#, fuzzy, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr "Ralat dalaman: tidak dapat memadan baris %d. Sila simpan kerja anda"
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "tambah teks"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "padam teks"
 
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Lilit baris panjang"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "gabung baris"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "potong teks"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "nyahpotong teks"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "selit teks"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "ganti teks"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Ralat dalaman: jenis tidak diketahui. Sila simpan kerja anda"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Ralat dalaman: jenis tidak diketahui. Sila simpan kerja anda."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Nyahbuat tindakan (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Tiada apa hendak di ulangbuat!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "Ralat dalaman: tetapan buat semula gagal. Sila simpan kerja anda"
+#: src/text.c:584
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr ""
+"Ralat dalaman: tidak dapat menetapkan nyahpotong. Sila simpan kerja anda."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Ulangbuat tindakan (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Tidak dapat menyalurkan"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Tidak dapat mencipta paip"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Tidak dapat mencabang"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 "Ralat dalaman: tidak dapat menetapkan nyahpotong. Sila simpan kerja anda."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Ralat dalaman: jenis tidak diketahui. Sila simpan kerja anda."
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Petikan rentetan tidak sesuai %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Sekarang boleh UnJustify!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Ubah penggantian"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Tidak dapat mencipta paip"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Menghasilkan senarai perkataan salah eja, sila tunggu..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Tidak dapat memperoleh saiz buffer paip"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Ralat melaksanakan \"spell\""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Ralat melaksanakan \"sort -f\""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Ralat melaksanakan \"uniq\""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Selesai memeriksa ejaan"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Ralat melaksanakan \"%s\""
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Panggil penyemak ejaan, jika ada"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Semakan ejaan gagal: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Semakan ejaan gagal: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Jangan tambah baris baru pada penghujung fail"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "Papar mesej ini"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "Papar mesej ini"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sPerkataan: %lu  Baris: %ld  Aksara: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Dalam Pilihan:"
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Masukan Verbatim"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano tidak cukup memori!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Masukan Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Diubahsuai"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Lihat"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Fail:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "baris %ld/%ld (%d%%), lajur %lu/%lu (%d%%), aksara %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Penyunting teks nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "versi"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Dibawakan kepada anda oleh:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Terima kasih khas kepada:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Untuk ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "dan sesiapa yang kami lupa...."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Terima kasih kerana menggunakan nano!"
 
+#~ msgid "Insert File"
+#~ msgstr "Selit Fail"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Pergi ke skrin terdahulu"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Cari Lain-lain Tanda Kurungan"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(diabaikan, untuk kesesuaian Pico)"
+
+#~ msgid "Must specify menu bind key to (or \"all\")\n"
+#~ msgstr "Mesti menyatakan kekunci ikat ke menu (atau \"semua\")\n"
+
+#~ msgid "Missing flag"
+#~ msgstr "Penanda hilang"
+
 #~ msgid "line split"
 #~ msgstr "pisah baris"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Ralat dalaman: jenis tidak diketahui. Sila simpan kerja anda"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr "Ralat dalaman: tetapan buat semula gagal. Sila simpan kerja anda"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Tidak dapat menyalurkan"
diff --git a/po/nano.pot b/po/nano.pot
index f8dac69..5c6f0b8 100644
--- a/po/nano.pot
+++ b/po/nano.pot
@@ -8,115 +8,140 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr ""
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr ""
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr ""
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr ""
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr ""
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
+#: src/browser.c:812 src/search.c:382
+msgid "Search Wrapped"
 msgstr ""
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
+msgid "This is the only occurrence"
 msgstr ""
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
+#: src/browser.c:915 src/search.c:569
+msgid "No current search pattern"
 msgstr ""
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
-msgid "Search Wrapped"
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
 msgstr ""
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
-msgid "This is the only occurrence"
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
 msgstr ""
 
-#: src/browser.c:1042 src/search.c:583
-msgid "No current search pattern"
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr ""
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr ""
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr ""
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 
-#: src/files.c:125
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr ""
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr ""
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr ""
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr ""
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -127,14 +152,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -143,14 +168,14 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -159,472 +184,425 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr ""
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr ""
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr ""
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr ""
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr ""
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr ""
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr ""
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr ""
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr ""
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr ""
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr ""
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr ""
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr ""
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr ""
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr ""
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr ""
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr ""
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr ""
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr ""
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr ""
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr ""
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr ""
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr ""
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr ""
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
-msgstr ""
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
+"Press Enter to continue\n"
 msgstr ""
 
-#: src/global.c:416
-msgid "Replace"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
 
-#: src/global.c:417
-msgid "No Replace"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
 msgstr ""
 
-#: src/global.c:420
-msgid "Case Sens"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
 msgstr ""
 
-#: src/global.c:421
-msgid "Backwards"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
 msgstr ""
 
-#: src/global.c:425
-msgid "Regexp"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
+#: src/global.c:478
+msgid "Close"
 msgstr ""
 
-#: src/global.c:452
-msgid "NextHstory"
+#: src/global.c:479
+msgid "Uncut Text"
 msgstr ""
 
-#: src/global.c:453
-msgid "Go To Text"
+#: src/global.c:481
+msgid "Unjustify"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr ""
 
-#: src/global.c:457
-msgid "First File"
-msgstr ""
-
-#: src/global.c:458
-msgid "Last File"
-msgstr ""
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr ""
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr ""
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr ""
-
-#: src/global.c:464
-msgid "Append"
-msgstr ""
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr ""
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr ""
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr ""
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr ""
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr ""
-
-#: src/global.c:481
-msgid "Exit"
-msgstr ""
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr ""
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr ""
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr ""
-
-#: src/global.c:485
-msgid "First Line"
+#: src/global.c:493
+msgid "Replace"
 msgstr ""
 
-#: src/global.c:486
-msgid "Last Line"
+#: src/global.c:494
+msgid "Go To Line"
 msgstr ""
 
-#: src/global.c:487
-msgid "Suspend"
+#: src/global.c:495
+msgid "Prev Line"
 msgstr ""
 
-#: src/global.c:489
-msgid "Beg of Par"
+#: src/global.c:496
+msgid "Next Line"
 msgstr ""
 
-#: src/global.c:490
-msgid "End of Par"
+#: src/global.c:497
+msgid "Read File"
 msgstr ""
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr ""
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr ""
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr ""
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr ""
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr ""
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr ""
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr ""
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr ""
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr ""
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr ""
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr ""
 
-#: src/global.c:520
-msgid "Go to previous screen"
+#: src/global.c:526
+msgid "Search for a string"
 msgstr ""
 
-#: src/global.c:521
-msgid "Go to next screen"
+#: src/global.c:528
+msgid "Go one screenful up"
 msgstr ""
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr ""
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr ""
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr ""
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr ""
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr ""
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr ""
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
 msgstr ""
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr ""
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr ""
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr ""
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr ""
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr ""
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr ""
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr ""
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr ""
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr ""
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr ""
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr ""
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr ""
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr ""
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr ""
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr ""
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr ""
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr ""
 
@@ -632,330 +610,434 @@ msgstr ""
 msgid "Insert a newline at the cursor position"
 msgstr ""
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr ""
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr ""
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr ""
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr ""
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr ""
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr ""
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr ""
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr ""
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr ""
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr ""
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr ""
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr ""
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr ""
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr ""
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr ""
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr ""
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr ""
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr ""
 
-#: src/global.c:641
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr ""
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
 msgstr ""
 
+#: src/global.c:636
+msgid "Go to directory"
+msgstr ""
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr ""
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr ""
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr ""
+
 #: src/global.c:642
-msgid "Go to the previous file in the list"
+msgid "Invoke formatter, if available"
 msgstr ""
 
-#: src/global.c:643
-msgid "Go to directory"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr ""
+
+#: src/global.c:678
+msgid "Write Out"
+msgstr ""
+
+#: src/global.c:704
+msgid "Go To Dir"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:719
+msgid "Cut Text"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:728
 msgid "Justify"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
+#: src/global.c:733
+msgid "To Spell"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
+#: src/global.c:738
+msgid "To Linter"
+msgstr ""
+
+#: src/global.c:740
+msgid "Formatter"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
+#: src/global.c:745
+msgid "Case Sens"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
+#: src/global.c:750
+msgid "Regexp"
+msgstr ""
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr ""
+
+#: src/global.c:762
+msgid "No Replace"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr ""
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr ""
+
+#: src/global.c:785
+msgid "First Line"
+msgstr ""
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr ""
+
+#: src/global.c:794
+msgid "To Bracket"
 msgstr ""
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
 msgstr ""
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr ""
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr ""
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr ""
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr ""
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr ""
 
-#: src/global.c:817
-msgid "Next Word"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
 msgstr ""
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr ""
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr ""
-
-#: src/global.c:827
-msgid "Next Line"
+#: src/global.c:829
+msgid "Next Word"
 msgstr ""
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr ""
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr ""
 
-#: src/global.c:845
-msgid "Find Other Bracket"
+#: src/global.c:844
+msgid "Beg of Par"
 msgstr ""
 
-#: src/global.c:848
-msgid "Scroll Up"
+#: src/global.c:846
+msgid "End of Par"
 msgstr ""
 
 #: src/global.c:851
-msgid "Scroll Down"
+msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:853
+msgid "Scroll Down"
 msgstr ""
 
 #: src/global.c:858
+msgid "Prev File"
+msgstr ""
+
+#: src/global.c:860
 msgid "Next File"
 msgstr ""
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr ""
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr ""
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr ""
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr ""
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr ""
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr ""
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr ""
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr ""
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr ""
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr ""
+
+#: src/global.c:934
+msgid "Append"
+msgstr ""
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr ""
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr ""
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr ""
+
+#: src/global.c:961
+msgid "To Files"
+msgstr ""
+
+#: src/global.c:964
+msgid "First File"
+msgstr ""
+
+#: src/global.c:966
+msgid "Last File"
+msgstr ""
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr ""
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr ""
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr ""
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr ""
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr ""
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr ""
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr ""
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr ""
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr ""
 
-#: src/global.c:1385
-msgid "Long line wrapping"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
 msgstr ""
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr ""
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr ""
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr ""
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr ""
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr ""
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr ""
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -968,7 +1050,7 @@ msgid ""
 "search.  "
 msgstr ""
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -977,7 +1059,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -989,7 +1071,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1002,7 +1084,7 @@ msgid ""
 "into a separate buffer (use Meta-< and > to switch between file buffers).  "
 msgstr ""
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1011,7 +1093,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1027,7 +1109,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1041,7 +1123,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1055,13 +1137,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1074,7 +1156,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1088,7 +1170,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1100,7 +1182,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1112,7 +1194,7 @@ msgid ""
 "bottom and shows important messages.  "
 msgstr ""
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1123,7 +1205,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1132,444 +1214,474 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr ""
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr ""
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
 "Buffer written to %s\n"
 msgstr ""
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr ""
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr ""
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr ""
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr ""
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr ""
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr ""
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr ""
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr ""
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr ""
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr ""
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr ""
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr ""
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr ""
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr ""
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr ""
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr ""
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr ""
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr ""
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr ""
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr ""
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr ""
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr ""
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr ""
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr ""
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr ""
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr ""
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr ""
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr ""
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr ""
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr ""
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr ""
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr ""
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr ""
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr ""
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr ""
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr ""
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr ""
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr ""
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr ""
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr ""
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
 msgstr ""
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr ""
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr ""
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr ""
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr ""
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr ""
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
 msgstr ""
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr ""
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr ""
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr ""
-
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+msgid " GNU nano, version %s\n"
 msgstr ""
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr ""
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr ""
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr ""
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr ""
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr ""
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr ""
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr ""
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr ""
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr ""
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr ""
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr ""
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr ""
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr ""
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr ""
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr ""
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr ""
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr ""
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr ""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr ""
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr ""
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr ""
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr ""
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr ""
+
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
 msgstr ""
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:426
+#: src/rcfile.c:528
 #, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:543
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:629
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Error expanding %s: %s"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1579,133 +1691,186 @@ msgid ""
 "for foreground colors."
 msgstr ""
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr ""
 
-#: src/rcfile.c:672
+#: src/rcfile.c:709 src/rcfile.c:870
+msgid "Missing regex string"
+msgstr ""
+
+#: src/rcfile.c:785
+msgid "\"start=\" requires a corresponding \"end=\""
+msgstr ""
+
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
 msgstr ""
 
-#: src/rcfile.c:690 src/rcfile.c:809
-msgid "Missing regex string"
+#: src/rcfile.c:865
+msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:762
-msgid "\"start=\" requires a corresponding \"end=\""
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:804
-msgid "Cannot add a header regex without a syntax command"
+#: src/rcfile.c:926
+msgid "Missing magic string name"
 msgstr ""
 
-#: src/rcfile.c:874
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr ""
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
+msgstr ""
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
 msgstr ""
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr ""
 
-#: src/rcfile.c:972
-msgid "Missing flag"
+#: src/rcfile.c:1186
+msgid "Missing option"
 msgstr ""
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr ""
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
+msgid "Cannot unset option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
+msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr ""
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr ""
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr ""
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr ""
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr ""
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr ""
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr ""
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr ""
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr ""
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr ""
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr ""
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr ""
 
@@ -1717,213 +1882,268 @@ msgstr ""
 msgid "Mark Unset"
 msgstr ""
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr ""
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr ""
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr ""
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr ""
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:766
-msgid "Could not pipe"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
 msgstr ""
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr ""
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr ""
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr ""
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr ""
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr ""
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr ""
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr ""
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr ""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr ""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr ""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr ""
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr ""
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr ""
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr ""
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr ""
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr ""
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr ""
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr ""
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr ""
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr ""
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr ""
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr ""
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr ""
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr ""
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr ""
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr ""
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr ""
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr ""
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr ""
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr ""
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr ""
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr ""
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr ""
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr ""
diff --git a/po/nb.gmo b/po/nb.gmo
index b1b5ffa..5408896 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index 9f57f40..9915663 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,985 +1,1072 @@
-# Norwegian bokmål message catalogs for GNU nano.
+# Norwegian Bokmål message catalog for GNU nano.
 # Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-# Eivind Kjørstad <ekj@vestdata.no>, 2001.
-# Stig E Sandø <stig@ii.uib.no>, 2002.
-# Geir Helland <pjallabais@users.sourceforge.net>, 2004
-# $Id: nb.po,v 1.3 2002/01/23 01:06:20 astyanax Exp $
+# This file is distributed under the same license as the nano package.
 #
+# Eivind Kjørstad <ekj@vestdata.no>, 2001.
+# Stig E Sandø <stig@ii.uib.no>, 2002.
+# Geir Helland <pjallabais@users.sourceforge.net>, 2004
+# Johnny A. Solbu <johnny@solbu.net>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.9.99pre0\n"
+"Project-Id-Version: nano 2.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2006-10-16 23:09+0200\n"
-"Last-Translator: Geir Helland <pjallabais@users.sourceforge.net>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2014-07-18 20:37+0100\n"
+"Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
-msgstr "Gå til katalog"
+msgstr "GÃ¥ til katalog"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Avbrutt"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
-msgstr "Kan ikke gå utenfor %s i begrenset modus"
+msgstr "Kan ikke gå utenfor %s i begrenset modus"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
-msgstr "Lesefeil på %s: %s"
+msgstr "Lesefeil på %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Kan ikke bevege seg opp en katalog"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(kat)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(foreldrekatalog)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
-msgstr "Søk"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Ta hensyn til store/små bokstaver]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Regulært uttrykk]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Bakover]"
+msgstr "Søk"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
-msgstr "Søket gikk rundt"
+msgstr "Søket gikk rundt"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Dette er eneste forekomst"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
-msgstr "Tomt søkemønster"
+msgstr "Tomt søkemønster"
+
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr "Kan ikke fastslå identiteten min for låsefil (getpwuid() mislyktes)"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Finner ikke ut vertsnavnet for låsefilen: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Feil ved skriving til låssfil %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Feil ved sletting av låsefil %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Feil ved åpning av låsefil %s: %s"
 
-#: src/files.c:125
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "Feil ved lesing av låsefil %s: Ikke nok data lest"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Feil ved skriving til låssfil: Mappen «%s» finnes ikke"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kan ikke sette inn fil fra utsiden av %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
-msgstr "Ikke flere åpne filbuffer"
+msgstr "Ikke flere åpne filbuffer"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Byttet til %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Ny buffer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Leste %lu linje (Konvertert fra DOS og Mac-format)"
 msgstr[1] "Leste %lu linjer (Konvertert fra DOS og Mac-format)"
 
-#: src/files.c:638
-#, fuzzy, c-format
+#: src/files.c:879
+#, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
 "permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
 "permission)"
-msgstr[0] "Leste %lu linje (Konvertert fra DOS og Mac-format)"
-msgstr[1] "Leste %lu linjer (Konvertert fra DOS og Mac-format)"
+msgstr[0] ""
+"Leste %lu linje (Konvertert fra DOS og Mac-format - Advarsel: Ingen "
+"skrivetilgang)"
+msgstr[1] ""
+"Leste %lu linjer (Konvertert fra DOS og Mac-format - Advarsel: Ingen "
+"skrivetilgang)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Leste %lu linje (Konvertert fra Mac-format)"
 msgstr[1] "Leste %lu linjer (Konvertert fra Mac-format)"
 
-#: src/files.c:648
-#, fuzzy, c-format
+#: src/files.c:889
+#, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "Leste %lu linje (Konvertert fra Mac-format)"
-msgstr[1] "Leste %lu linjer (Konvertert fra Mac-format)"
+msgstr[0] ""
+"Leste %lu linje (Konvertert fra Mac-format - Advarsel: Ingen skrivetilgang)"
+msgstr[1] ""
+"Leste %lu linjer (Konvertert fra Mac-format - Advarsel: Ingen skrivetilgang)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Leste %lu linje (Konvertert fra DOS-format)"
 msgstr[1] "Leste %lu linjer (Konvertert fra DOS-format)"
 
-#: src/files.c:658
-#, fuzzy, c-format
+#: src/files.c:899
+#, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "Leste %lu linje (Konvertert fra DOS-format)"
-msgstr[1] "Leste %lu linjer (Konvertert fra DOS-format)"
+msgstr[0] ""
+"Leste %lu linje (Konvertert fra DOS-format - Advarsel: Ingen skrivetilgang)"
+msgstr[1] ""
+"Leste %lu linjer (Konvertert fra DOS-format - Advarsel: Ingen skrivetilgang)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Leste %lu linje"
 msgstr[1] "Leste %lu linjer"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Les %lu linje (Advarsel: Ingen skrivetilgang)"
+msgstr[1] "Les %lu linjer (Advarsel: Ingen skrivetilgang)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Leser fil"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Ny fil"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
-msgstr "\"%s\" ikke funnet"
+msgstr "«%s» ikke funnet"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
-msgstr "\"%s\" er en katalog"
+msgstr "«%s» er en katalog"
 
 # "enhet" = "device", kanskje, men det er litt forvirrande
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
-msgstr "\"%s\" er en enhetsfil (device)"
+msgstr "«%s» er en enhetsfil (device)"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
-msgstr "Kommando som skal kjøres i nytt buffer [fra %s] "
+msgstr "Kommando som skal kjøres i nytt buffer [fra %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
-msgstr "Kommando som skal kjøres [fra %s] "
+msgstr "Kommando som skal kjøres [fra %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fil som skal settes inn [fra %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fil som skal settes inn [fra %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tasten er ugyldig utenfor multibuffer-modus"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"Klarte ikke å skrive backup fil, fortsette å lagre? (Si N hvis du er usikker)"
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan ikke skrive utenfor %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 "Kan ikke prependere eller appendere til en symbolsk lenke med --nofollow satt"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
-#, fuzzy, c-format
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
+#, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Feil ved skriving til midlertidlig fil: %s"
+msgstr "Feil ved skriving av backup-fil %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "For mange sikkerhetskopier?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Skrivefeil %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Feil ved skriving til midlertidlig fil: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Skrev %lu linje"
 msgstr[1] "Skrev %lu linjer"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS Format]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
-msgstr " {Mac Format]"
+msgstr " [Mac Format]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Sikkerhetskopi]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
-msgstr "Legg til valgt område først i fil"
+msgstr "Legg til valgt område først i fil"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "Legg til valgt område sist i fil"
+msgstr "Legg til valgt område sist i fil"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
-msgstr "Skriv valgt område til fil"
+msgstr "Skriv valgt område til fil"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
-msgstr "Filnavn det skal legges til på slutten av"
+msgstr "Filnavn det skal legges til på slutten av"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
-msgstr "Filnavn det skal legges til først i"
+msgstr "Filnavn det skal legges til først i"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Filnavn som skal skrives til"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Filen finnes, SKRIVE OVER ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Lagre filen under et ANNET NAVN ? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
+msgstr "Filen ble endret etter at du åpnet den, fortsette å lagre?"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(mer)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Trykk linjeskift for å fortsette oppstarten av nano\n"
+"Trykk linjeskift for å fortsette\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Erstatt"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Kan ikke opprette mappe %s: %s\n"
+"Det er nødvendig for lagring/lasting av søkehistorikk eller "
+"markørposisjoner\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Ikke erstatt"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"Stien %s er ikke en katalog, det må det være.\n"
+"Nano vil være ute av stand til å laste eller lagre søk- eller "
+"markørposisjonhistorikk\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Følsomt for store/små bokstavar"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Oppdaget en eldre nano historiefil (%s) som jeg prøvde å flytte\n"
+"til den ønskede plasseringen (%s), men oppdaget en feil: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Bakover"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Oppdaget en eldre nano historiefil (%s) som jeg flyttet\n"
+"til den ønskede plasseringen (%s)\n"
+"(se nano FAQ om denne endringen)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Regulært uttrykk"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Avslutt"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "ForrigeHistorie"
+#: src/global.c:478
+msgid "Close"
+msgstr "Lukk"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "NesteHistorie"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Angre «klipp ut»"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Gå til tekst"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Avjuster"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Finn neste"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Første fil"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Siste fil"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Til filer"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS Format"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac Format"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Legg til etter"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Legg til før"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Sikkerhetskopi"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Eksekver kommando"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Gå til katalog"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Hjelp"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Avslutt"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Finn"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Forrige side"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Erstatt"
 
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Neste side"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "GÃ¥ til linje"
 
-#: src/global.c:485
-msgid "First Line"
-msgstr "Første linje"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Forrige side"
 
-#: src/global.c:486
-msgid "Last Line"
+#: src/global.c:496
+msgid "Next Line"
 msgstr "Siste linje"
 
-#: src/global.c:487
-#, fuzzy
-msgid "Suspend"
-msgstr "Legg i bakgrunnen"
-
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Avsn. start"
-
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Avsn. slutt"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Les fil"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "JusterAlt"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Oppfrisk"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Sett inn fil"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Gå til linje"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Juster gjeldende avsnitt"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Avbryt gjeldende funksjon"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Vis denne hjelpeteksten"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Lukk gjeldende filbuffer/ Avslutt nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Avslutt nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
-msgstr "Lagre nåværende fil"
+msgstr "Lagre nåværende fil"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Sett inn en annen fil i denne"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "Søk etter streng eller regulært uttrykk"
+msgstr "Søk etter streng eller regulært uttrykk"
 
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Gå til forrige skjerm"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Søk etter streng"
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Gå til neste skjerm"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "GÃ¥ en skjerm opp"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "GÃ¥ en skjerm ned"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Klipp denne linjen og lagre den i klippebufferet"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Sett inn klippebufferet her"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Vis pekerposisjon"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Start stavesjekk, dersom tilgjengelig"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "Erstatt streng eller regulært uttrykk"
+msgstr "Erstatt streng eller regulært uttrykk"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
-msgstr "Gå til linje- og kolonnenummer"
+msgstr "GÃ¥ til linje- og kolonnenummer"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Marker teksten ved markøren"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Marker tekst fra markørposisjonen"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr "Gjenta siste søk"
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Gjenta siste søk"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Kopier gjeldende linje og lagre i utklippstavlen"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Indenter gjeldende linje"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Fjern indentering fra gjeldende linje"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr ""
+msgstr "Angre siste handling"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "Gjør om siste angre-operasjon"
 
-#: src/global.c:543
-#, fuzzy
+#: src/global.c:550
 msgid "Go forward one character"
-msgstr "Ett tegn frem"
+msgstr "GÃ¥ tett tegn frem"
 
-#: src/global.c:544
-#, fuzzy
+#: src/global.c:551
 msgid "Go back one character"
-msgstr "Ett tegn tilbake"
+msgstr "GÃ¥ ett tegn tilbake"
 
-#: src/global.c:546
-#, fuzzy
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "Til neste ord"
+msgstr "GÃ¥ til neste ord"
 
-#: src/global.c:547
-#, fuzzy
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "Til forrige ord"
+msgstr "GÃ¥ til forrige ord"
 
-#: src/global.c:549
-#, fuzzy
+#: src/global.c:556
 msgid "Go to previous line"
-msgstr "Til forrige linje"
+msgstr "GÃ¥ til forrige linje"
 
-#: src/global.c:550
-#, fuzzy
+#: src/global.c:557
 msgid "Go to next line"
-msgstr "Til neste linje"
+msgstr "GÃ¥ til neste linje"
 
-#: src/global.c:551
-#, fuzzy
+#: src/global.c:558
 msgid "Go to beginning of current line"
-msgstr "Til begynnelsen av linjen"
+msgstr "GÃ¥ til begynnelsen av linjen"
 
-#: src/global.c:552
-#, fuzzy
+#: src/global.c:559
 msgid "Go to end of current line"
-msgstr "Flytt til slutten av linjen"
+msgstr "GÃ¥ til slutten av linjen"
 
-#: src/global.c:555
-#, fuzzy
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "Til begynnelsen av gjeldende avsnitt"
+msgstr "GÃ¥ til begynnelsen av avsnittet, deretter forrige avsnitt"
 
-#: src/global.c:557
-#, fuzzy
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Til slutten av gjeldende avsnitt"
+msgstr "GÃ¥ akkurat utenfor slutten av avsnittet, deretter neste avsnitt"
 
-#: src/global.c:560
-#, fuzzy
+#: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "Til første linje i filen"
+msgstr "Gå til første linje i filen"
 
-#: src/global.c:562
-#, fuzzy
+#: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "Til siste linje i filen"
+msgstr "GÃ¥ til siste linje i filen"
 
-#: src/global.c:564
-#, fuzzy
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "Til samsvarende klamme"
+msgstr "GÃ¥ til matchende brakett"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr "Rull opp en linje uten å flytte markøren"
+msgstr "Rull opp en linje uten å flytte markøren"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr "Rull ned en linje uten å flytte markøren"
+msgstr "Rull ned en linje uten å flytte markøren"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Bytt til forrige buffer"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Bytt til neste buffer"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Sett inn ett og ett tegn"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "Sett inn tabulatortegn ved markøren"
+msgstr "Sett inn tabulatortegn ved markøren"
 
 #: src/global.c:581
 msgid "Insert a newline at the cursor position"
-msgstr "Sett inn et linjeskift ved markøren"
+msgstr "Sett inn et linjeskift ved markøren"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Slett tegnet under peker"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Slett tegnet til venstre for peker"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Kutt fra markøren til slutten av filen"
+msgstr "Kutt fra markøren til slutten av filen"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Juster hele filen"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Tell antall ord, linjer og tegn"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
-msgstr "Tegn skjermen på nytt"
+msgstr "Tegn skjermen på nytt"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "Suspender editoren (hvis suspender er aktivert)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr "Inverter valg for skille mellom små og store bokstaver i søk"
+msgstr "Inverter valg for skille mellom små og store bokstaver i søk"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "Reverser søkeretning"
+msgstr "Reverser søkeretning"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
-msgstr "Regulære uttrykk av/på"
+msgstr "Regulære uttrykk av/på"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "Hent tilbake forrige søk-/erstatt tekst"
+msgstr "Hent tilbake forrige søk-/erstatt tekst"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "Hent tilbake neste søk-/erstatt tekst"
+msgstr "Hent tilbake neste søk-/erstatt tekst"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
-msgstr "Gå til fil-leser"
+msgstr "GÃ¥ til fil-leser"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "DOS filformat av/på"
+msgstr "DOS filformat av/på"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "Mac filformat av/på"
+msgstr "Mac filformat av/på"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Inverter valg for appendering"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Inverter valg for prependering"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Inverter valg for sikkerhetskopi av orginalfil"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Eksekver ekstern kommando"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "Bruk nytt buffer av/på"
+msgstr "Bruk nytt buffer av/på"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
-msgstr "Gå ut av fil-leser"
+msgstr "GÃ¥ ut av fil-leser"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
-msgstr "Gå til første linje i listen"
+msgstr "Gå til første linje i listen"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
-msgstr "Gå til siste linje i listen"
+msgstr "GÃ¥ til siste linje i listen"
 
-#: src/global.c:641
-#, fuzzy
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "GÃ¥ til forrige fil i listen"
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "Gå til siste linje i listen"
+msgstr "GÃ¥ til neste fil i listen"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "GÃ¥ til katalog"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Start linter, hvis tilgjengelig"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "GÃ¥ til forrige lintermelding"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "GÃ¥ til neste lintermelding"
 
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Gå til første linje i listen"
+msgid "Invoke formatter, if available"
+msgstr "Start linter, hvis tilgjengelig"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Gå til katalog"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Hjelp"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Lukk"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Avbryt"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Lagre"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "GÃ¥ til katalog"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Klipp ut"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Juster"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Les fil"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Staving"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Klipp ut"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Til linter"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Avjuster"
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS Format"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Følsomt for store/små bokstavar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Angre \"klipp ut\""
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Regulært uttrykk"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Bakover"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Ikke erstatt"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Posisjon"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Staving"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Forrige side"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Neste side"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Første linje"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Siste linje"
 
-#: src/global.c:771
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Til klamme"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Marker tekst"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Kopier tekst"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
-msgstr "Indenter"
+msgstr "Rykk inn tekst"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "Angre \"indenter\""
+msgstr "Angre «innrykk»"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
-msgstr ""
+msgstr "Angre"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
-msgstr ""
-
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Fremover"
+msgstr "Gjør om"
 
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Bakover"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Neste ord"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Fremover"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Forrige ord"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Forrige side"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Siste linje"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Neste ord"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Hjem"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Bunn"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Finn den andre klammen"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Avsn. start"
 
-#: src/global.c:848
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Avsn. slutt"
+
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Rull opp"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Rull ned"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "Forrige fil"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Neste fil"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Legg inn ord for ord"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Ordrett"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Slett"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Slettetast"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "Kutt Til Slutt"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Antall ord"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Suspender"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "ForrigeHistorie"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "NesteHistorie"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "GÃ¥ til tekst"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS Format"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac Format"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Legg til etter"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Legg til før"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Sikkerhetskopi"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Eksekver kommando"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Til filer"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Første fil"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Siste fil"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Forrige Lint-melding"
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "Neste Lint-melding"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Hjelp-modus"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
-msgstr "Lås markørposisjon"
+msgstr "Lås markørposisjon"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Bruk mer plass til editering"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Jevn tekstrulling"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Myk bryting av lange linjer"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Vis usynlige tegn (mellomrom, tab, linjeskift osv.)"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Fremhev syntaks ved hjelp av farger"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Smart home tast"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Automatisk indentering"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Klipp til slutten"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Automatisk linjeskift"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Hard bryting av lange linjer"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konverter tabulator til mellomslag"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Sikkerhetskopier"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Flere filbuffere"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
-msgstr "Musestøtte"
+msgstr "Musestøtte"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Ingen konvertering fra DOS/Mac format"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Legg i bakgrunnen"
 
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Automatisk linjeskift"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -991,16 +1078,16 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"Søkekommando hjelpetekst\n"
+"Søkekommando hjelpetekst\n"
 "\n"
-" Skriv inn ord eller tegn du ønsker å søke etter og trykk linjskift. Dersom "
-"søketeksten forekommer i teksten vil skjermen oppdateres og markøren flyttes "
-"til den første forekomsten.\n"
+" Skriv inn ord eller tegn du ønsker å søke etter og trykk linjskift. Dersom "
+"søketeksten forekommer i teksten vil skjermen oppdateres og markøren flyttes "
+"til den første forekomsten.\n"
 "\n"
-"Forrige søketekst vises i braketter etter søkepromptet. Trykk linjeskift "
-"uten å skrive inn ny søketekst for å gjenta forrige søk."
+"Forrige søketekst vises i braketter etter søkepromptet. Trykk linjeskift "
+"uten å skrive inn ny søketekst for å gjenta forrige søk."
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1008,12 +1095,12 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
-"Dersom du har valgt tekst med merket og så valgt søk og erstatt, så vil kun "
+"Dersom du har valgt tekst med merket og så valgt søk og erstatt, så vil kun "
 "treff i den markerte teksten bli erstattet.\n"
 "\n"
-"Følgende funksjonstaster er tilgjengelig i Søkemodus:\n"
+"Følgende funksjonstaster er tilgjengelig i Søkemodus:\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1024,16 +1111,16 @@ msgid ""
 " The following function keys are available in Go To Line mode:\n"
 "\n"
 msgstr ""
-"Gå Til Linje hjelpetekst\n"
+"GÃ¥ Til Linje hjelpetekst\n"
 "\n"
-"Skriv inn linjenummere du ønsker å gå til og trykk linjeskift. Dersom det er "
-"færre linjer enn nummeret du angav vil du flyttes til den siste linjen i "
+"Skriv inn linjenummere du ønsker å gå til og trykk linjeskift. Dersom det er "
+"færre linjer enn nummeret du angav vil du flyttes til den siste linjen i "
 "filen.\n"
 "\n"
-"Følgende funksjonstaster er tilgjengelig i Gå Til Linje modus:\n"
+"Følgende funksjonstaster er tilgjengelig i Gå Til Linje modus:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1047,15 +1134,15 @@ msgid ""
 msgstr ""
 "Hjelp til sett inn fil\n"
 "\n"
-"Skriv inn navnet på filen som skal settes inn ved markøren i det gjeldende "
+"Skriv inn navnet på filen som skal settes inn ved markøren i det gjeldende "
 "bufferet.\n"
 "\n"
-"Dersom du har kompilert nano med støtte for flere filbuffer, og aktivisert "
-"dette med -F eller --multibuffer kommandolinjeflagget, Meta-F av/på bryteren "
+"Dersom du har kompilert nano med støtte for flere filbuffer, og aktivisert "
+"dette med -F eller --multibuffer kommandolinjeflagget, Meta-F av/på bryteren "
 "eller i nanorc filen vil filen som settes inn lastes i et eget buffer. Bruk "
-"Meta-< og > til å bytte mellom buffer."
+"Meta-< og > til å bytte mellom buffer."
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1063,13 +1150,13 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
-"Dersom du trenger et nytt blankt buffer må du enten la være å skrive inn noe "
-"filnavn, eller skrive inn navnet på en fil som ikke eksisterer før du "
+"Dersom du trenger et nytt blankt buffer må du enten la være å skrive inn noe "
+"filnavn, eller skrive inn navnet på en fil som ikke eksisterer før du "
 "trykker Linjeskift.\n"
 "\n"
-" Følgende funksjonstaster er tilgjengelig i Sett Inn Fil modus.\n"
+" Følgende funksjonstaster er tilgjengelig i Sett Inn Fil modus.\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1086,16 +1173,16 @@ msgid ""
 msgstr ""
 "Hjelpetekst til Lagre Fil\n"
 "\n"
-"Skriv inn navnet du ønsker å lagre gjeldende fil med, og trykk linjeskift.\n"
+"Skriv inn navnet du ønsker å lagre gjeldende fil med, og trykk linjeskift.\n"
 "\n"
-"Dersom du har markert tekst i bufferet vil du få spørsmål om du kun ønsker å "
-"lagre denne delen til en egen til. For å redusere sjansen for å overskrive "
-"filen du arbeider med vil ikke det gamle filnavnet være forvalgt her.\n"
+"Dersom du har markert tekst i bufferet vil du få spørsmål om du kun ønsker å "
+"lagre denne delen til en egen til. For å redusere sjansen for å overskrive "
+"filen du arbeider med vil ikke det gamle filnavnet være forvalgt her.\n"
 "\n"
-"Følgende funksjonstaster er tilgjengelig i Lagre Fil modus:\n"
+"Følgende funksjonstaster er tilgjengelig i Lagre Fil modus:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1112,14 +1199,14 @@ msgstr ""
 "\n"
 "Med fil-leseren kan du se igjennom katalogstrukturen og velge en fil\n"
 "for lesing eller skriving. Du kan bruke piltastene eller Page Up/Down\n"
-"for å se igjennom filer, og S eller Linjeskift for å velge den angitte\n"
-"filen eller katalogen. For å flytte deg opp et nivå velger du\n"
-"katalogen kalt \\\"..\\\" øverst i fillisten.\n"
+"for å se igjennom filer, og S eller Linjeskift for å velge den angitte\n"
+"filen eller katalogen. For å flytte deg opp et nivå velger du\n"
+"katalogen kalt «..» øverst i fillisten.\n"
 "\n"
-"Følgende funksjonstaster er tilgjengelig i fil-leseren: \n"
+"Følgende funksjonstaster er tilgjengelig i fil-leseren: \n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1132,24 +1219,24 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"Søkekommando hjelpetekst\n"
+"Søkekommando hjelpetekst\n"
 "\n"
-" Skriv inn ord eller tegn du ønsker å søke etter og trykk linjskift. Dersom "
-"søketeksten forekommer i teksten vil skjermen oppdateres og markøren flyttes "
-"til den første forekomsten.\n"
+" Skriv inn ord eller tegn du ønsker å søke etter og trykk linjskift. Dersom "
+"søketeksten forekommer i teksten vil skjermen oppdateres og markøren flyttes "
+"til den første forekomsten.\n"
 "\n"
-"Forrige søketekst vises i braketter etter søkepromptet. Trykk linjeskift "
-"uten å skrive inn ny søketekst for å gjenta forrige søk.\n"
+"Forrige søketekst vises i braketter etter søkepromptet. Trykk linjeskift "
+"uten å skrive inn ny søketekst for å gjenta forrige søk.\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-"Følgende funksjontaster er tilgjengelig i søkemodus:\\\n"
+"Følgende funksjontaster er tilgjengelig i søkemodus:\\\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1161,16 +1248,16 @@ msgid ""
 " The following function keys are available in Browser Go To Directory mode:\n"
 "\n"
 msgstr ""
-"Gå til Dir hjelpetekst\n"
+"GÃ¥ til Dir hjelpetekst\n"
 "\n"
-"Skriv inn stien til katalogen du vil se på.\n"
+"Skriv inn stien til katalogen du vil se på.\n"
 "\n"
 "Dersom tabulator-komplementasjon ikke er deaktivert kan du bruke tab-tasten\n"
-"til å (forsøke å) automatisk fullføre katalognavnet.\n"
+"til å (forsøke å) automatisk fullføre katalognavnet.\n"
 "\n"
-"Følgende funksjonstaster er definert for Gå til Dir modus:\n"
+"Følgende funksjonstaster er definert for Gå til Dir modus:\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1185,17 +1272,16 @@ msgid ""
 msgstr ""
 "Stavekontroll hjelpetekts\n"
 "\n"
-"Stavekontrollen går igjennom all tekst i gjeldende filbuffer. Når den kommer "
+"Stavekontrollen går igjennom all tekst i gjeldende filbuffer. Når den kommer "
 "over et ukjent ord vil dette utheves og en erstattning kan skrives inn. Den "
-"vil så spørre deg om du ønsker å erstatte alle forekomster av det "
+"vil så spørre deg om du ønsker å erstatte alle forekomster av det "
 "feilstavede ordet i filen, eller om du har markert et utvalg av teksten, i "
 "den utvalgte teksten.\n"
 "\n"
-"Følgende funksjonstaster er definert for stavekontroll modus:\n"
+"Følgende funksjonstaster er definert for stavekontroll modus:\n"
 "\n"
 
-#: src/help.c:343
-#, fuzzy
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1206,18 +1292,16 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-"Hjelpetekst til Ekstern Kommando\n"
+"Hjelpetekst til Kjør Kommando\n"
 "\n"
-"Denne menyen lar deg sette resultatet (STDOUT) av kommandoer kjørt i "
-"skallet\n"
-"inn i gjeldende filbuffer (eller i et nytt buffer i multibuffer modus). "
-"Dersom du vil ha et nytt buffer skriver du ikke inn noen kommando, bare "
-"trykk linjeskift.\n"
+"Denne modusen lar deg sette inn resultatet (STDUT) av kommandoer kjørt i "
+"skallet inn i gjeldende filbuffer (eller i en ny buffer i multibuffer-"
+"modus). Dersom du vil ha en ny buffer skriver du ikke inn noen kommando.\n"
 "\n"
-"Følgende funksjonstaster er definert for Ekstern Kommando modus:\n"
+"Følgende funksjonstaster er definert for Kjør Kommando-modus:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1230,17 +1314,17 @@ msgid ""
 msgstr ""
 " Nano hjelpetekst\n"
 "\n"
-" Nano tekstredigeringsprogram er designet for å etterligne funksjonaliteten "
-"og bruksmåten for universitetet i Washington sitt Pico-program.  Der er fire "
-"hovedområder i dette programmet: Den øverste linjen viser versjonsnummeret "
-"og navnet på filen som blir redigert. Nedenfor er hovedvinduet som viser "
+" Nano tekstredigeringsprogram er designet for å etterligne funksjonaliteten "
+"og bruksmåten for universitetet i Washington sitt Pico-program.  Der er fire "
+"hovedområder i dette programmet: Den øverste linjen viser versjonsnummeret "
+"og navnet på filen som blir redigert. Nedenfor er hovedvinduet som viser "
 "filen som blir endret. Status-linja er den 3. linjen nedenfra og viser "
 "viktige meldinger. De to nederste linjene viser de vanligste snarveiene i "
 "programmet.\n"
 "\n"
 " "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1254,12 +1338,12 @@ msgstr ""
 "programmet.\n"
 "\n"
 "Notasjonen for snarveier er: Kontroll-tast sekvenser vises her som Caret (^) "
-"symbolet. Det legges inn enten ved å bruke Kontroll-tasten, eller ved å "
+"symbolet. Det legges inn enten ved å bruke Kontroll-tasten, eller ved å "
 "trykke Escape (Esc) tasten to ganger. Escape-tast sekvenser vises som Meta "
 "(M) symbolet og kan legges inn med enten Esc, Alt eller Meta tasten, "
 "avhengig av hvordan tastaturoppsettet ditt er."
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1267,20 +1351,20 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
-"I tillegg kan man legge inn tegn ved å trykke Esc to ganger og så skrive inn "
-"en tretalls desimalkode mellom 000 og 255. Følgende kastetrykk er "
+"I tillegg kan man legge inn tegn ved å trykke Esc to ganger og så skrive inn "
+"en tretalls desimalkode mellom 000 og 255. Følgende kastetrykk er "
 "tilgjengelig i hovedvinduet. Alternative taster viss i parantes:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
-msgstr "skru på/av"
+msgstr "skru på/av"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Tasten er ikke gyldig i visninsmodus"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1289,7 +1373,7 @@ msgstr ""
 "\n"
 "Buffer lagret til %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1298,7 +1382,7 @@ msgstr ""
 "\n"
 "Buffer ble ikke lagret til %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1307,11 +1391,11 @@ msgstr ""
 "\n"
 "Buffer ikkr lagret: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Vinduet er for lite for Nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1320,252 +1404,257 @@ msgstr ""
 "Bruk: nano [valg] [[+LINJE,KOLONNE] FIL]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Valg\t\tGNU lang brukervalg\t\tBetydning\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opsjon\t\tBetydning\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Vis denne meldingen"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+LINJE,KOLONNE"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
-msgstr "Start på linje nummer LINJE, kolonne KOLONNE"
+msgstr "Start på linje nummer LINJE, kolonne KOLONNE"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Aktiver smart home tast"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Ta sikkerhetskopier av eksisterende filer"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <kat>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<kat>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Katalog for lagring av unike sikkerhetskopier"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Bruk fet, ikke invertert tekst"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Konverter skrevne tabulatorer til mellomslag"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
-msgstr "Muliggjør flere filbuffere"
+msgstr "Muliggjør flere filbuffere"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Bruk (vim-stil) låsefiler"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "Logg og les historie med Søk/Erstatt tekster"
+msgstr "Logg og les historie med Søk/Erstatt tekster"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
-msgstr "Ikke se på nanorc filer"
+msgstr "Ikke se på nanorc filer"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Fiks forvirringen rundt numerisk tastatus"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Legg ikke til linjeskift sist i filer"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Ikke konverter filer fra DOS/Mac format"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Bruk en ekstra linje til tekstbehandling"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Logg og les plasseringen av markøren"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <tekst>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<tekst>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Kvoteringtekst"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Begrenset modus"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "Bla etter linje i stedet for halvskjerm"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#kolonner>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#kolonner>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
-msgstr "Sett bredden på en tab til # kolonner"
+msgstr "Sett bredden på en tab til # kolonner"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Bruk hurtig blanking av statuslinjen"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Skriv versjonsnummeret og avslutt"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
-msgstr "Detekter ordskille mer nøyektig"
+msgstr "Detekter ordskille mer nøyektig"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <tekst>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<tekst>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Syntaksdefinisjon for fargekoding"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
-msgstr "Vis alltid markørposisjonen"
+msgstr "Vis alltid markørposisjonen"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Fiks forvirringen rundt Backspace/Delete"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Vis denne hjelpeteksten"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Indenter nye linjer automatisk"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "Kutt fra markøren til slutten av linjen"
+msgstr "Kutt fra markøren til slutten av linjen"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
-msgstr "Ikke følg symbolske linkar, skriv over"
+msgstr "Ikke følg symbolske linkar, skriv over"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
-msgstr "Aktiver musstøtte"
+msgstr "Aktiver musstøtte"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Ikke les filen (bare skriv den)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <kat>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatiingdir=<kat>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Sett gjeldende katalog"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Behold XON (^Q) og XOFF (^S) tegn"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "Stille ignorere oppstartsproblemer som rc-filfeil"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#kolonner>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#kolonner>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Sett linjebryting på kolonne # kolonner"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Sett hard linjebryting ved kolonne # kolonner"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Bruk alternativt program for stavekontroll"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "Autolagre ved avslutning uten spørsmål"
+msgstr "Autolagre ved avslutning uten spørsmål"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Visninsgmodus (kun lesetilgang)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Ikke bryt lange linjer"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Ikke hardbryt lange linjer"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Ikke vis hjelpelinjene"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Tillat suspendering"
 
-#: src/nano.c:924
-#, fuzzy
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "Automatisk linjeskift"
-
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorert, for kompatibilitet med Pico)"
+msgstr "Aktiver myk linjebryting"
 
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr "GNU nano versjon %s (kompilert %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr "Epost: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1574,154 +1663,177 @@ msgstr ""
 "\n"
 " Kompilerte opsjoner:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
-msgstr "Beklager, støtte for denne funksjonen er deaktivert"
+msgstr "Beklager, støtte for denne funksjonen er deaktivert"
+
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Ingen filnavn"
 
-#: src/nano.c:1044
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Lagre endret buffer (\"No\" VIL MISTE ENDRINGENE) ? "
+msgstr "Lagre endret buffer («NEI» VIL ØDELEGGE ENDRINGENR) ? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "Kunne ikke gjenåpne standard inn fra tastaturet, beklager\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Leser fra standard inn, ^C for å avbryte\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Mottok SIGHUP eller SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Bruk \"fg\" for å returnere til nano\n"
+msgstr "Bruk «fg» for å returnere til nano\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
-msgstr "på"
+msgstr "på"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "av"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Ukjent kommando"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorert, mumle mumle."
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorert, mumle mumle."
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "Angitt tabulatorstørrels \"%s\" er ugyldig"
+msgstr "Angitt tabulatorstørrelse «%s» er ugyldig"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "Foreslått fyllbredden \"%s\" er ugyldig"
+msgstr "Foreslått fyllbredde «%s» er ugyldig"
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Skriv «%s -»' for en liste over tilgjengelige alternativer.\n"
 
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Nei"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
-msgstr "Feil i %s på linje %lu: "
+msgstr "Feil i %s på linje %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "Atrument '%s' har uterminert \""
+msgstr "Argument '%s' har en uterminert \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
-msgstr "Strenger med reguttrykk må begynne med et \" tegn"
+msgstr "Strenger med reg-uttrykk må begynne med et \"-tegn"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "Ugyldig reguttrykk \"%s\": %s"
+msgstr "Ugyldig reg-uttrykk «%s»: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Mangler syntaksnavn"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
-msgstr "Syntaksen \"none\" (ingen) er reservert"
+msgstr "Syntaksen «none» (ingen) er reservert"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
-msgstr "Syntaksen \"default\" (forvalgt) kan ikke ta utvidelser"
+msgstr "Syntaksen «default» (forvalgt) kan ikke ta utvidelser"
 
-#: src/rcfile.c:386 src/rcfile.c:483
-#, fuzzy
+#: src/rcfile.c:433
 msgid "Missing key name"
-msgstr "Mangler syntaksnavn"
+msgstr "Mangler tastenavn"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Tastenavnet er for kort"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr ""
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Tastebindinger må begynne med «^», «M», eller «F»"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr ""
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "Må spesifisere en funksjon å binde tasten til"
 
-#: src/rcfile.c:426
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr "Må spesifisere en meny (eller «alle») i å binde / frigi tasten"
+
+#: src/rcfile.c:489
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr ""
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Kunne ikke tilordne navn «%s» til en funksjon"
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Kunne ikke starte \"%s\""
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Kunne ikke tilordne navn «%s» til en meny"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Funksjon «%s» eksisterer ikke i meny «%s»"
+
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Beklager, tastekombinasjonen «%s» kan ikke rebindes"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Feil ved utviding %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1730,142 +1842,199 @@ msgid ""
 "\"black\", with the optional prefix \"bright\"\n"
 "for foreground colors."
 msgstr ""
-"Farge %s forstås ikke.\n"
-"Gyldige farger er \"green\" (grønn), \"red\" (rød),\n"
-"\"blue\" (blå), \"white\" (hvit), \"yellow\" (gul),\n"
-"\"cyan\" (turkis), \"magenta\" (fiolett) og \"black\"\n"
-"(sort), med valgfritt prefiks \"bright\" (lys)\n"
-"på forgrunnsfarver."
-
-#: src/rcfile.c:647
+"Farge %s forstås ikke.\n"
+"Gyldige farger er «green» (grønn), «red» (rød),\n"
+"«blue» (blå), «white» (hvit), «yellow» (gul),\n"
+"«cyan» (turkis), «magenta» (fiolett) og «black»\n"
+"(sort), med valgfritt prefiks «bright» (lys)\n"
+"på forgrunnsfarver."
+
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Kan ikke legge til et fargedirektiv uten en syntakskommando"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Mangler farvenavn"
 
-#: src/rcfile.c:672
+#: src/rcfile.c:709 src/rcfile.c:870
+msgid "Missing regex string"
+msgstr "Regulært uttrykk mangler"
+
+#: src/rcfile.c:785
+msgid "\"start=\" requires a corresponding \"end=\""
+msgstr "«start=» forutsetter et korresponderende «end=»"
+
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
-msgstr "Bakgrunnsfargen %s kan ikke være lys"
+msgstr "Bakgrunnsfargen %s kan ikke være lys"
 
-#: src/rcfile.c:690 src/rcfile.c:809
-msgid "Missing regex string"
-msgstr "Regulært uttrykk mangler"
+#: src/rcfile.c:865
+msgid "Cannot add a header regex without a syntax command"
+msgstr "Kan ikke legge til topptekst-regex uten syntakskommando"
 
-#: src/rcfile.c:762
-msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\"start= forutsetter et korresponderende \"end=\""
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Kan ikke legge til en magisk regulær-streng uten syntakskommando"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Mangler magisk strengnavn"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "Kan ikke legge til linter uten en syntakskommando"
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Mangler linter-kommando"
+
+#: src/rcfile.c:1010
 #, fuzzy
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Kan ikke legge til et fargedirektiv uten en syntakskommando"
+msgid "Cannot add formatter without a syntax command"
+msgstr "Kan ikke legge til linter uten en syntakskommando"
+
+#: src/rcfile.c:1015
+#, fuzzy
+msgid "Missing formatter command"
+msgstr "Mangler linter-kommando"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr ""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "Fatal feil: ingen taster kartlagt for funksjon «%s», avslutter.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
+"Hvis nødvendig, bruk nano med -I alternativ for å justere nanorc-"
+"innstillinger.\n"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Kunne ikke finne syntax «%s» å forlenge"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr "Kommandoen \"%s\" tillates ikke i inkludert fil"
+msgstr "Kommandoen «%s» tillates ikke i inkludert fil"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr "Syntaksen \"%s\" har ingen farvekommandoer"
+msgstr "Syntaksen «%s» har ingen fargekommandoer"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "kommando \"%s\" ikke forstått"
+msgstr "kommando «%s» ikke forstått"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
+#: src/rcfile.c:1186
+msgid "Missing option"
 msgstr "Mangler flagg"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "Valg \"%s\" krever et argument"
+msgstr "Valg «%s» krever et argument"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Brukervalget er ikke gyldig for flerbyte strenger"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
-msgstr "Må ha tegn som ikke er tabulator eller mellomslag"
+msgstr "MÃ¥ ha tegn som ikke er tabulator eller mellomslag"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "To enkelt-tegn kreves"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Kan ikke skru av flagget \"%s\""
+msgid "Cannot unset option \"%s\""
+msgstr "Kan ikke tilbakestille flagg «%s»"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Ukjent flagg \"%s\""
+msgid "Unknown option \"%s\""
+msgstr "Ukjent flagg «%s»"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Finner ikke hjemmekatalogen! Buhu!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Trykk linjeskift for å fortsette oppstarten av nano\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "\"%.*s%s\" ikke funnet"
+msgstr "«%.*s%s» ikke funnet"
+
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Ta hensyn til store/små bokstaver]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Regulært uttrykk]"
 
-#: src/search.c:205
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Bakover]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
-msgstr " (å erstatte) i seksjon"
+msgstr " (Ã¥ erstatte) i seksjon"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
-msgstr " (å erstatte)"
+msgstr " (Ã¥ erstatte)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Erstatt dette tilfellet?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Erstatt med"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Erstattet %lu tilfelle"
 msgstr[1] "Erstattet %lu tilfeller"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Skriv linjenummer, kolonnenummer"
 
-#: src/search.c:1061
-#, fuzzy
+#: src/search.c:1054
 msgid "Invalid line or column number"
-msgstr "Skriv linjenummer, kolonnenummer"
+msgstr "Ugyldig linje eller kolonnenummer"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ikke en klamme"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Ingen matchende klamme"
 
@@ -1877,227 +2046,326 @@ msgstr "Merke satt"
 msgid "Mark Unset"
 msgstr "Fjern merke"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "Ingenting i angrebuffer!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
-msgstr ""
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Intern feil: kan ikke matche linje %d. Vennligst lagre arbeidet ditt"
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
-msgstr ""
+msgstr "Legg til tekst"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
-msgstr "Neste fil"
+msgstr "slett tekst"
 
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Automatisk linjeskift"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
-msgstr ""
+msgstr "linjesammenføy"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
-msgstr ""
+msgstr "klipp tekst"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr ""
+msgstr "Angre «klipp ut»"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr ""
+msgstr "linjeskift"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
-msgstr "Siste linje"
+msgstr "sett inn tekst"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
-msgstr " (å erstatte)"
+msgstr "erstatt tekst"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr ""
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Intern feil: ukjent type. Vennligst lagre arbeidet ditt."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Angret handling (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "Ingenting å omgjøre"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
+"Intern feil: kan ikke sette opp Gjør om. Vennligst lagre arbeidet ditt."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Omgjorde handling (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Kunne ikke pipe"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Kunne ikke opprette pipe"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Kunne ikke forke"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
+"Intern feil: kan ikke sette opp «angre klipp ut». Vennligst lagre arbeidet "
+"ditt."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Ugyldig kvoteringstekst %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
-msgstr "Du kan nå avjustere!"
+msgstr "Du kan nå avjustere!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Rediger erstatning"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Kunne ikke opprette pipe"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Oppretter ordliste for feilstavelser, vennligst vent..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
-msgstr "Kunne ikke finne størrelse på pipe buffer"
+msgstr "Kunne ikke finne størrelse på pipe buffer"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
-msgstr "Feil ved start av \"ispell\""
+msgstr "Feil ved start av «ispell»"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
-msgstr "Feil ved start av \"sort -f\""
+msgstr "Feil ved start av zsort -f»"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
-msgstr "Feil ved start av \"uniq\""
+msgstr "Feil ved start av «uniq»"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
-msgstr "Stavekontroll fullført"
+msgstr "Stavekontroll fullført"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "Feil ved start av \"%s\""
+msgstr "Feil ved start av «%s»"
+
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Start stavesjekk, vennligst vent"
 
-#: src/text.c:2960
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavekontroll feilet: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavekontroll feilet: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Ingen linter definert for denne filtypen!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Lagre endret buffer før linting?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Starter linter, vennligst vent"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Fikk 0 maskinlesbare linjer fra kommando: %s"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr "Denne meldingen er for uåpnet fil %s, åpne den i en ny buffer?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Ved siste melding"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Ved første melding"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+#, fuzzy
+msgid "Invoking formatter, please wait"
+msgstr "Starter linter, vennligst vent"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sOrd: %lu Linjer: %ld Tegn: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "I seksjon:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Legg inn ord for ord"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano er tom for minne!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Unikode inndata"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Endret"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Vis"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "KAT: "
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Fil:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr "Advarsel: Endrer en fil som ikke er låst, sjekk katalogtillatelse?"
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "linje %ld/%ld (%d%%), kolonne %lu/%lu (%d%%), tegn %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Tekstbehandleren nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "versjon"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Brakt til deg av:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Mange takk til:"
 
 # Oversette dette ?
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
-msgstr "The Free Sofware Foundation"
+msgstr "The Free Software Foundation"
+
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
 
-#: src/winio.c:3497
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "For ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "og alle de andre vi glemte..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Takk for at du bruker nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Intern feil: kan ikke matche linje %ld. Vennligst lagre arbeidet ditt"
+
+#~ msgid "line wrap"
+#~ msgstr "linjebryting"
+
+#~ msgid "Insert File"
+#~ msgstr "Sett inn fil"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "GÃ¥ til forrige skjerm"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Finn den andre klammen"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Automatisk linjeskift"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Myk linjebryting"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Tillat generell angre [EKSPERIMENTELL]"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(ignorert, for kompatibilitet med Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Må spesifisere menyen å binde tasten til (eller «alt»"
+
+#~ msgid "Missing flag"
+#~ msgstr "Mangler flagg"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Intern feil: ukjent type. Vennligst lagre arbeidet ditt"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "Intern feil: Gjenta oppsett mislyktes. Vennligst lagre arbeidet ditt"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Kunne ikke pipe"
+
 #~ msgid "Space"
 #~ msgstr "Mellomrom"
 
 #~ msgid "Come on, be reasonable"
-#~ msgstr "Kom igjen, vær litt samarbeidsvillig"
+#~ msgstr "Kom igjen, vær litt samarbeidsvillig"
 
 #~ msgid "Direction"
 #~ msgstr "Retning"
@@ -2106,7 +2374,7 @@ msgstr "Takk for at du bruker nano!"
 #~ msgstr "Vis hjelpemenyen"
 
 #~ msgid "Search for text within the editor"
-#~ msgstr "Søk etter tekst"
+#~ msgstr "Søk etter tekst"
 
 #~ msgid "Replace text within the editor"
 #~ msgstr "Erstatt tekst i editoren"
@@ -2115,13 +2383,13 @@ msgstr "Takk for at du bruker nano!"
 #~ msgstr "Finn andre klamme"
 
 #~ msgid "Make the current search/replace case (in)sensitive"
-#~ msgstr "Gjør gjeldande søk uten å ta hensyn til store/små bokstavar"
+#~ msgstr "Gjør gjeldande søk uten å ta hensyn til store/små bokstavar"
 
 #~ msgid "Make the current search/replace go backwards"
-#~ msgstr "Gjør gjeldande søk mot begynnelsen av teksten"
+#~ msgstr "Gjør gjeldande søk mot begynnelsen av teksten"
 
 #~ msgid "Prepend to the current file"
-#~ msgstr "Legg til først i nåværende fil"
+#~ msgstr "Legg til først i nåværende fil"
 
 #~ msgid "Back up original file when saving"
 #~ msgstr "Ta sikkerhetskopi av orginalfil ved lagring"
@@ -2160,7 +2428,7 @@ msgstr "Takk for at du bruker nano!"
 #~ msgstr "Bruk mer plass til redigering"
 
 #~ msgid "Do regular expression searches"
-#~ msgstr "Tillat regulære uttrykk i søk"
+#~ msgstr "Tillat regulære uttrykk i søk"
 
 #~ msgid "Set fill cols to (wrap lines at) #cols"
 #~ msgstr "Bryt linjer ved posisjon #cols"
@@ -2168,8 +2436,5 @@ msgstr "Takk for at du bruker nano!"
 #~ msgid "Verbatim input"
 #~ msgstr "Legg inn ord for ord"
 
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "Kunne ikke oprette midlertidig fil: %s"
-
 #~ msgid "Refusing zero-length regex match"
 #~ msgstr "Nekter null-lengde regex treff"
diff --git a/po/nl.gmo b/po/nl.gmo
index 8067d6f..ed47033 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index 5ac381e..31aaca4 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,125 +1,157 @@
-# Dutch translations for nano.
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Dutch translations for GNU nano.
+# Copyright (C) 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 #
-# Guus Sliepen <guus@sliepen.eu.org>, 2003.
-# Reinout van Schouwen <reinout@cs.vu.nl>, 2005.
+# "Roses are red, violets are blue,
+# #NSA loves privacy rights and
+# absolutely everything about you."
+#
+# Benno Schulenberg <benno@vertaalt.nl>, 2005, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015.
 # Erwin Poeze <erwin.poeze@gmail.com>, 2009.
-# Benno Schulenberg <benno@vertaalt.nl>, 2005, 2006, 2007, 2008, 2010.
+# Reinout van Schouwen <reinout@cs.vu.nl>, 2005.
+# Guus Sliepen <guus@sliepen.eu.org>, 2003.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano-2.2.4pre2\n"
+"Project-Id-Version: nano-2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-04-09 20:25+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 11:06+0100\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Naar map"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Kan in beperkte modus niet buiten %s gaan"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Fout tijdens lezen van %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Kan niet naar bovenliggende map gaan"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(map)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(oudermap)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Zoeken"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Hoofdlettergevoelig]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Reg.exp.]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Achterwaarts]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Rondgelopen"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Dit is de enige overeenkomst"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Nog geen zoekpatroon bekend"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"Kan eigen identiteit niet bepalen (voor vergrendelingsbestand; getpwuid() is "
+"mislukt)"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Kan hostnaam voor vergrendelingsbestand niet bepalen: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Fout bij schrijven van vergrendelingsbestand %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Fout bij verwijderen van vergrendelingsbestand %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Fout bij openen van vergrendelingsbestand %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+"Fout tijdens lezen van vergrendelingsbestand %s: niet genoeg gegevens gelezen"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr "Bestand %s wordt al bewerkt (door %s met %s, PID %d); doorgaan?"
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Fout bij schrijven van vergrendelingsbestand: map %s bestaat niet"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kan bestand van buiten %s niet invoegen"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Geen andere open buffers"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Overgeschakeld naar %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Nieuwe buffer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "%lu regel gelezen (omgezet uit DOS- en Mac-indeling)"
 msgstr[1] "%lu regels gelezen (omgezet uit DOS- en Mac-indeling)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -134,14 +166,14 @@ msgstr[1] ""
 "%lu regels gelezen (omgezet uit DOS- en Mac-indeling - waarschuwing: geen "
 "schrijfrechten)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "%lu regel gelezen (omgezet uit Mac-indeling)"
 msgstr[1] "%lu regels gelezen (omgezet uit Mac-indeling)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -154,14 +186,14 @@ msgstr[1] ""
 "%lu regels gelezen (omgezet uit Mac-indeling - waarschuwing: geen "
 "schrijfrechten)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "%lu regel gelezen (omgezet uit DOS-indeling)"
 msgstr[1] "%lu regels gelezen (omgezet uit DOS-indeling)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -174,805 +206,874 @@ msgstr[1] ""
 "%lu regels gelezen (omgezet uit DOS-indeling - waarschuwing: geen "
 "schrijfrechten)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu regel gelezen"
 msgstr[1] "%lu regels gelezen"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] "%lu regel ingelezen (waarschuwing: geen schrijfrechten)"
 msgstr[1] "%lu regels ingelezen (waarschuwing: geen schrijfrechten)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Inlezen van bestand"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Nieuw bestand"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "'%s' is niet gevonden"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "'%s' is een map"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "'%s' is een apparaat"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "In nieuwe buffer uit te voeren opdracht [vanuit %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Uit te voeren opdracht [vanuit %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "In nieuwe buffer in te voegen bestand [vanuit %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "In te voegen bestand [vanuit %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "In Kijkmodus is deze toets alleen geldig in multibuffermodus"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr "Maken van reservekopie is mislukt; toch opslaan? (N als onzeker) "
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan buiten %s niets opslaan"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "Kan met '--nofollow' niet aan een symbolische koppeling toevoegen"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Fout tijdens schrijven van tijdelijk bestand %s: %s"
+msgstr "Fout tijdens schrijven van reservekopiebestand %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Te veel reservekopieën?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fout tijdens schrijven van %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Fout tijdens schrijven van tijdelijk bestand: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%lu regel geschreven"
 msgstr[1] "%lu regels geschreven"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS-indeling]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac-indeling]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Kopie maken]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Selectie toevoegen vooraan bestand"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Selectie toevoegen achteraan bestand"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Selectie opslaan in bestand"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Vooraan toevoegen aan bestand"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Achteraan toevoegen aan bestand"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Opslaan in bestand"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Bestand bestaat al; OVERSCHRIJVEN? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Bestand opslaan onder een ANDERE NAAM? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Bestand is gewijzigd na opening; doorgaan met opslaan? "
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(meer)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Druk op Enter om verder te gaan met het starten van nano.\n"
+"Druk op Enter om verder te gaan.\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Annuleren"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Vervangen"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Kan map %s niet aanmaken: %s\n"
+"Deze is vereist voor opslaan en inlezen van zoekgeschiedenis en "
+"cursorposities.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Zoeken"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"Pad %s is geen map maar moet dit zijn.\n"
+"Nano kan nu de zoekgeschiedenis en cursorposities niet opslaan noch "
+"inlezen.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Hfdlgevoelig"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Er werd een oud nano-geschiedenisbestand gevonden (%s);\n"
+"maar bij het verplaatsen ervan naar de voorkeurslocatie (%s)\n"
+"trad er een fout op: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Achterwaarts"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Er werd een oud nano-geschiedenisbestand gevonden (%s);\n"
+"deze is nu naar de voorkeurslocatie (%s) verplaatst.\n"
+"(Zie de nano-FAQ voor uitleg over deze verandering.)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Reg.exp."
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Afsluiten"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "Vorige"
+#: src/global.c:478
+msgid "Close"
+msgstr "Sluiten"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "Volgende"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Plakken"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Zoeken"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "onUitvullen"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Verderzoeken"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Naar top"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Naar eind"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Bestandenlijst"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS-indeling"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac-indeling"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Achtertoevoegen"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Voortoevoegen"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Reservekopie"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Opdracht uitvoeren"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Naar map..."
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Hulp"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Afsluiten"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Zoeken"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Blad terug"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Blad verder"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Naar top"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Vervangen"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Naar eind"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Naar regel..."
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Pauzeren"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Regel terug"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Beg.v.alinea"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Regel verder"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Eind v.alinea"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Inlezen"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "VolUitvullen"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Verversen"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Bestand invoegen"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Naar regel..."
-
-#: src/global.c:500
-msgid "Justify the current paragraph"
-msgstr "Huidige alinea uitvullen"
-
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:507
+msgid "Justify the current paragraph"
+msgstr "huidige alinea uitvullen"
+
+#: src/global.c:509
 msgid "Cancel the current function"
-msgstr "Huidige functie annuleren"
+msgstr "huidige functie annuleren"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
-msgstr "Deze hulptekst tonen"
+msgstr "deze hulptekst tonen en stoppen"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
-msgstr "Huidige buffer sluiten / Nano afsluiten"
+msgstr "huidige buffer sluiten / nano afsluiten"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
-msgstr "Nano afsluiten"
+msgstr "nano afsluiten"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
-msgstr "Huidige buffer op schijf opslaan"
+msgstr "huidige buffer op schijf opslaan"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
-msgstr "Een ander bestand in het huidige invoegen"
+msgstr "een ander bestand in het huidige invoegen"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "Tekst zoeken"
+msgstr "tekst zoeken (of een reguliere expressie)"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Een schermvol terugscrollen"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "deel van naam zoeken"
 
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "Een schermvol verderscrollen"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "een schermvol terugscrollen"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "een schermvol verderscrollen"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "Huidige regel knippen en bewaren in knipbuffer"
+msgstr "huidige regel knippen en bewaren in knipbuffer"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "Plakken vanuit knipbuffer naar de huidige regel"
+msgstr "plakken vanuit knipbuffer naar de huidige regel"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
-msgstr "Huidige cursorpositie tonen"
+msgstr "huidige cursorpositie tonen"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
-msgstr "Spellingscontrole oproepen (indien beschikbaar)"
+msgstr "spellingscontrole aanroepen (indien beschikbaar)"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "Tekst vervangen"
+msgstr "tekst vervangen (of een reguliere expressie)"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
-msgstr "Naar op te geven regelnummer en kolomnummer gaan"
+msgstr "naar op te geven regelnummer (en kolomnummer) gaan"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Tekst markeren vanaf huidige cursorpositie"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "tekst markeren vanaf huidige cursorpositie"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr "Laatste zoekactie herhalen"
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "laatste zoekactie herhalen"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Huidige regel kopiëren naar knipbuffer"
+msgstr "huidige regel kopiëren naar knipbuffer"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
-msgstr "Huidige regel laten inspringen"
+msgstr "huidige regel laten inspringen"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "Huidige regel laten terugspringen"
+msgstr "huidige regel laten terugspringen"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr "De laatste bewerking ongedaan maken"
+msgstr "de laatste bewerking ongedaan maken"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr "De laatst ongedaangemaakte bewerking herdoen"
+msgstr "de laatst ongedaangemaakte bewerking herdoen"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
-msgstr "Eén teken vooruit"
+msgstr "één teken vooruit"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
-msgstr "Eén teken achteruit"
+msgstr "één teken achteruit"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "Eén woord vooruit"
+msgstr "één woord vooruit"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "Eén woord achteruit"
+msgstr "één woord achteruit"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
-msgstr "Naar de voorgaande regel"
+msgstr "naar de voorgaande regel"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
-msgstr "Naar de volgende regel"
+msgstr "naar de volgende regel"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
-msgstr "Naar het begin van de huidige regel"
+msgstr "naar het begin van de huidige regel"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
-msgstr "Naar het eind van de huidige regel"
+msgstr "naar het eind van de huidige regel"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "Naar het begin van huidige alinea; daarna naar vorige"
+msgstr "naar het begin van huidige alinea; daarna naar vorige"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Naar het eind van huidige alinea; daarna naar volgende"
+msgstr "naar het eind van huidige alinea; daarna naar volgende"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "Naar de eerste regel (top) van het bestand"
+msgstr "naar de eerste regel (top) van het bestand"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "Naar de laatste regel (eind) van het bestand"
+msgstr "naar de laatste regel (eind) van het bestand"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "Naar bijbehorend haakje gaan"
+msgstr "naar bijbehorend haakje gaan"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr "Eén regel terugscrollen (cursor niet verplaatsen)"
+msgstr "één regel terugscrollen (cursor niet verplaatsen)"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr "Eén regel vooruitscrollen (cursor niet verplaatsen)"
+msgstr "één regel vooruitscrollen (cursor niet verplaatsen)"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
-msgstr "Naar voorgaande bestandsbuffer schakelen"
+msgstr "overschakelen naar voorgaande bestandsbuffer"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
-msgstr "Naar volgende bestandsbuffer schakelen"
+msgstr "overschakelen naar volgende bestandsbuffer"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr "Eerstvolgende toetsaanslag verbatim invoegen"
+msgstr "eerstvolgende toetsaanslag verbatim invoegen"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "Een tab invoegen op de cursorpositie"
+msgstr "een tab invoegen op de cursorpositie"
 
 #: src/global.c:581
 msgid "Insert a newline at the cursor position"
-msgstr "Een regeleinde invoegen op de cursorpositie"
+msgstr "een regeleinde invoegen op de cursorpositie"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
-msgstr "Het teken onder de cursor verwijderen"
+msgstr "het teken onder de cursor verwijderen"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
-msgstr "Het teken links van de cursor verwijderen"
+msgstr "het teken links van de cursor verwijderen"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "De hele rest van het bestand knippen (vanaf de cursor)"
+msgstr "de hele rest van het bestand knippen (vanaf de cursor)"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
-msgstr "Het gehele bestand uitvullen"
+msgstr "het gehele bestand uitvullen"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
-msgstr "Aantal woorden, regels en tekens in het bestand tellen"
+msgstr "aantal woorden, regels en tekens in het bestand tellen"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
-msgstr "Het scherm verversen (opnieuw tekenen)"
+msgstr "het scherm verversen (opnieuw tekenen)"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr "De editor laten pauzeren (indien ingeschakeld)"
+msgstr "de editor laten pauzeren (indien ingeschakeld)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr "Hoofdlettergevoeligheid aan-/uitzetten"
+msgstr "hoofdlettergevoeligheid aan-/uitzetten"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "De zoekrichting omdraaien"
+msgstr "de zoekrichting omdraaien"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
-msgstr "Gebruik van reguliere expressies aan-/uitzetten"
+msgstr "gebruik van reguliere expressies aan-/uitzetten"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "Vorige zoek-/vervangtekst oproepen"
+msgstr "eerdere zoek-/vervangtekst oproepen"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "Volgende zoek-/vervangtekst oproepen"
+msgstr "latere zoek-/vervangtekst oproepen"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
-msgstr "Bestandenlijst oproepen"
+msgstr "bestandenlijst oproepen"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "DOS-indeling aan-/uitzetten"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Mac-indeling aan-/uitzetten"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
-msgstr "Achteraantoevoegen aan-/uitzetten"
+msgstr "achteraantoevoegen aan-/uitzetten"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr "Vooraantoevoegen aan-/uitzetten"
+msgstr "vooraantoevoegen aan-/uitzetten"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
-msgstr "Maken van reservekopieën aan-/uitzetten"
+msgstr "maken van reservekopieën aan-/uitzetten"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
-msgstr "Externe opdracht uitvoeren"
+msgstr "externe opdracht uitvoeren"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "Gebruik van een nieuwe buffer aan-/uitzetten"
+msgstr "gebruik van een nieuwe buffer aan-/uitzetten"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
-msgstr "Bestandenlijst verlaten"
+msgstr "bestandenlijst verlaten"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
-msgstr "Naar het eerste bestand in de lijst gaan"
+msgstr "naar het eerste bestand in de lijst gaan"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
-msgstr "Naar het laatste bestand in de lijst gaan"
+msgstr "naar het laatste bestand in de lijst gaan"
 
-#: src/global.c:641
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "naar het vorige bestand in de lijst gaan"
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "Naar het volgende bestand in de lijst gaan"
+msgstr "naar het volgende bestand in de lijst gaan"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "naar een op te geven map gaan"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "een linter aanroepen (syntaxcontrole, indien beschikbaar)"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "naar de voorgaande lintermelding springen"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "naar de volgende lintermelding springen"
 
 #: src/global.c:642
-msgid "Go to the previous file in the list"
-msgstr "Naar het vorige bestand in de lijst gaan"
+msgid "Invoke formatter, if available"
+msgstr "een opmaakprogramma aanroepen (indien beschikbaar)"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Naar een op te geven map gaan"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Hulp"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Sluiten"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Annuleren"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Opslaan"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Naar map..."
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Knippen"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Uitvullen"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Inlezen"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Spelling"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Knippen"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Linter"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "onUitvullen"
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Opmaker"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Plakken"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Hfdlgevoelig"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Reg.exp."
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Achterwaarts"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Zoeken"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Positie"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Spelling"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Blad terug"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Blad verder"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Naar top"
 
-#: src/global.c:771
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Naar eind"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Naar haakje"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Markeren"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Kopiëren"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Inspringen"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Terugspringen"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Ongedaan maken"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Herdoen"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Vooruit"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Terug"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Woord verder"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Vooruit"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Woord terug"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Regel terug"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Regel verder"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Woord verder"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Begin"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Eind"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Naar bijbehorend haakje"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Beg.v.alinea"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Eind v.alinea"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Omhoog scrollen"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Omlaag scrollen"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "Vorig bestand"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Volgend bestand"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Verbatim invoer"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Verbatim"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
-msgstr "Verwijderen"
+msgstr "Delete"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "RestKnippen"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Woordentelling"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Pauzeren"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Eerdere"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Latere"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Zoeken"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS-indeling"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac-indeling"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Achtertoevoegen"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Voortoevoegen"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Reservekopie"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Opdracht uitvoeren"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Bestandenlijst"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Naar top"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Naar eind"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Vorige Lint"
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "Volgende Lint"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Hulpregels"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Voortdurende cursorpositieweergave"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Extra regel voor bewerkingsvenster"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Per regel scrollen"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Zachte terugloop van te lange regels"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Weergave van witruimte"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Syntaxaanduiding met kleuren"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Slimme Home-toets"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Automatisch inspringen"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
-msgstr "Knippen vanaf cursor"
+msgstr "Knippen vanaf cursor tot regeleinde"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Terugloop van lange regels"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Afbreking van lange regels"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Omzetting van getypte tabs naar spaties"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Reservekopieën maken"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Meerdere bestandsbuffers"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Muisondersteuning"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Geen omzetting uit DOS/Mac-indeling"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Proces-pauzering"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Zachte terugloop van lange regels"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -994,7 +1095,7 @@ msgstr ""
 "getoond: op Enter drukken zonder tekst in te voeren herhaalt deze vorige "
 "zoekopdracht.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1008,7 +1109,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Zoek/vervang'-modus:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1028,7 +1129,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Naar regel'-modus:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1051,7 +1152,7 @@ msgstr ""
 "aparte buffer geladen.  Gebruik dan Meta-< en > om tussen bestandsbuffers te "
 "schakelen.  "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1065,7 +1166,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestand invoegen'-modus:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1093,7 +1194,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestand opslaan'-modus:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1118,7 +1219,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestandenlijst'-modus:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1142,7 +1243,7 @@ msgstr ""
 "zoekopdracht.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1150,7 +1251,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Bestand zoeken'-modus:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1172,7 +1273,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Naar map'-modus:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1197,7 +1298,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Spellingscontrole'-modus:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1217,7 +1318,7 @@ msgstr ""
 " De volgende toetsen zijn beschikbaar in 'Externe opdracht'-modus:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1238,7 +1339,7 @@ msgstr ""
 "wordt.  De derde regel van onderen is de statusregel en toont belangrijke "
 "berichten.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1257,7 +1358,7 @@ msgstr ""
 "worden ingevoerd met Esc of Alt of Meta, afhankelijk van uw "
 "toetsenbordinstelling.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1272,15 +1373,15 @@ msgstr ""
 "(alternatieve toetscombinaties staan tussen haakjes):\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "aan-/uitzetten"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Toets is ongeldig in Kijkmodus"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1289,7 +1390,7 @@ msgstr ""
 "\n"
 "Buffer is geschreven naar %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1298,7 +1399,7 @@ msgstr ""
 "\n"
 "Buffer is niet geschreven naar %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1307,11 +1408,11 @@ msgstr ""
 "\n"
 "Buffer is niet geschreven: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Schermformaat is te klein voor nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1320,253 +1421,259 @@ msgstr ""
 "Gebruik:  nano [OPTIES] [[+REGEL[,KOLOM]] BESTAND]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Optie\t\tLange optie\t\t  Betekenis\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Optie\t\t  Betekenis\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "deze hulptekst tonen en stoppen"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+REGEL[,KOLOM]"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "op deze regel (en deze kolom) beginnen"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "slimme Home-toets inschakelen"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "van bestaand bestand reservekopie maken"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <map>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<map>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "map voor opslaan van reservekopieën"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "vet in plaats van invers gebruiken"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "getypte tabs omzetten naar spaties"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "meerdere bestandsbuffers aanzetten"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "vergrendelingsbestanden gebruiken (à la vim)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "zoek/vervangteksten bewaren en gebruiken"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "eventuele nanorc-bestanden negeren"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "toetsverwarring numeriek bordje oplossen"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "geen regeleindeteken toevoegen aan slot"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "bestand niet omzetten uit DOS/Mac-opmaak"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "bewerkingsvenster een beetje vergroten"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "cursorpositie opslaan en later herstellen"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <tekens>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<tekens>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "te herkennen aanhaaltekens"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "beperkte modus"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "per regel scrollen i.p.v. half scherm"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
-msgstr "-T <#kolommen>"
+msgstr "-T <getal>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=<#kolommen>"
+msgstr "--tabsize=<getal>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "te gebruiken tabbreedte"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "de statusregel snel wissen"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "programmaversie tonen en stoppen"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "woordgrenzen nauwkeuriger bepalen"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <naam>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<naam>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "te gebruiken syntax (voor kleuring)"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "cursorpositie voortdurend tonen"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Backspace/Delete-verwarring oplossen"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "deze hulptekst tonen en stoppen"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "automatisch inspringen van nieuwe regels"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "^K knipt vanaf cursor i.p.v. hele regel"
+msgstr "vanaf cursor knippen i.p.v. hele regel"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "symbolische koppelingen overschrijven"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "gebruik van de muis mogelijk maken"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "bestand niet lezen (alleen schrijven)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <map>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<map>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "deze werkmap gebruiken"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "XON- en XOFF-toetsen behouden (^Q en ^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "opstartproblemen zoals rc-fouten negeren"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
-msgstr "-r <#kolommen>"
+msgstr "-r <getal>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
-msgstr "--fill=<#kolommen>"
+msgstr "--fill=<getal>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
 msgstr "te gebruiken afbreek-/uitvulbreedte"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <programma>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<programma>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "deze spellingscontroleur gebruiken"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "automatisch opslaan bij afsluiten"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "ongedaanmaken toestaan (EXPERIMENTEEL)"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "kijkmodus (alleen lezen, geen bewerking)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
 msgstr "lange regels niet afbreken"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "niet de twee hulpregels tonen"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "pauzeren van editor toestaan"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "rest van lange regels tonen op volgende"
-
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(genegeerd, maar herkend wegens Pico)"
+msgstr "rest van te lange regels tonen op volgende"
 
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano  versie %s  (gecompileerd %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano, versie %s\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr ""
 " E-mail: <nano@nano-editor.org>  Website: http://www.nano-editor.org/\n"
 " Meld fouten in de vertaling aan <vertaling@vrijschrift.org>."
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1575,156 +1682,180 @@ msgstr ""
 "\n"
 " Compilatie-opties:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Ondersteuning voor deze functie is uitgeschakeld"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Geen bestandsnaam"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Gewijzigde buffer opslaan? (bij \"Nee\" gaan ALLE WIJZIGINGEN VERLOREN) "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Kan standaardinvoer vanaf toetsenbord niet heropenen\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lezen van standaardinvoer; ^C om af te breken\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP of SIGTERM ontvangen\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Gebruik 'fg' om terug te keren naar nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
-msgstr "is aangezet"
+msgstr " (aangezet)"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "is uitgezet"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Onbekend commando"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON genegeerd; mmm-mmm"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF genegeerd; mmm-mmm"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Gevraagde tabgrootte '%s' is ongeldig"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Gevraagde uitvulbreedte '%s' is ongeldig"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Typ '%s -h' voor een lijst van beschikbare opties.\n"
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "NnNn"
 
 # Accepteert ook de "O" van "Overal":
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "AaOo"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Nee"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Fout in %s op regel %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument '%s' heeft een ongepaarde \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Reg.exp.-reeksen moeten beginnen en eindigen met een \"-teken"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Onjuiste reguliere expressie '%s': %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Ontbrekende syntaxnaam"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "Het woordje 'none' is gereserveerd"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Bij het woordje 'default' horen geen extensies"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Ontbrekende toetsnaam"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "Toetsbindingen moeten beginnen met \"^\", \"M\", of \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Toetsnaam is te kort"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Toetsnaam moet beginnen met \"^\", \"M\", of \"F\""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr "Functie waaraan de toets gebonden moet worden ontbreekt"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
-"Menu waarin de toets moet worden gebonden moet worden opgegeven (of \"all\")"
+"Menu waarin de toets gebonden/ontbonden moet worden ontbreekt (of \"all\")"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:489
 #, c-format
-msgid "Could not map name \"%s\" to a function"
+msgid "Cannot map name \"%s\" to a function"
 msgstr "Kan in naam '%s' geen functie herkennen"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "Kan in naam '%s' geen menu herkennen"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Functie '%s' bestaat niet in menu '%s'"
+
+#: src/rcfile.c:543
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "Toets '%s' mag niet herbonden worden"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Fout bij expanderen van %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1738,134 +1869,191 @@ msgstr ""
 "'magenta', 'yellow', 'cyan', 'black' en 'white',\n"
 "met voor voorgrondkleuren het optionele voorvoegsel 'bright'."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Kan geen 'color'-commando verwerken zonder een 'syntax'-commando"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Ontbrekende kleurnaam"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Achtergrondkleur '%s' kan niet 'bright' zijn"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Ontbrekende reg.exp.-tekenreeks"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "'start=' vereist een bijbehorende 'end='"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Achtergrondkleur '%s' kan niet 'bright' zijn"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Kan geen topregel-expressie verwerken zonder een 'syntax'-commando"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+"Kan geen reguliere expressie voor magische tekenreeks toevoegen zonder een "
+"'syntax'-commando"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Ontbrekende naam van magische tekenreeks"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "Kan geen linter toevoegen zonder een 'syntax'-commando"
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Ontbrekend commando bij 'linter'"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "Kan geen opmaker toevoegen zonder een 'syntax'-commando"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Ontbrekend commando bij 'formatter'"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Fatale fout: aan functie '%s' is geen toets gebonden"
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "Fatale fout: aan functie '%s' is geen toets gebonden.  Gestopt.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
-msgstr ""
-"Gestopt.  Start eventueel nano met optie -I om uw nanorc te corrigeren.\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
+msgstr "Start eventueel nano met optie -I om uw nanorc te corrigeren.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Kan geen syntax '%s' vinden om aan toe te voegen"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Commando '%s' is niet toegestaan in 'include'-bestand"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Bij syntax '%s' ontbreken 'color'-commando's"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Commando '%s' is onbekend"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Ontbrekende vlag"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Ontbrekende optie"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Optie '%s' vereist een argument"
 
-#: src/rcfile.c:1012
+# FIXME: option *argument* is meant
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
-msgstr "Optie is geen geldige multibyte-tekenreeks"
+msgstr "Argument is geen geldige multibyte-tekenreeks"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
-msgstr "Niet-blanco tekens vereist"
+msgstr "Niet-blanco tekens zijn vereist"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
-msgstr "Twee enkelkoloms-tekens vereist"
+msgstr "Twee enkelkoloms-tekens zijn vereist"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Kan vlag '%s' niet uitzetten"
+msgid "Cannot unset option \"%s\""
+msgstr "Kan optie '%s' niet uitzetten"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Onbekende vlag '%s'"
+msgid "Unknown option \"%s\""
+msgstr "Onbekende optie '%s'"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Kan de thuismap niet vinden!  Boehoe!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Druk op Enter om verder te gaan met het starten van nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "'%.*s%s' niet gevonden"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Hoofdlettergevoelig]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Reg.exp.]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Achterwaarts]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (om te vervangen) in selectie"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (om te vervangen)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Deze overeenkomst vervangen?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Vervangen door"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%lu overeenkomst vervangen"
 msgstr[1] "%lu overeenkomsten vervangen"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Geef regelnummer, kolomnummer"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Ongeldig regel- of kolomnummer"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Is geen haakje"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Geen overeenkomend haakje"
 
@@ -1877,217 +2065,316 @@ msgstr "Markering is aangezet"
 msgid "Mark Unset"
 msgstr "Uitgezet"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Er is niets om ongedaan te maken"
 
-#: src/text.c:455 src/text.c:593
+# FIXME: make identical to other -- %ld
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr "*Interne fout*: kan regel %d niet vinden.  Sla uw werk op."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "teksttoevoeging"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "tekstverwijdering"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "regelterugloop"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "regelsamenvoeging"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "tekstwegneming"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "tekstterugplaatsing"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr "regeleinde"
+msgstr "regelafbreking"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "tekstinvoeging"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "tekstvervanging"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr "*Interne fout*: onbekend type.  Sla uw werk op."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Bewerking (%s) is ongedaan gemaakt"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Er is niets om opnieuw te doen"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr "*Interne fout*: kan herdoening niet voorbereiden.  Sla uw werk op."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Bewerking (%s) is opnieuw gedaan"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Kan niet doorsluizen"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Kan geen pijp aanmaken"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Kan geen nieuw proces starten"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr "*Interne fout*: kan terugplaatsing niet voorbereiden.  Sla uw werk op."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "*Interne fout*: onbekend type.  Sla uw werk op."
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Ongeldige aanhaaltekens-tekenreeks '%s': %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
-msgstr "Kan nu ON^Uitvullen!"
+msgstr "Kan nu onuitvullen!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Vervanging bewerken"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Kan geen pijp aanmaken"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "Aanmaken van lijst van verkeerd gespelde woorden, even geduld..."
+msgstr "Aanmaken van lijst van verkeerd gespelde woorden; even geduld..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Kan grootte van doorsluisbuffer niet bepalen"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
-msgstr "Fout tijdens aanroepen van 'spell'"
+msgstr "Fout bij aanroepen van 'spell'"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
-msgstr "Fout tijdens aanroepen van 'sort -f'"
+msgstr "Fout bij aanroepen van 'sort -f'"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
-msgstr "Fout tijdens aanroepen van 'uniq'"
+msgstr "Fout bij aanroepen van 'uniq'"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Spellingscontrole is voltooid"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "Fout tijdens aanroepen van '%s'"
+msgstr "Fout bij aanroepen van '%s'"
+
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Aanroepen van spellingscontrole; even geduld..."
 
-#: src/text.c:2960
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Spellingscontrole is mislukt: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Spellingscontrole is mislukt: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Er is geen linter gedefinieerd voor dit type bestand"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Gewijzigd buffer opslaan alvorens te linten?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Aanroepen van de linter; even geduld..."
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Kreeg nul ontleedbare regels terug van commando '%s'"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr "Deze melding is voor ongeopend bestand %s; in nieuwe buffer openen?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Dit is de laatste melding"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Dit is de eerste melding"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Fout: geen 'formatter' gedefinieerd"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Klaar"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Aanroepen van de opmaker; even geduld..."
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Het opmaken is klaar"
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%swoorden: %lu  regels: %ld  tekens: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "In de selectie:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Verbatim invoer"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "Onvoldoende geheugen beschikbaar voor nano!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Invoer van Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Gewijzigd"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Kijken"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "Map:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Bestand:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Waarschuwing: wijzigen van onvergrendeld bestand; maptoegangsrechten "
+"controleren?"
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "regel %ld/%ld (%d%%), kolom %lu/%lu (%d%%), teken %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "De nano-teksteditor"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "versie"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "U bezorgd door:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Met speciale dank aan:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "de Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "de vele vertalers en de TP"
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Voor ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "en iedereen die we vergeten zijn..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Dank u voor het gebruiken van nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr "*Interne fout*: kan regel %ld niet vinden.  Sla uw werk op."
+
+#~ msgid " GNU nano version %s (compiled %s, %s)\n"
+#~ msgstr " GNU nano  versie %s  (gecompileerd %s, %s)\n"
+
+#~ msgid "line wrap"
+#~ msgstr "regelterugloop"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "ongedaanmaken toestaan (EXPERIMENTEEL)"
+
+#~ msgid "Insert File"
+#~ msgstr "Bestand invoegen"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Een schermvol terugscrollen"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Naar bijbehorend haakje"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Terugloop van lange regels"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Zachte terugloop van lange regels"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(genegeerd, maar herkend wegens Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr ""
+#~ "Menu waarin de toets moet worden gebonden moet worden opgegeven (of \"all"
+#~ "\")"
+
+#~ msgid "Missing flag"
+#~ msgstr "Ontbrekende vlag"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Kan niet doorsluizen"
+
 #~ msgid "Error writing backup file %s: File owner mismatch"
 #~ msgstr ""
 #~ "Fout tijdens schrijven van reservekopiebestand %s: een ander is eigenaar"
diff --git a/po/nn.gmo b/po/nn.gmo
index ba1708b..f24e80d 100644
--- a/po/nn.gmo
+++ b/po/nn.gmo
diff --git a/po/nn.po b/po/nn.po
index 157d4a7..94b1bae 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1,123 +1,148 @@
 # nano - Norwegian translation
 # Copyright (C) 2002 Free Software Foundation, Inc.
+#
 # Eivind Kjørstad <ekj@vestdata.no>, 2001.
 # Svein O. Bennæs <svein@norge.no>, 2002.
 # Kjetil Torgrim Homme <kjetilho@linpro.no>, 2002.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.1.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2002-03-22 20:34+0100\n"
 "Last-Translator: Kjetil Torgrim Homme <kjetilho@linpro.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 #, fuzzy
 msgid "Go To Directory"
 msgstr "Gå til katalog"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Avbrote"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Kan ikkje gå utanfor %s i avgrensa modus"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr ""
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Kan ikkje skifta til foreldrekatalogen"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Søk"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Skil store/små]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Reguttrykk]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Bakover]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Søket gjekk rundt"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Dette er einaste forekomst"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr ""
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Kunne ikkje setja tilgangsnivå %o på %s: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Feil i %s på linje %d: "
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Feil i %s på linje %d: "
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Feil i %s på linje %d: "
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Kan ikkje setja inn fil frå utanfor %s"
 
-#: src/files.c:234
+#: src/files.c:467
 #, fuzzy
 msgid "No more open file buffers"
 msgstr "Ingen fleire opne filer"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Bytta til %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Ny buffer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, fuzzy, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "Leste %d linjer (på Mac-format)"
 msgstr[1] "Leste %d linjer (på Mac-format)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -128,14 +153,14 @@ msgid_plural ""
 msgstr[0] "Leste %d linjer (på Mac-format)"
 msgstr[1] "Leste %d linjer (på Mac-format)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, fuzzy, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "Leste %d linjer (på Mac-format)"
 msgstr[1] "Leste %d linjer (på Mac-format)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -144,14 +169,14 @@ msgid_plural ""
 msgstr[0] "Leste %d linjer (på Mac-format)"
 msgstr[1] "Leste %d linjer (på Mac-format)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, fuzzy, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "Leste %d linjer (på DOS-format)"
 msgstr[1] "Leste %d linjer (på DOS-format)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -160,515 +185,463 @@ msgid_plural ""
 msgstr[0] "Leste %d linjer (på DOS-format)"
 msgstr[1] "Leste %d linjer (på DOS-format)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, fuzzy, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "Leste %d linjer"
 msgstr[1] "Leste %d linjer"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Les fil"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Ny fil"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "«%s» ikkje funne"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, fuzzy, c-format
 msgid "\"%s\" is a directory"
 msgstr "Fila «%s» er ein katalog"
 
 # "enhet" = "device", kanskje, men det er litt forvirrande
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "Fila «%s» er ikkje ei vanleg fil"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr ""
 
-#: src/files.c:819
+#: src/files.c:1062
 #, fuzzy, c-format
 msgid "Command to execute [from %s] "
 msgstr "Fila som skal setjast inn [frå %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, fuzzy, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Fila som skal setjast inn [frå %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Fila som skal setjast inn [frå %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 #, fuzzy
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Tasten er ugyldig utan fleire buffer"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Kan ikkje skriva utanfor %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 #, fuzzy
 msgid "Too many backup files?"
 msgstr ""
 "\n"
 "%s vart ikkje lagra (for mange sikringskopiar?)\n"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr ""
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Skreiv %d linjer"
 msgstr[1] "Skreiv %d linjer"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS-format]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac-format]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 #, fuzzy
 msgid " [Backup]"
 msgstr " [Bakover]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 #, fuzzy
 msgid "Prepend Selection to File"
 msgstr "Legg til valt område på slutten av fil"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Legg til valt område på slutten av fil"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Lagra valt område til fil"
 
-#: src/files.c:2020
+#: src/files.c:2294
 #, fuzzy
 msgid "File Name to Prepend to"
 msgstr "Namn på fil som skal leggjast til"
 
-#: src/files.c:2021
+#: src/files.c:2295
 #, fuzzy
 msgid "File Name to Append to"
 msgstr "Namn på fil som skal leggjast til"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Namn på fila som skal lagrast"
 
-#: src/files.c:2153
+#: src/files.c:2427
 #, fuzzy
 msgid "File exists, OVERWRITE ? "
 msgstr "Fila eksisterer, SKRIV OVER?"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(meir)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
 "Trykk Enter for å halda fram lastinga av nano\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Erstatt"
-
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Inga erstatting"
-
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Store/små"
-
-#: src/global.c:421
-#, fuzzy
-msgid "Backwards"
-msgstr " [Bakover]"
-
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Reguttrykk"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
 msgstr ""
 
-#: src/global.c:452
-msgid "NextHstory"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
 msgstr ""
 
-#: src/global.c:453
-msgid "Go To Text"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
 msgstr ""
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
-#, fuzzy
-msgid "WhereIs Next"
-msgstr "Finn"
-
-#: src/global.c:457
-#, fuzzy
-msgid "First File"
-msgstr "Første linje"
-
-#: src/global.c:458
-#, fuzzy
-msgid "Last File"
-msgstr "Siste linje"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Til filer"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS-format"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
 
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac-format"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Avslutt"
 
-#: src/global.c:464
-msgid "Append"
-msgstr "Legg til"
+#: src/global.c:478
+msgid "Close"
+msgstr "Lukk"
 
-#: src/global.c:465
+#: src/global.c:479
 #, fuzzy
-msgid "Prepend"
-msgstr "Legg til"
+msgid "Uncut Text"
+msgstr "U-klipp"
 
-#: src/global.c:466
+#: src/global.c:481
 #, fuzzy
-msgid "Backup File"
-msgstr "Les fil"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr ""
+msgid "Unjustify"
+msgstr "U-ombrekk"
 
-#: src/global.c:471
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 #, fuzzy
-msgid "Go To Dir"
-msgstr "Gå til katalog"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Hjelp"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Avslutt"
+msgid "WhereIs Next"
+msgstr "Finn"
 
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Finn"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Førre side"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Neste side"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Første linje"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Erstatt"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Siste linje"
+#: src/global.c:494
+#, fuzzy
+msgid "Go To Line"
+msgstr "Gå til linje"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Legg i bakgrunnen"
+#: src/global.c:495
+#, fuzzy
+msgid "Prev Line"
+msgstr "Førre side"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr ""
+#: src/global.c:496
+#, fuzzy
+msgid "Next Line"
+msgstr "Neste fil"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr ""
+#: src/global.c:497
+msgid "Read File"
+msgstr "Les fil"
 
-#: src/global.c:491
+#: src/global.c:499
 #, fuzzy
 msgid "FullJstify"
 msgstr "Brekk om"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Frisk opp"
 
-#: src/global.c:495
-#, fuzzy
-msgid "Insert File"
-msgstr "Neste fil"
-
-#: src/global.c:497
-#, fuzzy
-msgid "Go To Line"
-msgstr "Gå til linje"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Brekk om avsnittet"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Avbryt gjeldande funksjon"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:509
+#: src/global.c:513
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Lukk gjeldande fil/Avslutt nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Avslutt nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Lagra gjeldande fil"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Sett inn ei anna fil i denne"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr ""
 
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Gå til førre skjerm"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr ""
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Gå til neste skjerm"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr ""
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Klipp ut denne linja og lagra ho i utklippsbufferet"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Set inn utklippsbufferet her"
 
-#: src/global.c:527
+#: src/global.c:534
 #, fuzzy
 msgid "Display the position of the cursor"
 msgstr "Vis markørposisjonen"
 
-#: src/global.c:529
+#: src/global.c:536
 #, fuzzy
 msgid "Invoke the spell checker, if available"
 msgstr "Start stavekontroll (om tilgjengeleg)"
 
-#: src/global.c:531
+#: src/global.c:538
 #, fuzzy
 msgid "Replace a string or a regular expression"
 msgstr "Erstatt feila: ukjent deluttrykk!"
 
-#: src/global.c:532
+#: src/global.c:539
 #, fuzzy
 msgid "Go to line and column number"
 msgstr "Hopp til eit linjenummer"
 
-#: src/global.c:534
+#: src/global.c:541
 #, fuzzy
-msgid "Mark text at the cursor position"
+msgid "Mark text starting from the cursor position"
 msgstr "Marker teksten ved markøren"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr ""
 
-#: src/global.c:537
+#: src/global.c:544
 #, fuzzy
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Klipp ut denne linja og lagra ho i utklippsbufferet"
 
-#: src/global.c:538
+#: src/global.c:545
 #, fuzzy
 msgid "Indent the current line"
 msgstr "Legg til noverande fil"
 
-#: src/global.c:539
+#: src/global.c:546
 #, fuzzy
 msgid "Unindent the current line"
 msgstr "Legg til noverande fil"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:543
+#: src/global.c:550
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Gå ein bokstav fram"
 
-#: src/global.c:544
+#: src/global.c:551
 #, fuzzy
 msgid "Go back one character"
 msgstr "Gå ein bokstav attende"
 
-#: src/global.c:546
+#: src/global.c:553
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Gå ein bokstav fram"
 
-#: src/global.c:547
+#: src/global.c:554
 #, fuzzy
 msgid "Go back one word"
 msgstr "Gå ein bokstav attende"
 
-#: src/global.c:549
+#: src/global.c:556
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Gå til førre skjerm"
 
-#: src/global.c:550
+#: src/global.c:557
 #, fuzzy
 msgid "Go to next line"
 msgstr "Gå ei linje ned"
 
-#: src/global.c:551
+#: src/global.c:558
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Gå til starten av linja"
 
-#: src/global.c:552
+#: src/global.c:559
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Gå til slutten av linja"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Gå til første linje i fila"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Gå til siste linje i fila"
 
-#: src/global.c:564
+#: src/global.c:569
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Inga motsvarande klamme"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:572
+#: src/global.c:576
 #, fuzzy
 msgid "Switch to the previous file buffer"
 msgstr "Gå til førre skjerm"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:579
+#: src/global.c:580
 #, fuzzy
 msgid "Insert a tab at the cursor position"
 msgstr "Sett inn eit linjeskift"
@@ -678,352 +651,466 @@ msgstr "Sett inn eit linjeskift"
 msgid "Insert a newline at the cursor position"
 msgstr "Sett inn eit linjeskift"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Slett bokstaven under markøren"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Slett bokstaven til venstre for markøren"
 
-#: src/global.c:588
+#: src/global.c:587
 #, fuzzy
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Set inn utklippsbufferet her"
 
-#: src/global.c:591
+#: src/global.c:590
 #, fuzzy
 msgid "Justify the entire file"
 msgstr "Brekk om avsnittet"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Teikn skjermen på nytt"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:603
+#: src/global.c:602
 #, fuzzy
 msgid "Toggle the case sensitivity of the search"
 msgstr "Søk (skil mellom store og små bokstavar)"
 
-#: src/global.c:605
+#: src/global.c:604
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "Vis markørposisjonen"
 
-#: src/global.c:609
+#: src/global.c:608
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Bruk regulære uttrykk"
 
-#: src/global.c:613
+#: src/global.c:612
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Gå til førre skjerm"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr ""
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Gå til fillesar"
 
-#: src/global.c:621
+#: src/global.c:620
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Skriv fila på DOS-format"
 
-#: src/global.c:622
+#: src/global.c:621
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Skriv fila på Mac-format"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr ""
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr ""
 
-#: src/global.c:636
+#: src/global.c:631
 #, fuzzy
 msgid "Exit from the file browser"
 msgstr "Gå til fillesar"
 
-#: src/global.c:638
+#: src/global.c:632
 #, fuzzy
 msgid "Go to the first file in the list"
 msgstr "Gå til første linje i fila"
 
-#: src/global.c:640
+#: src/global.c:633
 #, fuzzy
 msgid "Go to the last file in the list"
 msgstr "Gå til siste linje i fila"
 
-#: src/global.c:641
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "Gå til siste linje i fila"
-
-#: src/global.c:642
+#: src/global.c:634
 #, fuzzy
 msgid "Go to the previous file in the list"
 msgstr "Gå til første linje i fila"
 
-#: src/global.c:643
+#: src/global.c:635
+#, fuzzy
+msgid "Go to the next file in the list"
+msgstr "Gå til siste linje i fila"
+
+#: src/global.c:636
 #, fuzzy
 msgid "Go to directory"
 msgstr "Gå til katalog"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Lukk"
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Start stavekontroll (om tilgjengeleg)"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr ""
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr ""
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:642
+#, fuzzy
+msgid "Invoke formatter, if available"
+msgstr "Start stavekontroll (om tilgjengeleg)"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Hjelp"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "Lagra"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+#, fuzzy
+msgid "Go To Dir"
+msgstr "Gå til katalog"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Klipp"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Brekk om"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Les fil"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Staving"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Klipp"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "Gå til linje"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "U-ombrekk"
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS-format"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Store/små"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Reguttrykk"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
+#: src/global.c:755
 #, fuzzy
-msgid "UnCut Text"
-msgstr "U-klipp"
+msgid "Backwards"
+msgstr " [Bakover]"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Inga erstatting"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Posisjon"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Staving"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Førre side"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Neste side"
 
-#: src/global.c:771
+#: src/global.c:785
+msgid "First Line"
+msgstr "Første linje"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Siste linje"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ikkje ei klamme"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Merk tekst"
 
-#: src/global.c:777
+#: src/global.c:800
 #, fuzzy
 msgid "Copy Text"
 msgstr "Klipp"
 
-#: src/global.c:780
+#: src/global.c:803
 #, fuzzy
 msgid "Indent Text"
 msgstr "Klipp"
 
-#: src/global.c:783
-#, fuzzy
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "U-klipp"
+msgstr ""
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Framover"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Bakover"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr ""
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Framover"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr ""
 
-#: src/global.c:824
-#, fuzzy
-msgid "Prev Line"
-msgstr "Førre side"
-
-#: src/global.c:827
-#, fuzzy
-msgid "Next Line"
-msgstr "Neste fil"
+#: src/global.c:829
+msgid "Next Word"
+msgstr ""
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Home"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "End"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Finn den andre klamma"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr ""
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr ""
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr ""
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "Førre fil"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Neste fil"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Delete"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Legg i bakgrunnen"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr ""
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr ""
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr ""
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS-format"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac-format"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Legg til"
+
+#: src/global.c:936
+#, fuzzy
+msgid "Prepend"
+msgstr "Legg til"
+
+#: src/global.c:939
+#, fuzzy
+msgid "Backup File"
+msgstr "Les fil"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr ""
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Til filer"
+
+#: src/global.c:964
+#, fuzzy
+msgid "First File"
+msgstr "Første linje"
+
+#: src/global.c:966
+#, fuzzy
+msgid "Last File"
+msgstr "Siste linje"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr ""
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr ""
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Hjelpetekst"
 
-#: src/global.c:1369
+#: src/global.c:1229
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Fast markørposisjon"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Jamn linjerulling"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr " -w \t\tIkkje bryt lange linjer\n"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr ""
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Automatisk innrykk"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Klipp til slutten"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
 msgstr ""
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr ""
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Mange filbuffer"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Musestøtte"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Inga omsetjing frå DOS/Mac-format"
 
-#: src/global.c:1397
+#: src/global.c:1259
 #, fuzzy
 msgid "Suspension"
 msgstr "Legg i bakgrunnen"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr ""
-
-#: src/help.c:236
+#: src/help.c:205
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -1051,7 +1138,7 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i søkjemodus:\n"
 "\n"
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1060,7 +1147,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:251
+#: src/help.c:220
 #, fuzzy
 msgid ""
 "Go To Line Help Text\n"
@@ -1081,7 +1168,7 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i Gå til linje-modus:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1109,7 +1196,7 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i Set inn fil-modus:\n"
 "\n"
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1118,7 +1205,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:275
+#: src/help.c:244
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1146,7 +1233,7 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i Lagre fil-modus:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 #, fuzzy
 msgid ""
 "File Browser Help Text\n"
@@ -1171,7 +1258,7 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i filutforskaren:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1200,13 +1287,13 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i søkjemodus:\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:315
+#: src/help.c:284
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1229,7 +1316,7 @@ msgstr ""
 " Følgjande funksjonstastar er tilgjengelege i Gå til katalog-modus:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1252,7 +1339,7 @@ msgstr ""
 " Følgjande andre funksjonar er tilgjengelege i stavesjekkingsmodus:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1264,7 +1351,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:356
+#: src/help.c:325
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1291,7 +1378,7 @@ msgstr ""
 "tastaturoppsettet ditt. Dei følgjande tastetrykkja er tilgjengelege i "
 "hovudvindauget. Valfrie tastar er vist i parentes:\n"
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1302,7 +1389,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1311,17 +1398,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 #, fuzzy
 msgid "enable/disable"
 msgstr "%s skru på/av"
 
-#: src/nano.c:587
+#: src/nano.c:601
 #, fuzzy
 msgid "Key invalid in view mode"
 msgstr "Tasten er ulovleg i VIS-modus"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1330,7 +1417,7 @@ msgstr ""
 "\n"
 "Buffer lagra til %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1339,7 +1426,7 @@ msgstr ""
 "\n"
 "Buffer lagra til %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1348,279 +1435,285 @@ msgstr ""
 "\n"
 "Buffer lagra til %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 #, fuzzy
 msgid "Window size is too small for nano...\n"
 msgstr "Vindauget er for lite for Nano..."
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, fuzzy, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opsjon\t\tLang opsjon\t\tTyding\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opsjon\t\tTyding\n"
 
-#: src/nano.c:824
-#, fuzzy
-msgid "Show this message"
-msgstr " -h \t\tVis denne meldinga\n"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr ""
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr ""
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr ""
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr ""
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr ""
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr ""
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr ""
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr ""
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr ""
 
-#: src/nano.c:840
+#: src/nano.c:861
 #, fuzzy
 msgid "Enable multiple file buffers"
 msgstr " -F \t\tSkru på fleire filbuffer\n"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr ""
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr ""
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr ""
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr ""
 
-#: src/nano.c:856
+#: src/nano.c:881
 #, fuzzy
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Inga omsetjing frå DOS/Mac-format"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:886
+#, fuzzy
+msgid "Log & read location of cursor position"
+msgstr "Fast markørposisjon"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr ""
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr ""
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr ""
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr ""
 
-#: src/nano.c:869
+#: src/nano.c:898
 #, fuzzy
 msgid "Set width of a tab to #cols columns"
 msgstr " -T [TAL]\tSet breidda på tabulator til TAL\n"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr ""
 
-#: src/nano.c:874
+#: src/nano.c:903
 #, fuzzy
 msgid "Print version information and exit"
 msgstr " -V \t\tSkriv ut versjonsnummer og avslutt\n"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr ""
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr ""
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr ""
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr ""
 
-#: src/nano.c:883
+#: src/nano.c:912
 #, fuzzy
 msgid "Constantly show cursor position"
 msgstr " -c \t\tFast markørposisjon\n"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr ""
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr ""
+
+#: src/nano.c:918
 #, fuzzy
 msgid "Automatically indent new lines"
 msgstr " -i \t\tAutomatisk linjeinnrykk\n"
 
-#: src/nano.c:889
+#: src/nano.c:919
 #, fuzzy
 msgid "Cut from cursor to end of line"
 msgstr " -k \t\tLat ^K klippe frå markøren og ut linja\n"
 
-#: src/nano.c:892
+#: src/nano.c:922
 #, fuzzy
 msgid "Don't follow symbolic links, overwrite"
 msgstr " -l \t\tFølg ikkje symbolske lenker, skriv over\n"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr ""
 
-#: src/nano.c:898
+#: src/nano.c:929
 #, fuzzy
 msgid "Set operating directory"
 msgstr " -o [kat] \tSet aktiv filkatalog\n"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr ""
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr ""
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
 msgstr ""
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr ""
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr ""
 
-#: src/nano.c:910
+#: src/nano.c:943
 #, fuzzy
 msgid "Enable alternate speller"
 msgstr " -s [PROG]  \tBruk PROG til stavesjekk\n"
 
-#: src/nano.c:913
+#: src/nano.c:946
 #, fuzzy
 msgid "Auto save on exit, don't prompt"
 msgstr " -t \t\tLagra utan å spørja ved avslutning\n"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 #, fuzzy
 msgid "View mode (read-only)"
 msgstr " -v \t\tVis-modus (berre lesing)\n"
 
-#: src/nano.c:920
+#: src/nano.c:949
 #, fuzzy
-msgid "Don't wrap long lines"
+msgid "Don't hard-wrap long lines"
 msgstr " -w \t\tIkkje bryt lange linjer\n"
 
-#: src/nano.c:922
+#: src/nano.c:951
 #, fuzzy
 msgid "Don't show the two help lines"
 msgstr " -x \t\tIkkje vis hjelpevindu\n"
 
-#: src/nano.c:923
+#: src/nano.c:952
 #, fuzzy
 msgid "Enable suspension"
 msgstr " -z \t\tTillat å leggja programmet i bakgrunnen\n"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr ""
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr "GNU nano versjon %s (kompilert %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, fuzzy, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr "Epost: nano@nano-editor.org\tVev: http://www.nano-editor.org"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1629,157 +1722,182 @@ msgstr ""
 "\n"
 " Kompilerte tillegg:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr ""
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+#, fuzzy
+msgid "No file name"
+msgstr "filnamnet er %s"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Lagra endra buffer (\"No\" VIL MISSA ENDRINGANE)? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 #, fuzzy
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Mottok SIGHUP"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr ""
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "på"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "av"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr ""
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr ""
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, fuzzy, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "tab-breidda du foreslo (%d) er for smal"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, fuzzy, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "fyllbreidda du foreslo (%d) er for smal"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr ""
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Alle"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Nei"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, fuzzy, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Feil i %s på linje %d: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr ""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 #, fuzzy
 msgid "Regex strings must begin and end with a \" character"
 msgstr "reguttrykk må starte og slutte med eit \"-teikn\n"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, fuzzy, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Kan ikkje opna «%s»: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 #, fuzzy
 msgid "Missing syntax name"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr ""
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 #, fuzzy
 msgid "Missing key name"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr ""
 
-#: src/rcfile.c:426
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Kunne ikkje opna %s for skriving: %s"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
+
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr ""
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
+msgid "Cannot map name \"%s\" to a menu"
 msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr ""
+
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr ""
+
+#: src/rcfile.c:672
 #, fuzzy, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1793,139 +1911,196 @@ msgstr ""
 "«white» (kvit), «yellow» (gul), «cyan» (lysblå), «magenta» (fiolett) og\n"
 "«black» (svart), med den valfrie nemninga «bright» (lys) først.\n"
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr ""
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr ""
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 #, fuzzy
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr ""
 "\n"
 "\tfor kvar «start=» må der vera ein «end=»"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr ""
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 
-#: src/rcfile.c:874
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:926
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Fargenamnet manglar"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:990
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Fargenamnet manglar"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr ""
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr ""
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, fuzzy, c-format
 msgid "Command \"%s\" not understood"
 msgstr "kommandoen %s er ikkje forståeleg"
 
-#: src/rcfile.c:972
+#: src/rcfile.c:1186
 #, fuzzy
-msgid "Missing flag"
+msgid "Missing option"
 msgstr "Fargenamnet manglar"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, fuzzy, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "opsjonen %s krev eit argument"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, fuzzy, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "skru av flagget %d!\n"
+msgid "Cannot unset option \"%s\""
+msgstr "Kan ikkje endra storleik på toppvindauget"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
+msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr ""
 
+#: src/rcfile.c:1442
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Trykk Enter for å halda fram lastinga av nano\n"
+
 #: src/search.c:96
 #, fuzzy, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "«%s» ikkje funne"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Skil store/små]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Reguttrykk]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Bakover]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 #, fuzzy
 msgid " (to replace) in selection"
 msgstr " (å erstatta)"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (å erstatta)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Erstatta dette tilfellet?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Erstatt med"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, fuzzy, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Erstatta %d tilfelle"
 msgstr[1] "Erstatta %d tilfelle"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 #, fuzzy
 msgid "Enter line number, column number"
 msgstr "Skriv linjenummer"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ikkje ei klamme"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Inga motsvarande klamme"
 
@@ -1938,226 +2113,281 @@ msgstr "Merke sett"
 msgid "Mark Unset"
 msgstr "Merke fjerna"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 #, fuzzy
 msgid "text delete"
 msgstr "Neste fil"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr ""
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 #, fuzzy
 msgid "text insert"
 msgstr "Neste fil"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 #, fuzzy
 msgid "text replace"
 msgstr " (å erstatta)"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:766
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
 #, fuzzy
-msgid "Could not pipe"
-msgstr "Kunne ikkje lukka %s: %s"
+msgid "Could not create pipe"
+msgstr "Kunne ikkje oppretta mellombels fil: %s"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 #, fuzzy
 msgid "Could not fork"
 msgstr "Kunne ikkje lukka %s: %s"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr ""
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Du kan no gjera om ombrekkinga!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Rediger erstatning"
 
-#: src/text.c:2548
-#, fuzzy
-msgid "Could not create pipe"
-msgstr "Kunne ikkje oppretta mellombels fil: %s"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr ""
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr ""
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr ""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr ""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr ""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Stavekontroll fullført"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "Feil i %s på linje %d: "
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Start stavekontroll (om tilgjengeleg)"
+
+#: src/text.c:2902
 #, fuzzy, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavekontroll feila"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, fuzzy, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavekontroll feila"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr ""
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr ""
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr ""
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3031
+#: src/text.c:3439
 #, fuzzy
 msgid "In Selection:  "
 msgstr "Legg til valt område på slutten av fil"
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr ""
+
+#: src/utils.c:410 src/utils.c:422
 #, fuzzy
 msgid "nano is out of memory!"
 msgstr "nano: malloc: tom for minne!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Endra"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr ""
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 #, fuzzy
 msgid "DIR:"
 msgstr " KAT: "
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 #, fuzzy
 msgid "File:"
 msgstr "Fil: "
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, fuzzy, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "linje %d/%d (%.0f%%), kol %ld/%ld (%.0f%%), teikn %ld/%ld (%.0f%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Teksteditoren nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 #, fuzzy
 msgid "version"
 msgstr "versjon "
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Gjeve til deg av:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Spesiell takk til:"
 
 # Oversette dette ?
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "Free Sofware Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr ""
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "og alle dei andre vi gløymde..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "Takk for at du brukar nano!\n"
@@ -2174,17 +2404,14 @@ msgstr "Takk for at du brukar nano!\n"
 #~ msgid "File to insert [from ./] "
 #~ msgstr "Fila som skal setjast inn [frå ./] "
 
-#~ msgid "filename is %s"
-#~ msgstr "filnamnet er %s"
-
 #~ msgid "Could not open file for writing: %s"
 #~ msgstr "Kunne ikkje opna fila for skriving: %s"
 
 #~ msgid "Wrote >%s\n"
 #~ msgstr "Skreiv >%s\n"
 
-#~ msgid "Could not set permissions %o on %s: %s"
-#~ msgstr "Kunne ikkje setja tilgangsnivå %o på %s: %s"
+#~ msgid "Could not open %s for writing: %s"
+#~ msgstr "Kunne ikkje opna %s for skriving: %s"
 
 #~ msgid "Can't visit parent in restricted mode"
 #~ msgstr "Kan ikkje gå til foreldrekatalogen i avgrensa modus"
@@ -2222,6 +2449,9 @@ msgstr "Takk for at du brukar nano!\n"
 #~ msgid "Search for text within the editor"
 #~ msgstr "Søk etter tekst"
 
+#~ msgid "Move to the next screen"
+#~ msgstr "Gå til neste skjerm"
+
 #~ msgid "Move up one line"
 #~ msgstr "Gå ei linje opp"
 
@@ -2249,6 +2479,9 @@ msgstr "Takk for at du brukar nano!\n"
 #~ msgid "Down"
 #~ msgstr "Ned"
 
+#~ msgid "Find Other Bracket"
+#~ msgstr "Finn den andre klamma"
+
 #~ msgid "Direction"
 #~ msgstr "Retning"
 
@@ -2368,6 +2601,9 @@ msgstr "Takk for at du brukar nano!\n"
 #~ msgid " -S\t\tSmooth scrolling\n"
 #~ msgstr " -S\t\tJamn linjerulling\n"
 
+#~ msgid " -h \t\tShow this message\n"
+#~ msgstr " -h \t\tVis denne meldinga\n"
+
 #~ msgid " -m \t\tEnable mouse\n"
 #~ msgstr " -m \t\tSkru på musestøtte\n"
 
@@ -2392,9 +2628,6 @@ msgstr "Takk for at du brukar nano!\n"
 #~ msgid "Spell checking failed: unable to write temp file!"
 #~ msgstr "Stavekontroll feila: kunne ikkje laga mellombels fil!"
 
-#~ msgid "Cannot resize top win"
-#~ msgstr "Kan ikkje endra storleik på toppvindauget"
-
 #~ msgid "Cannot move top win"
 #~ msgstr "Kan ikke flytta toppvindauget"
 
@@ -2447,6 +2680,9 @@ msgstr "Takk for at du brukar nano!\n"
 #~ msgid "set flag %d!\n"
 #~ msgstr "sett flagget %d!\n"
 
+#~ msgid "unset flag %d!\n"
+#~ msgstr "skru av flagget %d!\n"
+
 #~ msgid "Errors found in .nanorc file"
 #~ msgstr "Feil funne i .nanorc fila"
 
diff --git a/po/pl.gmo b/po/pl.gmo
index 9f8b38f..7b9ff88 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 85a1103..c54002c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,119 +1,142 @@
 # Polish translations for the nano editor messages
+# Copyright (C) 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# Copyright (C) 2010 Free Software Foundation, Inc.
 #
-# Sergey Poznyakoff <gray@gnu.org>, 2010
-# Wojciech Kotwica <wkotwica@post.pl>, 2002
-# based on uncompleted translation nano_1.0.6 by
 # Cezary Sliwa <sliwa@cft.edu.pl>, 2001.
-#
+# Wojciech Kotwica <wkotwica@post.pl>, 2002.
+# Sergey Poznyakoff <gray@gnu.org>, 2010, 2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-04-21 19:16+0300\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2014-09-02 08:57+0300\n"
 "Last-Translator: Sergey Poznyakoff <gray@gnu.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Przejd¼ do katalogu"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Anulowano"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "W trybie ograniczonym nie mo¿na wyj¶æ poza %s"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "B³±d odczytu %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "Nie mo¿na przej¶æ katalog wy¿ej"
+msgstr "Nie mo¿na przej¶æ do katalogu wy¿ej"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(kat)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(kat nad)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Szukaj"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Uwzgl.wielk.liter]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Wyr.reg.]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Wstecz]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Wyszukiwanie minê³o granicê pliku - kontynuowane od pocz±tku (koñca)"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "To jedyne wyst±pienie"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "Brak wzorca wyszukiwania"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr "Nie mo¿na ustaliæ u¿ytkownika pliku blokowania (b³±d getpwuid())"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Nie mo¿na ustaliæ nazwy hosta do blokowania: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "B³±d zapisu pliku blokowania %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "B³±d usuwania pliku blokowania %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "B³±d otwierania pliku blokowania %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "B³±d odczytu pliku blokowania %s. Przeczytano za ma³o danych"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "B³±d zapisu pliku blokowania: Katalog '%s' nie istnieje"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Nie mo¿na wstawiæ pliku spoza %s "
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Nie ma wiêcej otwartych buforów"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Prze³±czono na %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Nowy bufor"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -121,7 +144,7 @@ msgstr[0] "Wczytano %lu liniê (przekonwertowana z formatu DOS i Mac)"
 msgstr[1] "Wczytano %lu linie (przekonwertowane z formatu DOS i Mac)"
 msgstr[2] "Wczytano %lu linii (przekonwertowane z formatu DOS i Mac)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -139,7 +162,7 @@ msgstr[2] ""
 "Wczytano %lu linii (przekonwertowane z formatu DOS i Mac - Ostrze¿enie: brak "
 "pozwolenia na zapis)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -147,7 +170,7 @@ msgstr[0] "Wczytano %lu liniê (przekonwertowana z formatu Mac)"
 msgstr[1] "Wczytano %lu linie (przekonwertowane z formatu Mac)"
 msgstr[2] "Wczytano %lu linii (przekonwertowane z formatu Mac)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -163,7 +186,7 @@ msgstr[2] ""
 "Wczytano %lu linii (przekonwertowane z formatu Mac - Ostrze¿enie: brak "
 "pozwolenia na zapis)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -171,7 +194,7 @@ msgstr[0] "Wczytano %lu liniê (przekonwertowana z formatu DOS)"
 msgstr[1] "Wczytano %lu linie (przekonwertowane z formatu DOS)"
 msgstr[2] "Wczytano %lu linii (przekonwertowane z formatu DOS)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -187,7 +210,7 @@ msgstr[2] ""
 "Wczytano %lu linii (przekonwertowane z formatu DOS - Ostrze¿enie: brak "
 "pozwolenia na zapis)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -195,7 +218,7 @@ msgstr[0] "Wczytano %lu liniê"
 msgstr[1] "Wczytano %lu linie"
 msgstr[2] "Wczytano %lu linii"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
@@ -203,86 +226,95 @@ msgstr[0] "Wczytano %lu liniê (Ostrze¿enie: brak pozwolenia na zapis)"
 msgstr[1] "Wczytano %lu linie (Ostrze¿enie: brak pozwolenia na zapis)"
 msgstr[2] "Wczytano %lu linii (Ostrze¿enie: brak pozwolenia na zapis)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Wczytywanie pliku"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Nowy plik"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Nie znaleziono \"%s\""
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" jest katalogiem"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" jest plikiem urz±dzenia"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Polecenie do wykonania w nowym buforze [z %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Polecenie do wykonania [z %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Plik do wstawienia do nowego bufora [z %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Plik do wstawienia [z %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Klawisz niedozwolony w trybie innym ni¿ wielu buforów"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"Utworzenie kopii zapasowej nie powiod³o siê, kontynuowaæ zapis? (N je¶li "
+"nie\n"
+"jeste¶ pewien)"
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Nie mo¿na zapisaæ poza %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 "Nie mo¿na dopisywaæ do ³±cza symbolicznego przy w³±czonej opcji --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "B³±d zapisu kopii zapasowej %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Za wiele kopii zapasowych?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "B³±d zapisu %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "B³±d zapisu pliku tymczasowego: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -290,375 +322,333 @@ msgstr[0] "Zapisano %lu liniê"
 msgstr[1] "Zapisano %lu linie"
 msgstr[2] "Zapisano %lu linii"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [format DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [format Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Kopia zap.]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Wpisz wybór na pocz±tek pliku"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Dopisz wybór do pliku"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Zapisz wybór do pliku"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Nazwa pliku do wpisania"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Nazwa pliku do dopisania"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Nazwa pliku do zapisu"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Plik istnieje, ZAMAZAÆ ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Zapisaæ plik pod INN¡ NAZW¡ ? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Plik zosta³ zmodyfikowany po otworzeniu, kontynuowaæ zapis ? "
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(wiêcej)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Naci¶nij return aby kontynuowaæ rozruch nano.\n"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Anuluj"
+"Naci¶nij Enter aby kontynuowaæ\n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "Zast±p"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Nie mo¿na utworzyæ katalogu %s: %s\n"
+"Jest on niezbêdny do zapisu/odczytu historii wyszukiwañ i pozycji kursora.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Nie zast."
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"¦cie¿ka %s nie jest katalogiem, a musi nim byæ.\n"
+"Nano nie potrafi zapisaæ lub odczytaæ historii wyszukiwañ i pozycji\n"
+"kursora.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Wielk.liter"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Znaleziono stary plik historii nano (%s) oraz spróbowano\n"
+"przenie¶æ go do preferowanego miejsca (%s), pod czas czego\n"
+"wynik³ b³±d: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Wstecz"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Znaleziono stary plik historii nano (%s) oraz przeniesiono\n"
+"go do preferowanego miejsca (%s)\n"
+"(patrz FAQ nano co do tej zmiany)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Wyr.reg."
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Wyjd¼"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "Poprz.Hist"
+#: src/global.c:478
+msgid "Close"
+msgstr "Zamknij"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "Nast.Hist"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Odnów Tekst"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Przejd¼ do tekstu"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Cofnij just."
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "Szukaj Znów"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "Pierw.Plik"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Ost.Plik"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Pliki"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Format DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Format Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Dopisz"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Wpisz"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Kopia zapas."
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Wywo³aj polecenie"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Przejd¼ do katalogu"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Pomoc"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Wyjd¼"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Wyszukaj"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Poprz.str."
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Nast.str."
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Pierw.lin."
+#: src/global.c:493
+msgid "Replace"
+msgstr "Zast±p"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Ost.lin."
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Przejd¼ do linii"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Zawie¶"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Poprz.lin."
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "PoczAkapit"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Nast. lin."
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "KonAkapit"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Wczyt.plik"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Wyjustuj"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Od¶wie¿"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Wstaw plik"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Przejd¼ do linii"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Wyjustuj bie¿±cy akapit"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Anuluj bie¿±c± funkcjê"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Wy¶wietla ten tekst pomocy"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Zamknij bie¿±cy bufor / Wyjd¼ z nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Wyjd¼ z nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Zapisz bie¿±cy plik na dysku"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Wstaw do bie¿±cego pliku zawarto¶æ innego pliku"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Szukaj ³añcucha lub wyra¿enia regularnego"
 
-#: src/global.c:520
-msgid "Go to previous screen"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Szukaj ³añcucha"
+
+#: src/global.c:528
+msgid "Go one screenful up"
 msgstr "Przejd¼ do poprzedniego ekranu"
 
-#: src/global.c:521
-msgid "Go to next screen"
+#: src/global.c:529
+msgid "Go one screenful down"
 msgstr "Przejd¼ do nastêpnego ekranu"
 
-#: src/global.c:523
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Wytnij bie¿±c± liniê i przechowaj w buforze wycinania"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Wklej zawarto¶æ bufora wycinania w bie¿±cej linii"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Poka¿ informacjê o pozycji kursora"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Wywo³aj sprawdzanie pisowni, je¶li dostêpne"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Zamieñ ³añcuch lub wyra¿enie regularne"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Przejd¼ do linii i kolumny"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
 msgstr "Ustaw znacznik w bie¿±cym po³o¿eniu kursora"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr "Powtórz ostatnie wyszukiwanie"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Wytnij bie¿±c± liniê i przechowaj w buforze wycinania"
+msgstr "Skopiuj bie¿±c± liniê i przechowaj w buforze wycinania"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Wyrównaj bie¿±c± liniê"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Usuñ wciêcia z bie¿±cej linii"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Odwo³aj ostatni± operacjê"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Odtwórz ostatni± operacjê"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Przejd¼ o znak do przodu"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Przejd¼ o znak wstecz"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Przejd¼ o s³owo do przodu"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Przejd¼ o s³owo wstecz"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "Przejd¼ do poprzedniej linii"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Przejd¼ do nastêpnej linii"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "Przejd¼ na pocz±tek bie¿±cej linii"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Przejd¼ na koniec bie¿±cej linii"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "Przejd¼ na pocz±tek akapitu; potem na pocz±tek poprzedniego akapitu"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "Przejd¼ w koniec akapitu; potem w koniec nastêpnego akapitu"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Przejd¼ do pierwszej linii pliku"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Przejd¼ do ostatniej linii pliku"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Przejd¼ do parzystego nawiasu"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Przewiñ na jedn± liniê w górê bez przesuniêcia kursora"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Przewiñ na jedn± liniê w dó³ bez przesuniêcia kursora"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Przejd¼ do poprzedniego bufora"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Przejd¼ do nastêpnego bufora"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Wstaw nastêpne naci¶niêcie klawisza dos³ownie"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Wstaw znak tabulacji na pozycji kursora"
 
@@ -666,330 +656,436 @@ msgstr "Wstaw znak tabulacji na pozycji kursora"
 msgid "Insert a newline at the cursor position"
 msgstr "Wstaw znak nowej linii na pozycji kursora"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Usuñ znak na pozycji kursora"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Usuñ znak na lewo od kursora"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Wytnij wszystko z pozycji kursora po koniec pliku"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Wyjustuj ca³y plik"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Policz ilo¶æ s³ów, linii i znaków"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Od¶wie¿ (ponownie wy¶wietl) bie¿±cy ekran"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Zawie¶ edytor (je¿eli zawieszenie jest w³±czone)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "Prze³±cz uwzglêdnienie rozmiaru znaków pod czas wyszukiwania"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Odwróæ kierunek wyszukiwania"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Prze³±cz u¿ycie wyra¿eñ regularnych"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Przywróæ poprzednie ³añcuchy wyszukiwania/zamiany"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Przywróæ nastêpne ³añcuchy wyszukiwania/zamiany"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Poka¿ przegl±darkê plików"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Prze³±cz u¿ycie formatu DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Prze³±cz u¿ycie formatu Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Prze³±cz dopisywanie w koniec"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Prze³±cz dopisywanie na pocz±tek"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Prze³±cz utworzenie kopii zapasowych oryginalnego pliku"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Wywo³aj polecenie zewnêtrzne"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Prze³±cz u¿ycie nowego bufora"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Wyjd¼ z przegl±darki plików"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Przejd¼ do pierwszego pliku na li¶cie"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Przejd¼ do ostatniego pliku na li¶cie"
 
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "Przejd¼ do nastêpnego pliku na li¶cie"
-
-#: src/global.c:642
+#: src/global.c:634
 msgid "Go to the previous file in the list"
 msgstr "Przejd¼ do poprzedniego pliku na li¶cie"
 
-#: src/global.c:643
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Przejd¼ do nastêpnego pliku na li¶cie"
+
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Przejd¼ do katalogu"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Zamknij"
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Wywo³aj sprawdzanie sk³adni, je¶li dostêpne"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Przejd¼ do poprzedniej linii"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Przejd¼ do nastêpnej linii"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:642
+#, fuzzy
+msgid "Invoke formatter, if available"
+msgstr "Wywo³aj sprawdzanie sk³adni, je¶li dostêpne"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Pomoc"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Zapisz"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Do kat."
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Wytnij"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Wyjustuj"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Wczyt.plik"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Pisownia"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Wytnij"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Sk³adnia"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Cofnij just."
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "Format DOS"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Wielk.liter"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Wyr.reg."
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Wstecz"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Wklej"
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Nie zast."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Bie¿.poz."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Pisownia"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Poprz.str."
 
-#: src/global.c:771
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Nast.str."
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Pierw.lin."
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Ost.lin."
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Do nawiasu"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Zaznacz"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Kopiuj"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Wciêcie"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Usuñ Wciêcia"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Odwo³aj"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Odtwórz"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "W przód"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Wstecz"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Nast.s³owo"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "W przód"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Poprz.s³owo"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Poprz.lin."
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Nast. lin."
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Nast.s³owo"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Pocz±tek"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Koniec"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Znajd¼ nawias do pary"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "PoczAkapit"
 
-#: src/global.c:848
-msgid "Scroll Up"
-msgstr "Przewiñ w górê"
+#: src/global.c:846
+msgid "End of Par"
+msgstr "KonAkapit"
 
 #: src/global.c:851
-msgid "Scroll Down"
-msgstr "Przewiñ w dó³"
+msgid "Scroll Up"
+msgstr "W górê"
 
-#: src/global.c:856
-msgid "Previous File"
-msgstr "Poprzedni plik"
+#: src/global.c:853
+msgid "Scroll Down"
+msgstr "W dó³"
 
 #: src/global.c:858
+msgid "Prev File"
+msgstr "Plik poprz."
+
+#: src/global.c:860
 msgid "Next File"
-msgstr "Nastêpny plik"
+msgstr "Plik nast."
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "wprowadzanie dos³owne"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Dos³ownie"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Usuñ"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "WytnDoKonc"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Ilo¶æ s³ów"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Zawie¶"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Poprz.Hist"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Nast.Hist"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Do tekstu"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Format DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Format Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Dopisz"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Wpisz"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Kopia zapas."
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Wywo³aj polecenie"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Pliki"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Pierw.Plik"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Ost.Plik"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Lint:Poprz.lin."
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "Lint:Nast.lin."
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Tryb pomocy"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Sta³e po³o¿enie kursora"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "U¿ycie dodatkowej linii do redagowania"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "P³ynne przewijanie"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Miêkkie zawijanie d³ugich linii"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Wy¶wietlanie bia³ych znaków"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Kolorowanie sk³adni"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Rozumny klawisz \"w pocz±tek\""
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Auto wciêcia"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Wytnij do koñca"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Zawijanie d³ugich linii"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Twarde zawijanie d³ugich linii"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Przetworzenie tabulacji na spacji"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Kopie zapasowe"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Wiele buforów plikowych"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Obs³uga myszy"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Bez konwersji z formatu DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Zawie¶"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Miêkkie zawijanie linii"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1011,7 +1107,7 @@ msgstr ""
 "szukany ³añcuch. Naci¶niêcie Enter bez wprowadzania tekstu spowoduje "
 "wykonanie poprzedniego szukania.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1025,7 +1121,7 @@ msgstr ""
 " W trybie szukania dostêpne s± nastêpuj±ce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1045,7 +1141,7 @@ msgstr ""
 "funkcyjne:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1067,7 +1163,7 @@ msgstr ""
 "pliku nanorc, wstawianie pliku spowoduje wczytanie go do oddzielnego bufora "
 "(u¿yj Meta-< i > do prze³±czania siê miêdzy buforami plikowymi.  "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1081,7 +1177,7 @@ msgstr ""
 "W trybie wstawiania pliku dostêpne s± nastêpuj±ce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1108,7 +1204,7 @@ msgstr ""
 " W trybie zapisu pliku dostêpne s± nastêpuj±ce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1133,7 +1229,7 @@ msgstr ""
 " W przegl±darce plików dostêpne s± nastêpuj±ce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1157,7 +1253,7 @@ msgstr ""
 "wykonanie poprzedniego szukania.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1165,7 +1261,7 @@ msgstr ""
 " W trybie wyszukiwania dostêpne s± nastêpuj±ce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1189,7 +1285,7 @@ msgstr ""
 "klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1213,7 +1309,7 @@ msgstr ""
 " W trybie sprawdzania pisowni dostêpne s± nastêpuj±ce klawisze funkcyjne:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1234,7 +1330,7 @@ msgstr ""
 " W tym trybie dostêpne s± nastêpuj±ce klawisze:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1254,7 +1350,7 @@ msgstr ""
 "zawiera edytowany tekst. Trzecia linia od do³u, czyli linia stanu, s³u¿y do "
 "wy¶wietlania wa¿nych komunikatów. "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1272,7 +1368,7 @@ msgstr ""
 "zale¿nie od uk³adu klawiatury jednym z klawiszy Esc, Alt lub Meta, s± "
 "oznaczone Meta (M-). "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1287,15 +1383,15 @@ msgstr ""
 "Klawisze alternatywne ujêto w nawiasy:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "w³±cz/wy³±cz"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Klawisz niedozwolony w trybie przegl±dania"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1304,7 +1400,7 @@ msgstr ""
 "\n"
 "Bufor zapisany w %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1313,7 +1409,7 @@ msgstr ""
 "\n"
 "Bufor nie zosta³ zapisany w %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1322,262 +1418,268 @@ msgstr ""
 "\n"
 "Bufor nie zosta³ zapisany w %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Rozmiar okna za ma³y dla nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr "Sk³adnia: nano [OPCJE] [[+LINIA,KOLUMNA] PLIK]...\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Opcja\t\tD³uga opcja GNU\t\tZnaczenie\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opcja\t\tZnaczenie\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Pokazanie tej informacji"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+LINIA,KOLUMNA"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Rozpoczêcie w linii i kolumnie o podanych numerach"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "W³±cza rozumny przycisk \"w pocz±tek\""
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Tworzenie kopii zapasowych istniej±cych plików"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <katalog>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<katalog>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Katalog przechowywania unikatowych kopii zapasowych"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "U¿ywa tekstu pogrubionego zamiast negacji obrazu"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Przetwarza tabulacje na spacje"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "W³±czenie wielu buforów plikowych"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "U¿ywaj plików blokowania w stylu vim"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Rejestrowanie i odczyt historii wyszukiwania/zamiany ³añcuchów"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Bez korzystania z plików nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Naprawia problem pomylenia klawiszy klawiatury numerycznej"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "Wy³±cza dodanie znaku nowej linii na koñcu pliku"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Bez konwersji z formatu DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "U¿ycie dodatkowej linii do redagowania"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Zapisz i odczytaj pozycjê kursora"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <³añcuch>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<³añcuch>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Znacznik cytowania"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Tryb zastrze¿ony"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Przewija po liniach zamiast po pó³-ekranu"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#kol>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#kol>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "Ustawienie szeroko¶ci tabulacji na podan± ilo¶æ kolumn"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Szybkie oczyszczenie linii stanu"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Wypisanie wersji i zakoñczenie pracy"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "U¶ci¶la okre¶lenie granic s³ów"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <³añc>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<³añc>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "U¿ycie zadanej definicji sk³adni do pod¶wietlania"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Sta³e pokazywanie po³o¿enia kursora"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Naprawia problem pomylenia klawiszy Backspace/Delete"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Wy¶wietla ten tekst pomocy"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Automatyczne wciêcia nowych linii"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Wycina od kursora do koñca linii"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Bez pod±¿ania za dowi±zaniami symbolicznymi, nadpisywanie"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "W³±czenie myszy"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Bez odczytu pliku (tylko zapis)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <kat>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<kat>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Ustawienie katalogu pracy"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Zachowanie dzia³ania klawiszy XON (^Q) i XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Ignoruje b³êdy podczas rozruchu, jak np. b³êdy w pliku rc"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#kol>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#kol>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
 msgstr "Ustawia granice przewijania w podanej kolumnie"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Alternatywny program sprawdzania pisowni"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Automatyczny zapis przy koñczeniu pracy, bez pytania"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "W³±cza odwo³anie ogólne [EKSPERYMENTALNE]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Tryb przegl±dania (tylko odczyt)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Bez ³amania d³ugich linii"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Bez przewijania d³ugich linii"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "Bez pokazywania linii pomocy"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "W³±czenie zawieszania"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "W³±cza miêkkie przewijanie linii"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorowane, dla zgodno¶ci z Pico)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano wersja %s (skompilowana %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " E-mail: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1586,155 +1688,179 @@ msgstr ""
 "\n"
 " Skompilowane opcje:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Przepraszamy, obs³uga tej funkcji zosta³a wy³±czona"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Brak nazwy pliku"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Zapisaæ zmieniony bufor (ODPOWIED¬ \"Nie\" SPOWODUJE UTRATÊ ZMIAN) ? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 "Nie uda³o siê ponownie otworzyæ wej¶cie standardowe z klawiatury, "
 "przepraszamy\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Odczyt z wej¶cia standardowego. Aby przerwaæ, naci¶nij ^C\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Otrzymano SIGHUP lub SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "Aby powróciæ do nano, u¿yj \"fg\".\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "w³±czony(e)"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "wy³±czony(e)"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Nieznane polecenie"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "Zignorowano XON, hmm, hmm."
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "Zignorowano XOFF, hmm, hmm."
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "¯±dana wielko¶æ tabulacji \"%s\" nie jest poprawna"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "¯±dana pozycja ³amania linii \"%s\" nie jest poprawna"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Podaj '%s -h' aby uzyskaæ listê dostêpnych opcji.\n"
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Tt"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Ww"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Tak"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Wszystko"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Nie"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "B³±d w %s w linii %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argument %s ma niedomkniêty \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Wyra¿enia regularne musz± zaczynaæ siê i koñczyæ znakiem \""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "B³êdne wyra¿enie regularne \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Brak nazwy sk³adni"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "Sk³adnia \"none\" jest zarezerwowana"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Sk³adnia \"default\" nie przyjmuje rozszerzeñ"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Brak nazwy klawisza"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "przypisania klawiszy musz± zaczynaæ siê z \"^\", \"M\", lub \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Za krótka nazwa klawisza"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Nazwa klawisza musi zaczynaæ siê z \"^\", \"M\", lub \"F\""
+
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr "Podaj funkcje do jakiej przypisuje siê klawisz"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Podaj menu do jakiego przypisuje siê klawisz (lub \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr "Musisz podaæ menu (lub \"all\") w którym przypisuje siê klawisz"
+
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Nie mo¿na odwzorowaæ nazwy \"%s\" na funkcje"
+
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Nie mo¿na odwzorowaæ nazwy \"%s\" na menu"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:528
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Nie mo¿na odwzorowaæ \"%s\" na funkcje"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Brak funkcji '%s' w menu '%s'"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:543
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Nie mo¿na odwzorowaæ \"%s\" na menu"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Przepraszam, przyci¶niêcie \"%s\" nie mo¿e byæ przypisane ponownie"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:629
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "Przepraszam, \"%s\" nie jest prawid³owym przypisaniem"
+msgid "Error expanding %s: %s"
+msgstr "B³±d rozszerzenia %s: %s"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1749,114 +1875,172 @@ msgstr ""
 "\"black\", z opcjonalnym przedrostkiem \"bright\"\n"
 "dla kolorów pierwszoplanowych."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Nie mo¿na dodaæ polecenia koloru bez polecenia sk³adni"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Brak nazwy koloru"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Kolor t³a \"%s\" nie mo¿e byæ jaskrawy"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Brak wyra¿enia regularnego"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" wymaga odpowiadaj±cego mu \"end=\""
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Kolor t³a \"%s\" nie mo¿e byæ jaskrawy"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Nie mo¿na dodaæ regularnego wyra¿enia nag³ówka bez polecenia sk³adni"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Nie mo¿na dodaæ wyra¿enia regularnego bez polecenia sk³adni"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Brak nazwy ³añcucha magicznego"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "Nie mo¿na dodaæ analizatora sk³adni bez polecenia sk³adni"
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Brak nazwy analizatora sk³adni"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Nie mo¿na dodaæ analizatora sk³adni bez polecenia sk³adni"
+
+#: src/rcfile.c:1015
+#, fuzzy
+msgid "Missing formatter command"
+msgstr "Brak nazwy analizatora sk³adni"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "B³±d krytyczny: brak przypisanego klawisza dla funkcji \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr ""
+"B³±d krytyczny: brak przypisanego klawisza dla funkcji \"%s\".  "
+"Zakoñczenie.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
-msgstr "Zakoñczenie. Uruchom nano z opcj± -I aby dopasowaæ ustawienia\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
+msgstr "Je¶li trzeba, uruchom nano z opcj± -I aby dopasowaæ ustawienia.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Nie znaleziono sk³adni \"%s\" do rozszerzenia"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "Poliecenie \"%s\" nie jest dozwolone w pliku do³±czonym"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sk³adnia \"%s\" nie ma ustawieñ kolorów"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "Niezrozumia³e polecenie \"%s\""
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Brak znacznika"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Brak opcji"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "Opcja \"%s\" wymaga argumentu"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Opcja nie jest poprawnym ³añcuchem wielobajtowym"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Wymagane s± nie-bia³e znaki"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Wymagane s± dwa jednobajtowych znaki"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Nie mo¿na zerowaæ znacznika \"%s\""
+msgid "Cannot unset option \"%s\""
+msgstr "Nie mo¿na zresetowaæ opcji \"%s\""
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Nieznany znacznik \"%s\""
+msgid "Unknown option \"%s\""
+msgstr "Nieznana opcja \"%s\""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Nie mogê znale¼æ swojego katalogu domowego!  Aj!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Naci¶nij return aby kontynuowaæ rozruch nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "Nie znaleziono \"%.*s%s\""
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Uwzgl.wielk.liter]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Wyr.reg.]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Wstecz]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (i zast±p) w zaznaczeniu"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (i zast±p)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Czy zast±piæ to wyst±pienie?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Zast±p przez"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -1864,19 +2048,20 @@ msgstr[0] "Zast±piono %lu wyst±pienie"
 msgstr[1] "Zast±piono %lu wyst±pienia"
 msgstr[2] "Zast±piono %lu wyst±pieñ"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Wprowad¼ numer linii, numer kolumny"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Niepoprawny numer linii lub kolumny"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "To nie nawias"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Brak nawiasu do pary"
 
@@ -1888,221 +2073,284 @@ msgstr "Znacznik ustawiony"
 msgid "Mark Unset"
 msgstr "Znacznik skasowany"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Nie ma nic w buforze odwo³ania"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
-"B³±d wewnêtrzny: nie mo¿na dopasowaæ linii %d. Proszê zapisaæ swoj± pracê"
+"B³±d wewnêtrzny: nie mo¿na dopasowaæ linii %d. Proszê zapisaæ swoj± pracê."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "tekst dodany"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "tekst usuniêty"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "przewijanie linii"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "po³±czenie linii"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "wyciêcie tekstu"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "wklejanie tekstu"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "³amanie linii"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "tekst wprowadzony"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "tekst zamieniony"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "B³±d wewnêtrzny: nieznany typ. Proszê zapisaæ swoj± pracê"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "B³±d wewnêtrzny: nieznany typ. Proszê zapisaæ swoj± pracê."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Odwo³ano operacjê (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Nic do powtórzenia!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
-"B³±d wewnêtrzny: Ustawianie powtórzenia nie powiod³o siê. Proszê zapisaæ "
-"swoj± pracê"
+"B³±d wewnêtrzny: ustawianie powtórzenia nie powiod³o siê. Proszê zapisaæ "
+"swoj± pracê."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Powtórzono operacjê (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
 msgstr "Nie mo¿na utworzyæ potoku"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Nie mo¿na rozwidliæ procesu"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 "B³±d wewnêtrzny: ustawianie wklejania nie powiod³o siê. Proszê zapisaæ swoj± "
 "pracê."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "B³±d wewnêtrzny: nieznany typ. Proszê zapisaæ swoj± pracê."
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Nieprawid³owy znacznik cytowania %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Mo¿na teraz cofn±æ justowanie!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Edytuj zast±pienie"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Nie mo¿na utworzyæ potoku"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Tworzenie listy b³êdnie napisanych s³ów, proszê czekaæ..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Nie mo¿na uzyskaæ wielko¶ci bufora potoku"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "B³±d podczas wywo³ywania \"spell\""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "B³±d podczas wywo³ywania \"sort -f\""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "B³±d podczas wywo³ywania \"uniq\""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Zakoñczono sprawdzanie pisowni"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "B³±d podczas wywo³ywania \"%s\""
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Wywo³anie sprawdzania pisowni, proszê zaczekaæ"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Niepowodzenie sprawdzania pisowni: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Niepowodzenie sprawdzania pisowni: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Brak analizatora sk³adni dla tego typu pliku!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Zapisaæ bufor przed sprawdzaniem sk³adni?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Sprawdzanie sk³adni, proszê zaczekaæ"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Otrzymano 0 poprawnych linii od polecenia: %s"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+"Ten komunikat dotyczy nie otworzonego pliku %s; otworzyæ go w nowym buforze?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Ostatni komunikat"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Pierwszy komunikat"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+#, fuzzy
+msgid "Invoking formatter, please wait"
+msgstr "Sprawdzanie sk³adni, proszê zaczekaæ"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sS³owa: %lu  Linii: %ld  Znaki: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "W zaznaczeniu:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "wprowadzanie dos³owne"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano brak³o pamiêci!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Wej¶cie Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Zmieniony "
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Przegl."
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "KAT:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Plik:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Ostrze¿enie: Plik nie zosta³ zablokowany; sprawd¼ uprawnienia katalogu?"
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "lin.%ld/%ld (%d%%), kol.%lu/%lu (%d%%), zn.%lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Edytor tekstu nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "wersja"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Stworzony przez:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Specjalne podziêkowania otrzymuj±:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation (Fundacja Wolnego Oprogramowania)"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Za ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "oraz wszyscy pozostali, o których zapomnieli¶my..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Dziêkujemy za korzystanie z nano!"
 
-#~ msgid "Error writing backup file %s: File owner mismatch"
-#~ msgstr "B³±d zapisu kopii zapasowej %s: niezgodno¶æ w³a¶ciciela pliku"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "B³±d wewnêtrzny: nie mo¿na dopasowaæ linii %ld. Proszê zapisaæ swoj± "
+#~ "pracê."
+
+#~ msgid "line wrap"
+#~ msgstr "przewijanie linii"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 6ea63c9..4ac1f06 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b1ecc80..52ca8d5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,121 +1,151 @@
-# Portugueses Translation for the nano textual domain
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Brazilian Portuguese translation for the nano
+# Copyright (C) 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 # João Victor Duarte Martins <jvdm@sdf.lonestar.org>, 2010.
+# Rafael Ferreira <rafael.f.f1@gmail.com>, 2014, 2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.99pre3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-04-07 10:02-0300\n"
-"Last-Translator: João Victor Duarte Martins <jvdm@sdf.lonestar.org>\n"
-"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-02-27 17:36-0300\n"
+"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
+"Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
+"net>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.7.4\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
-msgstr "Ir para o Diretório"
+msgstr "Ir para o diretório"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
-msgstr "Impossível mover-se fora de %s no modo restrito"
+msgstr "Não é possível mover-se para fora de %s no modo restrito"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
-msgstr "Erro na leitura %s: %s"
+msgstr "Erro ao ler %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "Impossível mover um diretório"
+msgstr "Não é possível mover um diretório"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(dir acima)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
-msgstr "Busca"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr "[Sensibilidade de Caixa]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr "[Expressão Regular]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr "[Retroceder]"
+msgstr "Pesquisa"
 
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
-msgstr "Busca Ajustada"
+msgstr "Pesquisa ajustada"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
-msgstr "Está é única ocorrência"
+msgstr "Esta é a única ocorrência"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
-msgstr "Nenhum padrão de busca atualmente"
+msgstr "Nenhum padrão de pesquisa atualmente"
+
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"Não foi possível determinar minha identidade para o arquivo de trava "
+"(getpwuid() falhou)"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Não foi possível determinar o hostname para o arquivo de trava: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Erro ao escrever o arquivo de trava %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Erro ao escrever o arquivo de trava %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Erro ao abrir o arquivo de trava %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "Erro ao ler o arquivo de trava %s: Leitura de dados insuficiente"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr "Arquivo %s está sendo editado (por %s com %s, PID %d). Continuar?"
 
-#: src/files.c:125
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Erro ao escrever o arquivo de trava: Diretório \"%s\" não existe"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "Impossível inserir a linha de fora do %s"
+msgstr "Não foi possível inserir a linha de fora de %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
-msgstr "Não há mais nenhum buffer de arquivos aberto"
+msgstr "Não há mais nenhum buffer de arquivos abertos"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Alternado para %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
-msgstr "Novo Buffer"
+msgstr "Novo buffer"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "%lu linha lida (Convertida do formato DOS e Mac)"
 msgstr[1] "%lu linhas lidas (Convertidas do formato DOS e Mac)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -130,14 +160,14 @@ msgstr[1] ""
 "%lu linhas lidas (Convertidas do formato DOS e Mac - Atenção: Sem permissão "
 "de escrita)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "%lu linha lida (Convertida do formato Mac)"
 msgstr[1] "%lu linhas lidas (Convertidas do formato Mac)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -150,14 +180,14 @@ msgstr[1] ""
 "%lu linhas lidas (Convertidas do formato Mac - Atenção: Sem permissão de "
 "escrita)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "%lu linha lida (Convertida do formato DOS)"
 msgstr[1] "%lu linhas lidas (Convertidas do formato DOS)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -170,810 +200,879 @@ msgstr[1] ""
 "%lu linhas lidas (Convertidas do formato DOS - Atenção: Sem permissão de "
 "escrita)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%lu linha lida"
 msgstr[1] "%lu linhas lidas"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] "%lu linha lida ( Atenção: Sem permissão de escrita)"
 msgstr[1] "%lu linhas lidas ( Atenção: sem permissão de escrita)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Lendo o arquivo"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
-msgstr "Novo Arquivo"
+msgstr "Novo arquivo"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" não encontrado"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" é um diretório"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" é um arquivo dispositivo"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Comando para execução no novo buffer [de %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Comando para execução [de %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Arquivo para inserção no novo buffer [de %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Arquivo para inserção [de %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
-msgstr "Tecla ilegal em modo não-multibuffer"
+msgstr "Tecla inválida em modo não-multibuffer"
+
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"Falha ao escrever o arquivo reserva, continuar salvando? (Diga N se não "
+"tiver certeza)"
 
-#: src/files.c:1486
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "Impossível escrever fora de %s"
+msgstr "Não foi possível escrever fora de %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
-msgstr "Impossível acrecentar uma ligação simbólica com a opção --nofollow"
+msgstr ""
+"Não foi possível adicionar uma ligação simbólica com a opção --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Erro ao escrever o arquivo reserva %s : %s"
+msgstr "Erro ao escrever o arquivo reserva %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Muitos arquivos reserva?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Erro ao escrever %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Erro ao escrever o arquivo temporário: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
-msgstr[0] "Escrito %lu linha"
-msgstr[1] "Escrito %lu linhas"
+msgstr[0] "Escrita %lu linha"
+msgstr[1] "Escritas %lu linhas"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Formato DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Formato Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Arq Reserva]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
-msgstr "Pre-Adicionar seleção para o Arquivo"
+msgstr "Pré-adicionar seleção para o arquivo"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "Adicionar seleção para o Arquivo"
+msgstr "Adicionar seleção para o arquivo"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
-msgstr "Escrever a Seleção para o Arquivo"
+msgstr "Escrever a seleção para o arquivo"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
-msgstr "Nome Arquivo para Pré-Adicionar"
+msgstr "Nome arquivo para pré-adicionar"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
-msgstr "Arquivo para Adicionar ao"
+msgstr "Nome do arquivo para adicionar a"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
-msgstr "Nome do Arquivo para Gravar"
+msgstr "Nome do arquivo para gravar"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
-msgstr "Arquivo já existe, SOBRESCREVER ?"
+msgstr "Arquivo já existe, SOBRESCREVER ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
-msgstr "Salvar o Arquivo com um NOME DIFERENTE ?"
+msgstr "Salvar o arquivo com um NOME DIFERENTE ? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 "O arquivo foi modificado desde a última vez que você abriu, continuar "
 "salvando ? "
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(mais)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Pressione Enter para continuar a inicialização do nano\n"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Cancelar"
+"Pressione Enter para continuar\n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "Substituir"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Não foi possível criar o diretório %s: %s\n"
+"É necessário para salvar/carregar posições do cursor ou histórico de "
+"pesquisa.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Sem Substituição"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"Caminho %s não é um diretório e precisa ser.\n"
+"Nano não poderá carregar ou salvar posições do cursor ou histórico de "
+"pesquisa.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Sens de Caixa"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Detectado um arquivo de histórico (%s) de nano legado que eu tentei mover\n"
+"para a localização preferida (%s), mas encontrei um erro: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "[Contrário]"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Detectado um arquivo de histórico de nano legado (%s) que eu movi\n"
+"para a localização preferida (%s)\n"
+"(veja o FAQ do nano sobre essa alteração)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Expressão Regular"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Sair"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "RegisAnt"
+#: src/global.c:478
+msgid "Close"
+msgstr "Fechar"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "PróxRegis"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Colar txt"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Ir para o Próximo"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Desjustifi"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
-msgstr "OndeTá o Próx."
-
-#: src/global.c:457
-msgid "First File"
-msgstr "Primeira Linha"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Última Linha"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Para Arquivos"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Formato DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Formato Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Anexar"
+msgstr "OndeTá o próx."
 
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Pre-anexar"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Arquivo Reserva"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Executar Comando"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Ir P/ o Dir"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Ajuda"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Sair"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Onde está?"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Pág Anter"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Próx Pág"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Prim Linha"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Substituir"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Últ Linha"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Ir p/ linha"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Suspender"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Linha ant"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Ini de Par"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Prox linha"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Fim de Par"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Ler o arq"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "JstifiCmpl"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Atualiz"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Inserir Arq"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Ir P/ Linha"
-
-#: src/global.c:500
-msgid "Justify the current paragraph"
-msgstr "Justificar o parágrafo atual"
-
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:507
+msgid "Justify the current paragraph"
+msgstr "Justifica o parágrafo atual"
+
+#: src/global.c:509
 msgid "Cancel the current function"
-msgstr "Cancelar a função atual"
+msgstr "Cancela a função atual"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
-msgstr "Abrir texto de ajuda"
+msgstr "Abre este texto de ajuda"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
-msgstr "Fechar o buffer do arquivo atual / Sair do nano"
+msgstr "Fecha o buffer do arquivo atual / Sai do nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
-msgstr "Sair do nano"
+msgstr "Sai do nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
-msgstr "Escrever o arquivo atual no disco"
+msgstr "Escreve o arquivo atual no disco"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
-msgstr "Inserir outro arquivo no atual"
+msgstr "Insere outro arquivo no atual"
 
-# 'string' precisa de um referência direta no português
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "Procurar por uma string ou um expressão regular"
+msgstr "Procura por um texto ou uma expressão regular"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Ir para a tela anterior"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Pesquisa por um texto"
 
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "Ir para a próxima tela"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Vai uma tela acima"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Vai uma tela abaixo"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "Recortar a linha atual e guardá-la no buffer-de-transferência"
+msgstr "Recorta a linha atual e guardá-la no buffer-de-transferência"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "Colar do buffer-de-transferência para a linha atual"
+msgstr "Cola do buffer-de-transferência para a linha atual"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
-msgstr "Mostrar a posição do cursor"
+msgstr "Mostra a posição do cursor"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
-msgstr "Chamar pelo verificador ortográfico, se disponível"
+msgstr "Chama o verificador ortográfico, se disponível"
 
-# 'string' precisa de um referência direta no português
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "Substituir uma string ou expressão regular"
+msgstr "Substitui um texto ou expressão regular"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
-msgstr "Ir para linha e coluna número"
+msgstr "Vai para linha e coluna número"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Marcar o texto na posicação do cursor"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Marca o texto iniciando na posição do cursor"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr "Repetir a última busca"
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Repete a última pesquisa"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Copiar a linha atual e guardá-la no buffer-de-transferência"
+msgstr "Copia a linha atual e guardá-la no buffer-de-transferência"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
-msgstr "Avançar o recuo da linha atual"
+msgstr "Avança o recuo da linha atual"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "Recuar a linha atual"
+msgstr "Recua a linha atual"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr "Desfazer a última operação"
+msgstr "Desfaz a última operação"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr "Refazer a última operação desfeita"
+msgstr "Refaz a última operação desfeita"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
-msgstr "Avançar em um caractere"
+msgstr "Avança em um caractere"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
-msgstr "Voltar em um caractere"
+msgstr "Volta em um caractere"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "Avançar em uma palavra"
+msgstr "Avança em uma palavra"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "Retroceder em uma palavra"
+msgstr "Retrocede em uma palavra"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
-msgstr "Ir para a última linha"
+msgstr "Vai para a última linha"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
-msgstr "Ir para a próxima linha"
+msgstr "Vai para a próxima linha"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
-msgstr "Ir para o início da linha atual"
+msgstr "Vai para o início da linha atual"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
-msgstr "Ir para o fim da linha atual"
+msgstr "Vai para o fim da linha atual"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "Ir para o início do parágrafo; depois para o parágrafo anterior"
+msgstr "Vai para o início do parágrafo; depois para o parágrafo anterior"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Ir para o fim do parágrafo; depois para o próximo parágrafo"
+msgstr "Vai para o fim do parágrafo; depois para o próximo parágrafo"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "Ir para a primeira linha do arquivo"
+msgstr "Vai para a primeira linha do arquivo"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "Ir para a última linha do arquivo"
+msgstr "Vai para a última linha do arquivo"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "Ir para o fechamento do parenteses/colchetes/chaves"
+msgstr "Vai para o fechamento do parênteses/colchetes/chaves"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr "Rolar uma linha acima sem o cursor"
+msgstr "Rola uma linha acima sem o cursor"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr "Rolar uma linha abaixo sem o cursor"
+msgstr "Rola uma linha abaixo sem o cursor"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
-msgstr "Trocar para o buffer de arquivo anterior"
+msgstr "Troca para o buffer de arquivo anterior"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
-msgstr "Trocar para o próximo buffer de arquivo"
+msgstr "Troca para o próximo buffer de arquivo"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr "Inserir caractere(s) literalmente"
+msgstr "Insere caractere(s) literalmente"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "Inserir um caractere tabular na posição do cursor"
+msgstr "Insere um caractere tabular na posição do cursor"
 
 #: src/global.c:581
 msgid "Insert a newline at the cursor position"
-msgstr "Inserir quebra de linha na posição do cursor"
+msgstr "Insere quebra de linha na posição do cursor"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
-msgstr "Apagar o caractere sob o cursor"
+msgstr "Apaga o caractere sob o cursor"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
-msgstr "Apagar o caractere a esquerda do cursor"
+msgstr "Apaga o caractere a esquerda do cursor"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Recortar do cursor até o fim da linha"
+msgstr "Recorta do cursor até o fim da linha"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
-msgstr "Justificar o arquivo inteiro"
+msgstr "Justifica o arquivo inteiro"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
-msgstr "Contar o número de palavras, linhas e caracteres"
+msgstr "Conta o número de palavras, linhas e caracteres"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
-msgstr "Atualizar (re-desenhar) a tela atual"
+msgstr "Atualiza (re-desenha) a tela atual"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr "Suspender o editor (se a suspensão estiver habilitada)"
+msgstr "Suspende o editor (se a suspensão estiver habilitada)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr "Ativar sensibilidade de caixa na busca"
+msgstr "Ativa sensibilidade de caixa na pesquisa"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "Inverter a direção da busca"
+msgstr "Inverte a direção da pesquisa"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
-msgstr "Ativar o uso de expressões regulares"
+msgstr "Ativa o uso de expressões regulares"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "Lembrar a última string de busca/substituição"
+msgstr "Lembra o último texto de pesquisa/substituição"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "Lembrar a ultima string de busca/substituição"
+msgstr "Lembra o ultimo texto de pesquisa/substituição"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
-msgstr "Ir para o navegador de arquivo"
+msgstr "Vai para o navegador de arquivo"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "Ativar o uso do formato DOS"
+msgstr "Ativa o uso do formato DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "Ativar o uso do formato Mac"
+msgstr "Ativa o uso do formato Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
-msgstr "Ativar ajutamento"
+msgstr "Ativa ajuntamento"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr "Ativar pré-ajuntamento"
+msgstr "Ativa pré-adicionamento"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
-msgstr "Ativar cópia de segurança do arquivo original"
+msgstr "Ativa cópia de segurança do arquivo original"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
-msgstr "Executar um comando externo"
+msgstr "Executa um comando externo"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "Ativar o uso de um novo buffer"
+msgstr "Ativa o uso de um novo buffer"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
-msgstr "Sair do navegador de arquivos"
+msgstr "Sai do navegador de arquivos"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
-msgstr "Ir para o primeiro arquivo na lista"
+msgstr "Vai para o primeiro arquivo na lista"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
-msgstr "Ir para o último arquivo na lista"
+msgstr "Vai para o último arquivo na lista"
 
-#: src/global.c:641
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "Vai para o prévio arquivo na lista"
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "Ir para o próximo arquivo na lista"
+msgstr "Vai para o próximo arquivo na lista"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Vai para o diretório"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Chama o lintador, se disponível"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Vai para a mensagem anterior do lintador"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Vai para a próxima mensagem do lintador"
 
 #: src/global.c:642
-msgid "Go to the previous file in the list"
-msgstr "Ir para o prévio arquivo na lista"
+msgid "Invoke formatter, if available"
+msgstr "Chama o formatador, se disponível"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Ir para o diretório"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Ajuda"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Fechar"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Cancelar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Gravar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Ir p/ o dir"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Recort txt"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Justificar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Ler o Arq"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "VerfOrtog"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Recort Txt"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Lintar"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "DesJustifi"
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Formatador"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Colar Txt"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Sens de caixa"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Expressão regular"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "[Contrário]"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Sem substituição"
+
+#: src/global.c:770
 msgid "Cur Pos"
-msgstr "Pos Atual"
+msgstr "Pos atual"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Para Spell"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Pág anter"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Próx pág"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Prim linha"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Últ linha"
+
+# Aplica parênteses no texto
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Parênteses"
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
-msgstr "Marcar Txt"
+msgstr "Marcar txt"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
-msgstr "Copiar Txt"
+msgstr "Copiar txt"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
-msgstr "Alinhar Txt"
+msgstr "Alinhar txt"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "Desalinhar Txt"
+msgstr "Desalinhar txt"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Refazer"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Avançar"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Voltar"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Prx Palvr"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Avançar"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
-msgstr "Palvr Ant"
+msgstr "Palvr ant"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Linha Ant"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Prox Linha"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Prx palvr"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Local"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Fim"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Encontrar Outro Parenteses"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Ini de par"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Fim de par"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Rolar para cima"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Rolar para baixo"
 
-#: src/global.c:856
-msgid "Previous File"
-msgstr "Próximo Arquivo"
-
 #: src/global.c:858
+msgid "Prev File"
+msgstr "Próximo arquivo"
+
+#: src/global.c:860
 msgid "Next File"
-msgstr "Arquivo Anterior"
+msgstr "Arquivo anterior"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Entrada Literal"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Entrada literal"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Tecla BACKSPACE"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "RecortarAtéOFim"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Contagem de palavras"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Suspender"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "RegisAnt"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "PróxRegis"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Ir para o próximo"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Formato DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Formato Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Anexar"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Pré-anexar"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Arquivo reserva"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Executar comando"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Para arquivos"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Primeira linha"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Última linha"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Msg Lint Ant"
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "Próx Msg Lint"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
-msgstr "Modo Ajuda"
+msgstr "Modo ajuda"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Mostra da posição do cursor constante"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "Uso de mais de uma linha para edição"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
-msgstr "Rolagem Macia"
+msgstr "Rolagem suave"
+
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Ajuste suave de linhas compridas"
 
-#: src/global.c:1375
+#: src/global.c:1237
 msgid "Whitespace display"
-msgstr "Mostrar espaços-vazios"
+msgstr "Mostra espaços vazios"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
-msgstr "Marcação Colorida de Sintaxe"
+msgstr "Marcação colorida de sintaxe"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Tecla HOME inteligente"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
-msgstr "Indentação Automática"
+msgstr "Recuo automática"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
-msgstr "Recortar até o fim"
+msgstr "Recorta até o fim"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Ajuste de linhas longas"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Ajuste rígido de linhas compridas"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Conversão de tabulações para espaços"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
-msgstr "Reservar os Arquivos"
+msgstr "Reservar os arquivos"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Múltiplos buffers de arquivos"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
-msgstr "Suporte ao Rato"
+msgstr "Suporte ao mouse"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Sem conversões do formato DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
-msgstr "Suspenção"
-
-# Soft line wrapping?
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Ajuste de linhas longas"
+msgstr "Suspensão"
 
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -985,18 +1084,17 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"Texto de Ajuda do Comando de Busca\n"
+"Texto de Ajuda do Comando de Pesquisa\n"
 "\n"
-" Entre com as palavras ou caracteres que você gostaria de procurar, e\n"
-"então pressione <Enter>.  Se existir combinações para o texto que você\n"
-"inseriu a tela irá se atualizar para a localização da combinação mais\n"
-"próxima.\n"
+" Insira as palavras ou caracteres que você gostaria de pesquisar e, então, "
+"pressione Enter. Se existir ocorrências para o texto que você inseriu, a "
+"tela será atualizada para a localização da ocorrência mais próxima.\n"
 "\n"
-" A string de busca anterior irá aparecer em parenteses depois da entrada de "
-"busca. Pressionando Enter sem inserir nenhum texto irá fazer a busca "
-"anterior.   "
+" O texto da pesquisa anterior aparecerá em parênteses logo após a entrada de "
+"pesquisa. Pressionando Enter sem inserir nenhum texto executará a pesquisa "
+"anterior.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1004,13 +1102,13 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
-"Se você selecionou texto com o marcador e então fez uma busca para "
-"substituição somente ocorrências do texto marcado serão substituídas.\n"
+"Se você selecionou um texto com o marcador e então fez uma pesquisa para "
+"substituição, apenas as ocorrências do texto marcado serão substituídas.\n"
 "\n"
-"As seguintes teclas de função vão estar disponíveis no modo de Busca:\n"
+" As seguintes teclas de função vão estar disponíveis no modo de pesquisa:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1023,14 +1121,14 @@ msgid ""
 msgstr ""
 "Texto de Ajuda do Ir Para Linha\n"
 "\n"
-" Entre com o número da linha que você quer ir e pressione <Enter>.  Se não\n"
-"existem linhas de texto para o número que você inseriu então você será\n"
-"enviado para a última linha do arquivo.\n"
+" Insira o número da linha para a qual você deseja ir e pressione Enter.  Se "
+"não existirem linhas de texto para o número que você inseriu, então você "
+"será enviado para a última linha do arquivo.\n"
 "\n"
 " As seguintes teclas de funções estão disponíveis no modo Ir Para Linha:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1053,7 +1151,7 @@ msgstr ""
 "irá ocorrer em um buffer separado (utilize Meta-< e > para alternar entre os "
 "bufferes de arquivo).  "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1061,16 +1159,14 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
-"Se você precisa de um outro buffer vazio basta não indicar nenhum arquivo ou "
-"indicar o nome de um arquivo que não existe e precione Enter.\n"
+"Se você precisar de um outro buffer vazio, basta não indicar nenhum arquivo "
+"ou indicar o nome de um arquivo que não existe e pressione Enter.\n"
 "\n"
 " As seguintes teclas de funções estão disponíveis no modo de Inserção de "
 "Arquivo:\n"
 "\n"
 
-# Talvez a tradução de 'prompted' não está correta.
-# Foi notificado na lista do ldp-br.
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1087,19 +1183,18 @@ msgid ""
 msgstr ""
 "Texto de Ajuda do Escrever Arquivo\n"
 "\n"
-" Digite o nome pelo qual você gostaria de salvar o arquivo atual e precione\n"
-"<Enter> para salvá-lo.\n"
+" Digite o nome com o qual você gostaria de salvar o arquivo atual e "
+"pressione Enter para salvá-lo.\n"
 "\n"
-" Se você selecionou texto com a marcação, você será questionado para salvar\n"
-"somente a porção selecionada para um arquivo separado.  Para reduzir as\n"
-"chances de sobrescrever o arquivo atual com a parte selecionada dele o nome\n"
+" Se você selecionou texto com a marcação, você será solicitado a salvar "
+"somente a porção selecionada para um arquivo separado.  Para reduzir as "
+"chances de sobrescrever o arquivo atual com a parte selecionada dele, o nome "
 "padrão não é o do arquivo atual nesse modo.\n"
 "\n"
-"  As seguintes teclas de funções estão disponíveis no modo Escrever "
-"Arquivo:\n"
+" As seguintes teclas de funções estão disponíveis no modo Escrever Arquivo:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1114,18 +1209,16 @@ msgid ""
 msgstr ""
 "Texto de Ajuda do Navegador de Arquivos\n"
 "\n"
-" O Navegador de arquvivos é utilizado para visualmente buscar a estrutura "
-"do\n"
-"diretório para selecionar um arquivo para leitura ou gravação.  Você pode\n"
-"utilizar as teclas de setas ou <Page Up/Down> para navegar através dos \n"
-"arquivos, e S ou <Enter> para escolher um arquivo,  ou entrar em um "
-"diretório,\n"
-"selecionado.  Para subir um nível,  selecione o diretório chamado \"..\" no\n"
+" O navegador de arquivos é utilizado para visualmente pesquisar a estrutura "
+"do diretório para selecionar um arquivo para leitura ou gravação.  Você pode "
+"utilizar as teclas de setas ou <Page Up/Down> para navegar através dos "
+"arquivos, e S ou Enter para escolher um arquivo,  ou entrar em um diretório, "
+"selecionado.  Para subir um nível,  selecione o diretório chamado \"..\" no "
 "topo da lista de arquivos.\n"
 "\n"
 " As seguintes teclas de funções estão disponíveis no Navegador de Arquivos:\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1138,27 +1231,26 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"Texto de Ajuda do Comando de Busca\n"
+"Texto de Ajuda do Comando de Pesquisa\n"
 "\n"
-" Insira as palavras ou caracteres que você gostaria de procurar e\n"
-"então pressione <Enter>.  Se existir combinações para o texto que você\n"
-"inseriu a tela irá se atualizar para a localização da combinação mais\n"
-"próxima.\n"
+" Insira as palavras ou caracteres que você gostaria de procurar e, então, "
+"pressione Enter.  Se existir combinações para o texto que você inseriu, a "
+"tela será atualizada para a localização da combinação mais próxima.\n"
 "\n"
-" A string da busca anterior irá aparecer em parenteses depois do prompt\n"
-"de busca.  Pressionar <Enter> sem inserir nenhum texto irá fazer uma busca\n"
-"com esta string anterior.\n"
+" O texto da pesquisa anterior aparecerá entre parênteses logo após o prompt "
+"de pesquisa.  Pressionar Enter sem inserir nenhum texto faz uma pesquisa com "
+"o texto da pesquisa anterior.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 " As seguintes teclas de função estão disponíveis no modo de Navegação de "
-"Busca:\n"
+"Pesquisa:\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1174,15 +1266,14 @@ msgstr ""
 "\n"
 " Insira o nome do diretório que você gostaria de navegar.\n"
 "\n"
-" Se a complentação <TAB> não foi desabilitada, você pode utilizar a\n"
-"a tecla <TAB> para (tentar) completar automaticamente o nome do\n"
-"diretório.\n"
+" Se a complentação <TAB> não foi desabilitada, você pode utilizar a tecla "
+"<TAB> para (tentar) completar automaticamente o nome do diretório.\n"
 "\n"
-" As seguinte teclas de funções estão disponíveis no modo\n"
-"Navegador de Ida à Diretórios:\n"
+" As seguinte teclas de funções estão disponíveis no modo Navegador de Ida à "
+"Diretórios:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1195,19 +1286,19 @@ msgid ""
 " The following function keys are available in Spell Check mode:\n"
 "\n"
 msgstr ""
-"Texto de Ajuda do Teste de Ortografia\n"
+"Texto de Ajuda da Verificação Ortográfica\n"
 "\n"
-" O verificador ortografico verifica todo o texto no arquivo\n"
-"atual.  Quando uma palavra desconhecida é encontrada ela é marcada e \n"
-"pode ser substituida por outra.  Então será feita a pergunta se a\n"
-"palavra deve ser substituída por todo o texto, ou, se você selecionou\n"
-"texto com a marcação, no texto marcado.\n"
+" O verificador ortográfico verifica todo o texto no arquivo atual.  Quando "
+"uma palavra desconhecida é encontrada, ela é destacada e pode ser "
+"substituída por outra.  Então, será feita a pergunta se a palavra deve ser "
+"substituída por todo o texto ou, se você selecionou texto com a marcação, no "
+"texto selecionado.\n"
 "\n"
-"As seguinte teclas de funções estão disponíveis no modo Teste de \n"
-"Ortografia:\n"
+"As seguinte teclas de funções estão disponíveis no modo Verificação "
+"Ortográfica:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1218,17 +1309,18 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-"Testo de ajuda da Execução de Comando\n"
+"Texto de Ajuda da Execução de Comando\n"
 "\n"
-" Este modo permite que você insira a saída de um comando executado pela "
-"cápsula (shell) dentro do buffer atual (ou em um novo buffer no modo de "
-"multiplos buffers).  Se você precisa de uma outra janela, embranco, insira "
+" Este modo permite que você insira a saída de um comando executado pelo "
+"shell dentro do buffer atual (ou em um novo buffer no modo de múltiplos "
+"buffers de arquivos).  Se você precisa de um outro buffer vazio, insira "
 "nenhum comando.\n"
 "\n"
-" As seguintes teclas de funções estão disponíveis neste modo:\n"
+" As seguintes teclas de funções estão disponíveis no modo Execução de "
+"Comando:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1239,16 +1331,17 @@ msgid ""
 "showing the file being edited.  The status line is the third line from the "
 "bottom and shows important messages.  "
 msgstr ""
-"Texto principal de ajuda do nano\n"
+"Texto Principal de Ajuda do Nano\n"
 "\n"
 " O editor nano foi projetado para simular as funcionalidades e a facilidade "
 "de uso do editor de texto UW Pico.  O editor possui quatro seções "
 "principais.  A linha superior mostra a versão do programa, o arquivo sendo "
-"editado no momento e se este foi modificado ou não.  Depois está a janela "
-"principal de edição exibindo o arquivo que está sendo editado.  A linha de "
-"estado é a terceira, mostrando mensagens importantes.  "
+"editado no momento e se este foi modificado ou não.  Em seguida está a "
+"janela principal de edição exibindo o arquivo que está sendo editado.  A "
+"linha de status é a terceira de baixo para cima, mostrando mensagens "
+"importantes.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1262,12 +1355,12 @@ msgstr ""
 "\n"
 " A notação para os atalhos é a seguinte: Sequências com teclas Ctrl são "
 "apresentadas com um circunflexo (^) e podem ser executadas tanto com a tecla "
-"Controle (Ctrl) ou pressionando a tecla Escape (Esc) duas vezes.  Sequências "
+"Control (Ctrl) ou pressionando a tecla Escape (Esc) duas vezes.  Sequências "
 "com teclas de Escape são apresentadas com o símbolo Meta (M-) e podem ser "
 "executadas com as teclas Esc, Alt ou Meta, dependendo da sua configuração de "
 "teclado.   "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1275,21 +1368,21 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
-"Pressionar Esc duas vezes e digitando um número com três digitos decimais de "
-"000 até 255 irá inserir o caractere com o valor conrespondente.  As "
-"seguintes sequências estão disponíveis na janela de edição principal.  "
-"Teclas alternativas são mostradas em parenteses:\n"
+"Pressionar Esc duas vezes e, então, digitar um número com três dígitos "
+"decimais de 000 até 255 fará inserir o caractere com o valor "
+"correspondente.  As seguintes sequências estão disponíveis na janela de "
+"edição principal.  Teclas alternativas são mostradas em parênteses:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "habilitado/desabilitado"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
-msgstr "Tecla ilegal no modo de visualização"
+msgstr "Tecla inválida no modo de visualização"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1298,7 +1391,7 @@ msgstr ""
 "\n"
 "Buffer escrito em %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1307,7 +1400,7 @@ msgstr ""
 "\n"
 "Buffer não foi escrito em %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1316,426 +1409,454 @@ msgstr ""
 "\n"
 "Buffer não foi escrito: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Tamanho da tela muito pequeno para o nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
-"Uso: nano [OPÇÕES] [[+LINHA, COLUNA] ARQUIVO]...\n"
+"Uso: nano [OPÇÕES] [[+LINHA,COLUNA] ARQUIVO]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr "Opção\t\tOpção Longa GNU\t\tSignificado\n"
+msgstr "Opção\t\tOpção GNU longa\t\tSignificado\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Opção\t\tSignificado\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Mostrar essa mensagem"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+LINHA,COLUNA"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
-msgstr "Começar na linha numero LINHA, coluna COLUNA"
+msgstr "Começa na linha número LINHA, coluna COLUNA"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
-msgstr "Habilitar tecla <HOME> inteligente"
+msgstr "Habilita tecla <HOME> inteligente"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
-msgstr "Salvar cópias reserva de arquivos que existem"
+msgstr "Salva cópias reserva de arquivos que existem"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-E <dir>"
 
-# uma alternativa melhor para backup aqui?
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<dir>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Diretório para salvar arquivos únicos de reserva"
 
 # É necessário melhorar aqui.
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Usa negrito ao invés de texto em video inverso"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Converte tabulações digitadas em espaços"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
-msgstr "Permitir múltiplos buffers de arquivos"
+msgstr "Permite múltiplos buffers de arquivos"
+
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Usa arquivos de travas (estilo vim)"
 
-#: src/nano.c:845
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "Gravar e ler histórico das strings de busca/substituição"
+msgstr "Grava & lê histórico das strings de pesquisa/substituição"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
-msgstr "Não olhar o arquivo nanorc"
+msgstr "Não olha o arquivo nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
-msgstr "Corrigir a confusão com o teclado numérico"
+msgstr "Corrige confusão com o teclado numérico"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
-msgstr "Não adicionar retorno de carro nos finais das linhas"
+msgstr "Não adiciona nova-linha ao final das linhas dos arquivos"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
-msgstr "Não converter arquivos do formato DOS/Mac"
+msgstr "Não converte arquivos do formato DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
-msgstr "Utiliza um ou duas linhas para edição"
+msgstr "Utiliza um ou mais linhas para edição"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Registra & lê a localização da posição do cursor"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
-msgstr "Citando strings"
+msgstr "Texto de citação"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Modo restrito"
 
 # revisar: meia tela
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr "Rolar linhas ao invés de meia tela"
+msgstr "Rola linhas ao invés de meia tela"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#cols>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#cols>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
-msgstr "Modificar o tamanho da tabulação para #cols"
+msgstr "Modifica o tamanho da tabulação para #cols"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
-msgstr "Remoção rápida da barra de estado"
+msgstr "Remoção rápida da barra de status"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Imprime informação de versão e fecha"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Detecção mais precisa dos limites das palavras"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax <str>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "Definição de sintaxe para inserção de cores"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
-msgstr "Mostrar a posição do cursos constantemente"
+msgstr "Mostra a posição do cursor constantemente"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
-msgstr "Corrige o problema de confusão entre a tecla Backspace/Delete"
+msgstr "Corrige confusão entre Backspace/Delete"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Mostra esse texto de ajuda"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
-msgstr "Indentar automaticamente nova linhas"
+msgstr "Avança o recuo automaticamente em nova linhas"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "Recortar do cursor até o fim da linha"
+msgstr "Recorta do cursor até o fim da linha"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
-msgstr "Não seguir atalhos simbólicos, sobrescrever"
+msgstr "Não segue links simbólicos, e sim sobrescreve"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
-msgstr "Habilitar o uso do mouse"
+msgstr "Habilita o uso do mouse"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Não lê o arquivo (apenas o escreve)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <dir>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
-msgstr "Indicar o diretório de trabalho"
+msgstr "Define o diretório de trabalho"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
-msgstr "Preservar as teclas XON (^Q) e XOFF (^S)"
+msgstr "Preserva as teclas XON (^Q) e XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
-"Ignorar silenciosamente problemas na inicialização como erros no arquivo rc"
+msgstr "Ignora silenciosamente problemas como erros no arquivo rc"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#colun>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#colun>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Modificar o ponto de agrupamento na coluna #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Define o ponto de ajuste rígido na coluna #cols"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
-msgstr "Habilitar um verificador ortográfico alternativo"
+msgstr "Habilita um verificador ortográfico alternativo"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "Salvar automaticamente ao sair, não perguntar"
-
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Permitir desfazer genérico [EXPERIMENTAL]"
+msgstr "Salva automaticamente ao sair, sem perguntar"
 
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
-msgstr "Modo Visualização (somente leitura)"
+msgstr "Modo visualização (somente leitura)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Não ajuste linhas compridas"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Não faz ajuste rígido em linhas compridas"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
-msgstr "Não as duas linhas de ajuda"
+msgstr "Não mostra as duas linhas de ajuda"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
-msgstr "Permitir suspenção"
+msgstr "Permite suspensão"
 
 # Soft line wrapping?
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "Habilita ajuste de linhas longas"
+msgstr "Habilita ajuste suave de linhas compridas"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorado, para compatibilidade com o Pico)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr "GNU nano versão %s (compilado %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 "\n"
-" Opções de compilação:"
+" Opções compiladas:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
-msgstr "Desculpe, suporte para essa função foi desabilitado"
+msgstr "Desculpe, suporte para esta função foi desabilitado"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Nenhum nome de arquivo"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Salvar o buffer modificado (RESPONDER \"Não\" IR� DESTRUIR MODIFICAÇÕES) ?"
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr "Não foi possível reabrir a stdin do teclado, desculpe\n"
+msgstr "Não foi possível reabrir a entrada padrão do teclado, desculpe\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Lendo de stdin, ^C para abortar\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Recebi SIGHUP ou SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Utilize \"fg\" para retornar ao nano\n"
+msgstr "Utilize \"fg\" para retornar ao nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "habilitado"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "desabilitado"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Comando desconhecido"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorado, mumble mumble."
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorado, mumble mumble"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Tamanho \"%s\" de tabulação é inválido"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Pedido de tamanho \"%s\" inválido"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Digite \"%s -h\" para uma lista de opções disponíveis.\n"
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
-msgstr "Ss"
+msgstr "SsYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Sim"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Todos"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Não"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Erro no %s na linha %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "Argumento '%s' possui inderterminado \""
+msgstr "Argumento \"%s\" possui indeterminado \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Expressão regular deve começar e terminar com um caractere \""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Expressão regular errônea \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Falta o nome da sintaxe"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "A sintaxe \"none\" é reservada"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "A sintaxe padrão não deve conter extensões"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "Falta o nome da chave"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "vínculos de teclas devem começar com \"^\", \"M\" ou \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Nome da tecla é muito curta"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Nome da tecla deve começar com \"^\", \"M\", or \"F\""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr "É preciso especificar uma função para o vínculo da tecla"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "É preciso especificar um menu para o vínculo da tecla (ou \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
+"É preciso especificar um menu (ou \"all\") para vincular/desvincular a tecla"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:489
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Não foi possível mapear o nome \"%s\" com uma função"
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Não foi possível mapear o nome \"%s\" a uma função"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Não foi possível mapear o nome \"%s\" com um menu"
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Não foi possível mapear o nome \"%s\" a um menu"
 
-# TODO keystr pode ser traduzido?
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "Desculpe, keystr \"%s\" é um vínculo ilegal"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Função \"%s\" não existe no menu \"%s\""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Desculpe, a sequência \"%s\" ter seu vínculo redefinido"
+
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Erro ao expandir %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1744,145 +1865,203 @@ msgid ""
 "\"black\", with the optional prefix \"bright\"\n"
 "for foreground colors."
 msgstr ""
-"Cor %s não foi entendida.\n"
+"Cor \"%s\" não foi entendida.\n"
 "Cores válidas são \"green\" (verde), \"red\" (vermelho), \n"
 "\"blue\" (azul), \"yellow\" (amarelo), \"cyan\" (ciano), \n"
-"\"magente\" (maguenta) e \"black\" (preto), com o prefixo \n"
-"opcional \"bright\" (claro) para cores de fundo."
+"\"magente\" (magenta) e \"black\" (preto), com o prefixo \n"
+"opcional \"bright\" (claro) para cores de primeiro plano."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
-msgstr "Impossível adicionar um diretiva de cor sem um diretiva de sintaxe"
+msgstr "não é possível adicionar um comando de cor sem um comando de sintaxe"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Falta o nome da cor"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Cor do fundo \"%s\" não pode ser clara"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Falta a expressão regular"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\\\"start=\\\" precisa de um correspondende \\\"end=\\\""
+msgstr "\"start=\" precisa de um \"end=\" correspondente"
+
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Cor do fundo \"%s\" não pode ser clara"
 
-# TODO analisar no programa se isso faz sentido
-#: src/rcfile.c:804
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
-msgstr "Impossível adicionar um cabeçalho regex sem um comando de sintaxe"
+msgstr ""
+"Não é possível adicionar uma expressão regular de cabeçalho sem um comando "
+"de sintaxe"
+
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+"Não é possível adicionar uma expressão regular de string mágica sem um "
+"comando de sintaxe"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Falta o nome de string mágica"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "Não é possível adicionar um lintador sem um comando de sintaxe"
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Falta o comando de lintador"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "Não é possível adicionar formatador sem um comando de sintaxe"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Falta o comando de formatador"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Erro fatal: nenhuma tecla mapeada para a função \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "Erro fatal: nenhuma tecla mapeada para a função \"%s\". Saindo.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Saindo.  Por favor utilize o nano com a opção -I se for preciso para\n"
-"ajustar as configurações do seu nanorc\n"
+"Se necessário, use nano com a opção -I para ajustar suas configurações no "
+"nanorc.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Não foi possível localizar a sintaxe \"%s\" para estender"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr "Não é permitido o comando \"%s\" em arquivo incluido"
+msgstr "Comando \"%s\" não é permitido no arquivo incluído"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "Sintaxe \"%s\" não possui comandos de cor"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "Comando \"%s\" desconhecido"
+msgstr "Comando \"%s\" não compreendido"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Falta sinalizador"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Falta opção"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "Opção \"%s\" precisa de um argumento"
+msgstr "Opção \"%s\" requer um argumento"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Opção não é uma string multibyte válida"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Caracteres imprimíveis são necessário"
 
 # Tradução para single-column?
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
-msgstr "É necessário dois caracteres single-column"
+msgstr "Dois caracteres de coluna única são necessários"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Impossível desativar sinalizador \"%s\""
+msgid "Cannot unset option \"%s\""
+msgstr "Não é possível desativar a opção \"%s\""
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Sinalizador \"%s\" desconhecido"
+msgid "Unknown option \"%s\""
+msgstr "Opção \"%s\" desconhecida"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
-msgstr "Impossível encontrar o meu diretório pessoal!  Putz!"
+msgstr "Não consigo localizar o meu diretório pessoal! Putz!"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Pressione Enter para continuar a inicialização do nano.\n"
 
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "\\\"%.*s%s\\\" não foi encontrado"
+msgstr "\"%.*s%s\" não encontrado"
+
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Sensibilidade de caixa]"
 
-#: src/search.c:205
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Expressão regular]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Retroceder]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
-msgstr " (para subtituir) na seleção"
+msgstr " (para substituir) na seleção"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (para substituir) na seleção"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Substituir esse termo?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
-msgstr "Subtituir por"
+msgstr "Substituir por"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "Substituiu-se %lu ocorrência"
 msgstr[1] "Substituiu-se %lu ocorrências"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Insira o número da linha, número da coluna"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Linha ou número de coluna inválido"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
-msgstr "Não é um parenteses"
+msgstr "Não é um parênteses"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
-msgstr "Nenhum parenteses encontrado"
+msgstr "Nenhum parênteses encontrado"
 
 #: src/text.c:54
 msgid "Mark Set"
@@ -1893,221 +2072,303 @@ msgid "Mark Unset"
 msgstr "Marcação desativada"
 
 # revisão: como traduzir undo buffer? 'desfazer' como um adjetivo?
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Não há nada para desfazer!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
-"Erro interno: não consegui casar a linha %d:  Por favor salve o seu trabalho"
+"Erro interno: não consegui casar a linha %d.  Por favor salve o seu trabalho."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "adic txt"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "remover txt"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "quebra de linha"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "juntar linha"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "recortar txt"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "colar txt"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "quebra de linha"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "inserir txt"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "substituir txt"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Erro interno: tipo desconhecido.  Por favor salve o seu trabalho"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Erro interno: tipo desconhecido.  Por favor salve o seu trabalho."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Ação desfeita (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "Nada para refazer!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
-"Erro interno: Falha na configuração de restauração.  Por favor salve o seu "
-"trabalho"
+"Erro interno: não consegui configurar refazimento.  Por favor salve o seu "
+"trabalho."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Ação repetida (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Impossível fazer o duto"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Impossível criar o duto"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
-msgstr "Impossível bifurcar"
+msgstr "Não foi possível bifurcar"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 "Erro interno: não consegui configurar colagem.  Por favor salve o seu "
-"trabalho"
+"trabalho."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Erro interno: tipo desconhecido.  Por favor salve o seu trabalho"
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
-msgstr "String de citação ruim: %s: %s"
+msgstr "String de citação ruim %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "É possível DesJustificar!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Editar uma substituição"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Impossível criar o duto"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Criando a lista de palavra com erros ortográficos, por favor espere..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
-msgstr "Impossível descobrir o tamanho do buffer do duto"
+msgstr "Não foi possível descobrir o tamanho do buffer do duto"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
-msgstr "Erro ao clamar o \"spell\""
+msgstr "Erro ao chamar o \"spell\""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
-msgstr "Erro ao clamar o \"sort -f\""
+msgstr "Erro ao chamar o \"sort -f\""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
-msgstr "Erro ao clamar o \"uniq\""
+msgstr "Erro ao chamar o \"uniq\""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
-msgstr "Checagem ortográfica finalizada"
+msgstr "Verificação ortográfica finalizada"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "Erro ao clamar o \"%s\""
+msgstr "Erro ao chamar o \"%s\""
+
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Chamar pelo verificador ortográfico, se disponível"
 
-#: src/text.c:2960
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
-msgstr "Falha na checagem ortográfica: %s"
+msgstr "Verificação ortográfica falhou: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
-msgstr "Falha na checagem ortográfica: %s: %s"
+msgstr "Verificação ortográfica falhou: %s: %s"
+
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Nenhum lintador definido para este tipo de arquivo!"
 
-#: src/text.c:3030
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Salvar o buffer modificado antes de lintar?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Chamando lintador, por favor espere"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Obteve 0 linhas analisáveis a partir do comando: %s"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+"Essa mensagem é para o arquivo não-aberto %s, abri-lo em um novo buffer?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Na última mensagem"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Na primeira mensagem"
+
+#: src/text.c:3250
+#, fuzzy
+msgid "Error: no formatter defined"
+msgstr "Erro: nenhum lintador definido"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Finalizado"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Chamando formatador, por favor espere"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Formatação finalizada"
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sPalav: %lu  Linhs: %ld  Carac: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Na seleção:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Entrada literal"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano está sem memória!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Entrada Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Modificado"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Olhar"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Arquivo:"
 
-#: src/winio.c:3360
+# Mantive em 74 caracteres. -- Rafael
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Aviso: Modificando arquivo não travado, verificar permissão do diretório?"
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "lin %ld/%ld (%d%%), col %lu/%lu (%d%%), carac %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "O editor de texto nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "versão"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Trazido para você por:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Agradecimentos especiais para:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "A Fundação Software Livre"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "os vários tradutores e o TP"
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Para o ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "e qualquer outro que nós esquecemos..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Obrigado por usar o nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr ""
+#~ "Erro interno: não consegui casar a linha %ld:  Por favor salve o seu "
+#~ "trabalho."
+
+#~ msgid "line wrap"
+#~ msgstr "quebra de linha"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Permitir desfazer genérico [EXPERIMENTAL]"
+
 #~ msgid "Error writing backup file %s: File owner mismatch"
 #~ msgstr "Erro ao escrever o arquivo reserva %s : Dono do arquivo não casou"
+
+#~ msgid "Insert File"
+#~ msgstr "Inserir Arq"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Ir para a tela anterior"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Encontrar Outro parênteses"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Ajuste de linhas longas"
diff --git a/po/ro.gmo b/po/ro.gmo
index de04c8a..90bcf65 100644
--- a/po/ro.gmo
+++ b/po/ro.gmo
diff --git a/po/ro.po b/po/ro.po
index 8328c16..8a7acb4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,1016 +1,1100 @@
-# Mesajele în limba românã pentru nano.
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-# Acest fiºier este distribuit sub aceeaºi licenþã ca ºi pachetul nano.
-# Laurentiu Buzdugan <lbuz@rolix.org>, 2003, 2004, 2005.
-#
+# Translation of the nano editor to Romanian.
+# Copyright (C) 2015 Free Software Foundation, Inc.
+# This file is distributed under the same license as the nano package.
+# Laurențiu Buzdugan <lbuz@rolix.org>, 2003-2005.
+# Mihai Cristescu <mihai.cristescu@archlinux.info>, 2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.3.7\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2005-04-18 07:00-0500\n"
-"Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 09:02+0200\n"
+"Last-Translator: Mihai Cristescu <mihai.cristescu@archlinux.info>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/browser.c:220
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
+"X-Generator: Poedit 1.7.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-Basepath: .\n"
+"X-Poedit-SearchPath-0: src\n"
+
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
-msgstr "Mergi la Director"
+msgstr "Mergi la director"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
-msgstr "Am renunþat"
+msgstr "S-a renunțat"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
-msgstr "Nu pot merge în afara %s în modul restricþionat"
+msgstr "Nu pot merge în afara %s în modul restricționat"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
-msgstr "Eroare citind %s: %s"
+msgstr "Eroare la citirea %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "Nu pot schimba în sus un director"
+msgstr "Nu se poate schimba mai sus directorul"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(dir)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
-msgstr ""
+msgstr "(dir sup.)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
-msgstr "Cautã"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Case Sensitive]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Regexp]"
+msgstr "Caută"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Înapoi]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
-msgstr "Cãutare de la început"
+msgstr "Caută de la început"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
-msgstr "Aceasta este singura apariþie"
+msgstr "Aceasta este singura apariție"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
-msgstr "Nici un pattern de cãutare curent"
+msgstr "Nici un termen de căutare definit"
+
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"Nu s-a putut determina identitatea mea pentru fișierul blocat - getpwuid() a "
+"eșuat"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Nu s-a putut determina numele gazdei pentru fișierul blocat: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Eroare la scrierea fișierului de blocare %s: %s"
 
-#: src/files.c:125
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Eroare la ștergerea fișierului de blocare %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Eroare la deschiderea fișierului de blocare %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+"Eroare la citirea fișierului de blocare %s: Nu s-au citit suficiente date"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+"Fișierul %s este în curs de editare (de %s cu %s, PID %d); Se continuă?"
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Eroare la scrierea fișierului de blocare: Directorul „%s� nu există"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "Nu pot insera fiºier din afara lui %s"
+msgstr "Nu se poate insera un fișier din afara %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
-msgstr "Nici un alt bufere deschis"
+msgstr "Nu mai sunt fișiere deschise"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
-msgstr "Am schimbat la %s"
+msgstr "S-a schimbat la %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
-msgstr "Bufer nou"
+msgstr "Spațiu nou"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
-msgstr[0] "Am citit %lu linie (convertitã din formatul DOS ºi Mac)"
-msgstr[1] "Am citit %lu linii (convertite din formatul DOS ºi Mac)"
+msgstr[0] "S-a citit %lu linie (Convertită din formatul DOS și Mac)"
+msgstr[1] "S-au citit %lu linii (Convertite din formatul DOS și Mac)"
+msgstr[2] "S-au citit %lu de linii (Convertite din formatul DOS și Mac)"
 
-#: src/files.c:638
-#, fuzzy, c-format
+#: src/files.c:879
+#, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
 "permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
 "permission)"
-msgstr[0] "Am citit %lu linie (convertitã din formatul DOS ºi Mac)"
-msgstr[1] "Am citit %lu linii (convertite din formatul DOS ºi Mac)"
+msgstr[0] ""
+"S-a citit %lu linie (Convertită din formatul DOS și Mac - Avertizare: fără "
+"permisiune la scriere)"
+msgstr[1] ""
+"S-au citit %lu linii (Convertite din formatul DOS și Mac - Avertizare: fără "
+"permisiune la scriere)"
+msgstr[2] ""
+"S-au citit %lu de linii (Convertite din formatul DOS și Mac - Avertizare: "
+"fără permisiune la scriere)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
-msgstr[0] "Am citit %lu linie (convertitã din formatul Mac)"
-msgstr[1] "Am citit %lu linii (convertite din formatul Mac)"
+msgstr[0] "S-a citit %lu linie (Convertită din formatul Mac)"
+msgstr[1] "S-au citit %lu linii (Convertite din formatul Mac)"
+msgstr[2] "S-au citit %lu de linii (Convertite din formatul Mac)"
 
-#: src/files.c:648
-#, fuzzy, c-format
+#: src/files.c:889
+#, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "Am citit %lu linie (convertitã din formatul Mac)"
-msgstr[1] "Am citit %lu linii (convertite din formatul Mac)"
+msgstr[0] ""
+"S-a citit %lu linie (Convertită din formatul Mac - Avertizare: fără "
+"permisiune la scriere)"
+msgstr[1] ""
+"S-au citit %lu linii (Convertite din formatul Mac - Avertizare: fără "
+"permisiune la scriere)"
+msgstr[2] ""
+"S-au citit %lu de linii (Convertite din formatul Mac - Avertizare: fără "
+"permisiune la scriere)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
-msgstr[0] "Am citit %lu linie (convertitã din formatul DOS)"
-msgstr[1] "Am citit %lu linii (convertite din formatul DOS)"
+msgstr[0] "S-a citit %lu linie (convertită din formatul DOS)"
+msgstr[1] "S-au citit %lu linii (convertite din formatul DOS)"
+msgstr[2] "S-au citit %lu de linii (convertite din formatul DOS)"
 
-#: src/files.c:658
-#, fuzzy, c-format
+#: src/files.c:899
+#, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "Am citit %lu linie (convertitã din formatul DOS)"
-msgstr[1] "Am citit %lu linii (convertite din formatul DOS)"
+msgstr[0] ""
+"S-a citit %lu linie (Convertită din formatul DOS - Avertizare: fără "
+"permisiune la scriere)"
+msgstr[1] ""
+"S-au citit %lu linii (Convertite din formatul DOS - Avertizare: fără "
+"permisiune la scriere)"
+msgstr[2] ""
+"S-au citit %lu de linii (Convertite din formatul DOS - Avertizare: fără "
+"permisiune la scriere)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
-msgstr[0] "Am citit %lu linie"
-msgstr[1] "Am citit %lu linii"
+msgstr[0] "S-a citit %lu linie"
+msgstr[1] "S-au citit %lu linii"
+msgstr[2] "S-au citit %lu de linii"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "S-a citit %lu linie (Avertizare: fără permisiune la scriere)"
+msgstr[1] "S-au citit %lu linii (Avertizare: fără permisiune la scriere)"
+msgstr[2] "S-au citit %lu de linii (Avertizare: fără permisiune la scriere)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
-msgstr "Citesc Fiºier"
+msgstr "Se citește fișierul"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
-msgstr "Fiºier nou"
+msgstr "Fișier nou"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
-msgstr "\"%s\" nu a fost gãsit"
+msgstr "„%s� nu a fost găsit"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
-msgstr "\"%s\" este un director"
+msgstr "„%s� este un director"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
-#, fuzzy, c-format
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
+#, c-format
 msgid "\"%s\" is a device file"
-msgstr "Fiºierul \"%s\" este un fiºier dispozitiv (device)"
+msgstr "„%s� este un fișier dispozitiv"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
-msgstr "Comandã de executat în bufer nou [din %s] "
+msgstr "Comandă de executat într-un spațiu nou [din %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
-msgstr "Comandã de executat [din %s] "
+msgstr "Comandă de executat [din %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
-msgstr "Fiºier de inserat în bufer nou [din %s]"
+msgstr "Fișier de inserat într-un spațiu nou [din %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
-msgstr "Fiºier de inserat [din %s]"
+msgstr "Fișier de inserat [din %s]"
 
-#: src/files.c:1077
-#, fuzzy
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
-msgstr "Tastã ilegalã în modul non-multibufer"
+msgstr "Tastă ilegală în afara modului multi-spațiu"
+
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"Eșec la scrierea copiei de rezervă, se continuă salvarea? (Tastați N dacă "
+"sunteți nesigur) "
 
-#: src/files.c:1486
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "Nu pot scrie în afarã de %s"
+msgstr "Nu se poate scrie în afara %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
-msgstr "Nu pot pre-adãugã sau adãuga la un symlink cu setarea --nofollow"
+msgstr "Imposibil de adăugat la o legătură simbolică cu setarea --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
-#, fuzzy, c-format
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
+#, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Eroare la scrierea fiºierului temporar: %s"
+msgstr "Eroare la scrierea copiei de rezervă %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
-#, fuzzy
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
-msgstr "Fiºiere copie de siguranþã (backup)"
+msgstr "Prea multe copii de rezervă?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
-msgstr "Eroare scriind %s: %s"
+msgstr "Eroare la scrierea %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr "Eroare la scrierea fiºierului temporar: %s"
+msgstr "Eroare la scrierea fișierului temporar: %s"
 
-#: src/files.c:1900
-#, fuzzy, c-format
+#: src/files.c:2173
+#, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
-msgstr[0] "Am scris %u linie"
-msgstr[1] "Am scris %u linii"
+msgstr[0] "S-a scris %lu linie"
+msgstr[1] "S-au scris %lu linii"
+msgstr[2] "S-au scris %lu de linii"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [Format DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Format Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
-msgstr " [Copie de siguranþã (backup)]"
+msgstr " [Copie de rezervă]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
-msgstr "Pre-adaugã Selecþie la fiºier"
+msgstr "Adaugă selecție la începutul fișierului"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "Adaugã Selecþie la fiºier"
+msgstr "Adaugă selecție la fișier"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
-msgstr "Scrie Selecþie în fiºier"
+msgstr "Scrie selecție în fișier"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
-msgstr "Nume de pre-adãugat la"
+msgstr "Numele fișierului la începutul căruia se adaugă"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
-msgstr "Nume de adãugat la"
+msgstr "Numele fișierului la sfârșitul căruia se adaugă"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
-msgstr "Nume de scris"
+msgstr "Numele fișierului pentru scriere"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
-msgstr "Fiºierul existã, SUPRASCRIE ? "
+msgstr "Fișierul există, SE SUPRASCRIE ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
-msgstr "Salveazã fiºierul sun UN NUME DIFERIT ? "
+msgstr "Salvează fișierul cu un NUME DIFERIT? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
+"Fișierul a fost modificat de când l-ați deschis, se continuă salvarea? "
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
-msgstr "(suplimentar)"
+msgstr "(mai mult)"
 
-#: src/files.c:2694 src/rcfile.c:1220
-#, fuzzy, c-format
+#: src/files.c:2974
+#, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Apãsaþi Return/Enter pentru a continua lansarea nano\n"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Renunþã"
+"Apăsați Enter pentru a continua\n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "Înlocuieºte"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Imposibil de creat directorul %s: %s\n"
+"Este necesar pentru salvarea/încărcarea istoricului de salvări sau pozițiile "
+"cursorului.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Nici o înlocuire"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"Calea %s nu este un director și trebuie să fie.\n"
+"Nano nu va putea să încarce sau să salveze istoricul sau pozițiile "
+"cursorului.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Cu majuscule semnificative"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"S-a detectat un fișier de istoric moștenit (%s) pe care am încercat să îl "
+"mut\n"
+" în locația preferată (%s) dar am întâmpinat o eroare: %s"
 
-#: src/global.c:421
-#, fuzzy
-msgid "Backwards"
-msgstr " [Înapoi]"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"S-a detectat un fișier de istoric moștenit (%s) pe care am l-am mutat\n"
+" în locația preferată (%s)\n"
+"(vezi secțiunea FAQ nano despre această schimbare)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Regexp"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Ieșire"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-#, fuzzy
-msgid "PrevHstory"
-msgstr "Istorie"
+#: src/global.c:478
+msgid "Close"
+msgstr "ÃŽnchide"
 
-#: src/global.c:452
-#, fuzzy
-msgid "NextHstory"
-msgstr "Istorie"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Lipește"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Du-te la text"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Anul. alin."
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
-#, fuzzy
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
-msgstr "Unde este Urmãtor"
-
-#: src/global.c:457
-#, fuzzy
-msgid "First File"
-msgstr "Prima linie"
-
-#: src/global.c:458
-#, fuzzy
-msgid "Last File"
-msgstr "Ultima linie"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "În fiºiere"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Format DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Format Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Adaugã"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Pre-adaugã"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Fiºier copie de siguranþã (backup)"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Executã comandã"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Du-te la Director"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Cere ajutor"
+msgstr "Căutarea urm."
 
-#: src/global.c:481
-msgid "Exit"
-msgstr "Terminã"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
-msgstr "Unde este"
+msgstr "Caută"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Pagina precedentã"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Pagina urmãtoare"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Prima linie"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Înlocuiește"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Ultima linie"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Depl. linie"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Suspendã"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Linia anterioară"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Început Par"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Linia următoare"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Sfârºit Par"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Citire fiÈ™."
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
-msgstr "AliniazãTotal"
+msgstr "Alin.compl"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
-msgstr "Împrospãteazã"
-
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Insereazã fiºier"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Du-te la linia"
-
-#: src/global.c:500
-msgid "Justify the current paragraph"
-msgstr "Aliniazã paragraful curent"
+msgstr "Reîmprospătează"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:507
+msgid "Justify the current paragraph"
+msgstr "Aliniază paragraful curent"
+
+#: src/global.c:509
 msgid "Cancel the current function"
-msgstr "Anuleazã funcþia curentã"
+msgstr "Anulează funcția curentă"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
-msgstr ""
+msgstr "Afișează acest text de ajutor"
 
-#: src/global.c:509
-#, fuzzy
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
-msgstr "Închide fiºierul încãrcat curent/Ieºi din nano"
+msgstr "Închide spațiul curent / Ieșire din nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
-msgstr "Ieºire din nano"
+msgstr "Ieșire din nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
-msgstr "Scrie fiºierul curent pe disc"
+msgstr "Scrie fișierul curent pe disc"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
-msgstr "Insereazã alt fiºier în fiºierul curent"
+msgstr "Inserează alt fișier în fișierul curent"
 
-#: src/global.c:519
-#, fuzzy
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "Foloseºte expresii regulare (regular expressions)"
+msgstr "Caută un text sau o expresie regulată"
 
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Du-te la ecranul precedent"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Caută un text"
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Du-te la ecraul urmãtor"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Deplasează cursorul în sus cu un ecran"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Deplasează cursorul în jos cu un ecran"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "Taie linia curentã ºi pãstreazã-o în cutbufer"
+msgstr "Decupează linia curentă și o păstrează în memoria temporară"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "Copiazã din cutbufer în linia curentã"
+msgstr "Lipește din memoria temporară în linia curentă"
 
-#: src/global.c:527
-#, fuzzy
+#: src/global.c:534
 msgid "Display the position of the cursor"
-msgstr "Aratã poziþia cursorului"
+msgstr "Afișează poziția cursorului"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
-msgstr "Invocã corectorul ortografic, dacã e disponibil"
+msgstr "Invocă corectorul ortografic, dacă este disponibil"
 
-#: src/global.c:531
-#, fuzzy
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "Foloseºte expresii regulare (regular expressions)"
+msgstr "Înlocuiește un text sau o expresie regulată"
 
-#: src/global.c:532
-#, fuzzy
+#: src/global.c:539
 msgid "Go to line and column number"
-msgstr "Du-te la o anumitã linie"
+msgstr "Deplasează cursorul la linia și coloana numărul"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Marcheazã textul la poziþia curentã a cursorului"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Marchează începutul textului de la poziția cursorului"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr "Repetã ultima cãutare"
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Repetă ultima căutare"
 
-#: src/global.c:537
-#, fuzzy
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Taie linia curentã ºi pãstreazã-o în cutbufer"
+msgstr "Copiază linia curentă și o păstrează în memoria temporară"
 
-#: src/global.c:538
-#, fuzzy
+#: src/global.c:545
 msgid "Indent the current line"
-msgstr "Adaugã la fiºierul curent"
+msgstr "Mărește marginea liniei curente"
 
-#: src/global.c:539
-#, fuzzy
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "Adaugã la fiºierul curent"
+msgstr "Micșorează marginea liniei curente"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr ""
+msgstr "Anulează ultima operație"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "Repetă ultima operație anulată"
 
-#: src/global.c:543
-#, fuzzy
+#: src/global.c:550
 msgid "Go forward one character"
-msgstr "Du-te înainte un caracter"
+msgstr "Avansează cu un caracter"
 
-#: src/global.c:544
-#, fuzzy
+#: src/global.c:551
 msgid "Go back one character"
-msgstr "Du-te înapoi un caracter"
+msgstr "ÃŽnapoi cu un caracter"
 
-#: src/global.c:546
-#, fuzzy
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "Du-te înainte un cuvânt"
+msgstr "Avansează cu un cuvânt"
 
-#: src/global.c:547
-#, fuzzy
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "Du-te înapoi un cuvânt"
+msgstr "Înapoi cu un cuvânt"
 
-#: src/global.c:549
-#, fuzzy
+#: src/global.c:556
 msgid "Go to previous line"
-msgstr "Du-te la linia precedentã"
+msgstr "Deplasează cursorul la linia anterioară"
 
-#: src/global.c:550
-#, fuzzy
+#: src/global.c:557
 msgid "Go to next line"
-msgstr "Du-te la linia urmãtoare"
+msgstr "Deplasează cursorul la linia următoare"
 
-#: src/global.c:551
-#, fuzzy
+#: src/global.c:558
 msgid "Go to beginning of current line"
-msgstr "Du-te la începutul liniei"
+msgstr "Deplasează cursorul la începutul liniei curente"
 
-#: src/global.c:552
-#, fuzzy
+#: src/global.c:559
 msgid "Go to end of current line"
-msgstr "Du-te la sfârºitul liniei"
+msgstr "Deplasează cursorul la sfârșitul liniei curente"
 
-#: src/global.c:555
-#, fuzzy
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "Du-te la începutul paragrafului curent"
+msgstr ""
+"Deplasează cursorul la începutul paragrafului; apoi la începutul "
+"paragrafului anterior"
 
-#: src/global.c:557
-#, fuzzy
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Du-te la sfârºitul paragrafului curent"
+msgstr ""
+"Deplasează cursorul dincolo de sfârșitul paragrafului; apoi la sfârșitul "
+"paragrafului următor"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "Du-te la prima linie din fiºier"
+msgstr "Deplasează cursorul la prima linie din fișier"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "Du-te la ultima linie din fiºier"
+msgstr "Deplasează cursorul la ultima linie din fișier"
 
-#: src/global.c:564
-#, fuzzy
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "Nici o parantezã pereche"
+msgstr "Deplasează cursorul la paranteza pereche"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr ""
+msgstr "Derulează în sus o linie fără a deplasa cursorul"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr ""
+msgstr "Derulează în jos o linie fără a deplasa cursorul"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
-msgstr "Du-te la buferul de fiºier precedent"
+msgstr "Comută la spațiul fișier anterior"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
-msgstr "Schimbã la urmãtorul bufer de fiºier"
+msgstr "Comută la următorul spațiu fișier"
 
-#: src/global.c:577
-#, fuzzy
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr "Insereazã caracter(e) identic"
+msgstr "Inserează următoarea apăsare de tastă verbatim"
 
-#: src/global.c:579
-#, fuzzy
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "Insereazã un caracter tab la poziþia curentã a cursorului"
+msgstr "Inserează un tab la poziția cursorului"
 
 #: src/global.c:581
-#, fuzzy
 msgid "Insert a newline at the cursor position"
-msgstr ""
-"Insereazã un caracter \"carriage return\" la poziþia curentã a cursorului"
+msgstr "Inserează o linie nouă la poziția cursorului"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
-msgstr "ªterge caracterul de sub cursor"
+msgstr "Șterge caracterul de sub cursor"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
-msgstr "ªterge caracterul de la stânga cursorului"
+msgstr "Șterge caracterul de la stânga cursorului"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Taie de la cursor pânã la sfârºitul fiºierului"
+msgstr "Decupează de la cursor până la sfârșitul fișierului"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
-msgstr "Aliniazã întregul fiºier"
+msgstr "Aliniază întregul fișier"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
-msgstr ""
+msgstr "Contorizează numărul cuvintelor, liniilor și caracterelor"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
-msgstr "Reîmprospãteazã zona de ecran curentã"
+msgstr "Reîmprospătează zona de ecran curentă"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "Suspendă editorul (dacă suspendarea este activată)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr ""
+msgstr "Comută sensibilitatea la majuscule a căutării"
 
-#: src/global.c:605
-#, fuzzy
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "Aratã poziþia cursorului"
+msgstr "Inversează direcția căutării"
 
-#: src/global.c:609
-#, fuzzy
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
-msgstr "Foloseºte expresii regulare (regular expressions)"
+msgstr "Comută folosirea expresiilor regulate"
 
-#: src/global.c:613
-#, fuzzy
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "Editeazã ºirurile precedente de cãutare/înlocuire"
+msgstr "Reapelează șirul anterior caută/înlocuiește"
 
-#: src/global.c:615
-#, fuzzy
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "Editeazã ºirurile precedente de cãutare/înlocuire"
+msgstr "Reapelează șirul următor caută/înlocuiește"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
-msgstr "Du-te la navigatorul de fiºiere"
+msgstr "Mergi la navigatorul de fișiere"
 
-#: src/global.c:621
-#, fuzzy
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "Scrie fiºierul ieºire în format DOS"
+msgstr "Comută folosirea formatului DOS"
 
-#: src/global.c:622
-#, fuzzy
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "Scrie fiºierul ieºire în format Mac"
+msgstr "Comuta folosirea formatului Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
-msgstr ""
+msgstr "Comută adăugarea la sfârșit"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr ""
+msgstr "Comută adăugarea la început"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
-msgstr ""
+msgstr "Comută realizarea copiei de siguranță a fișierului original"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
-msgstr "Executã comandã externã"
+msgstr "Execută comandă externă"
 
-#: src/global.c:633
-#, fuzzy
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "Nu am putut obþine dimensiune bufer pentru pipe"
+msgstr "Comută folosirea unui spațiu nou"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
-msgstr "Ieºi din navigatorul de fiºiere"
+msgstr "Ieși din navigatorul de fișiere"
 
-#: src/global.c:638
-#, fuzzy
+#: src/global.c:632
 msgid "Go to the first file in the list"
-msgstr "Du-te la prima linie din fiºier"
+msgstr "Deplasează cursorul la primul fișier din listă"
 
-#: src/global.c:640
-#, fuzzy
+#: src/global.c:633
 msgid "Go to the last file in the list"
-msgstr "Du-te la ultima linie din fiºier"
+msgstr "Deplasează cursorul la ultimul fișier din listă"
 
-#: src/global.c:641
-#, fuzzy
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "Deplasează cursorul la fișierul anterior din listă"
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "Du-te la linia urmãtoare"
+msgstr "Deplasează cursorul la următorul fișier din listă"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Mergi la director"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Apelează analiza statică, dacă este disponibilă"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Mergi la mesajul anterior al analizei statice"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Mergi la mesajul următor al analizei statice"
 
 #: src/global.c:642
-#, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Du-te la linia precedentã"
+msgid "Invoke formatter, if available"
+msgstr "Apelează utilitarul de formatare, dacă este disponibil"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Du-te la director"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Ajutor"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Închide"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Renunță"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
-msgstr "Scrie ieºire"
+#: src/global.c:678
+msgid "Write Out"
+msgstr "Salvează"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Mergi la Director"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Decupează"
+
+#: src/global.c:728
 msgid "Justify"
-msgstr "Aliniazã"
+msgstr "Aliniază"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Citeºte fiºier"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Ortograf."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Taie text"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Analiză statică"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "De-aliniazã"
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Formatare"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-#, fuzzy
-msgid "UnCut Text"
-msgstr "Anuleazã tãiere text"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Sensibil Majusc."
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Regexp"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:755
+msgid "Backwards"
+msgstr "ÃŽnapoi"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr " Nicio înlocuire"
+
+#: src/global.c:770
 msgid "Cur Pos"
-msgstr "Poz. Crt."
+msgstr "Poz. curent."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "De ortografiat"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Pagina anter."
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Pagina urm."
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Prima linie"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Ultima linie"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Paranteză"
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
-msgstr "Marcheazã text"
+msgstr "Marchează text"
 
-#: src/global.c:777
-#, fuzzy
+#: src/global.c:800
 msgid "Copy Text"
-msgstr "Taie text"
+msgstr "Copiază text"
 
-#: src/global.c:780
-#, fuzzy
+#: src/global.c:803
 msgid "Indent Text"
-msgstr "Taie text"
+msgstr "Măreș. marg"
 
-#: src/global.c:783
-#, fuzzy
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "Anuleazã tãiere text"
+msgstr "MicÈ™. marg"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
-msgstr ""
+msgstr "Anulează"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
-msgstr ""
+msgstr "Repetă"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Înainte"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
-msgstr "Înapoi"
+msgstr "ÃŽnapoi"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Cuvânt urmãtor"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "ÃŽnainte"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
-msgstr "Cuvânt precedent"
-
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Linia precedentã"
+msgstr "Cuvânt anterior"
 
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Linia urmãtoare"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Cuvântul următor"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
-msgstr "Acasã"
+msgstr "Acasă"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
-msgstr "Sfârºit"
+msgstr "Sfârșit"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Gãseºte cealaltã parantezã"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "ÃŽnceput Par"
 
-#: src/global.c:848
-msgid "Scroll Up"
-msgstr ""
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Sfârșit Par"
 
 #: src/global.c:851
-msgid "Scroll Down"
-msgstr ""
+msgid "Scroll Up"
+msgstr "Derulează în sus"
 
-#: src/global.c:856
-msgid "Previous File"
-msgstr "Fiºier precedent"
+#: src/global.c:853
+msgid "Scroll Down"
+msgstr "Derulează în jos"
 
 #: src/global.c:858
+msgid "Prev File"
+msgstr "Fișierul anterior"
+
+#: src/global.c:860
 msgid "Next File"
-msgstr "Fiºier urmãtor"
+msgstr "FiÈ™ urm"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Intrare identicã"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Verbatim"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
-msgstr "ªterge"
+msgstr "Șterge"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
-msgstr "ªterge înapoi (backspace)"
+msgstr "Șterge înapoi"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
-msgstr "TaiePânãLaSfârºit"
+msgstr "Taie->Sfârșit"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
-msgstr ""
+msgstr "Contorizare cuvinte"
+
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Suspendă"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Anterioara"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Următoarea"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Deplasează la text"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Format DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Format Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Adaugă la sfârșit"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Adaugă la început"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Fișier copie de rezervă"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Execută comandă"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "La fișiere"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Primul fișier"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Ultimul fișier"
 
-#: src/global.c:1367
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Analiză anter."
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "Analiza urm."
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
-msgstr "Mod Ajutor"
+msgstr "Bara de ajutor"
 
-#: src/global.c:1369
-#, fuzzy
+#: src/global.c:1229
 msgid "Constant cursor position display"
-msgstr "Poziþie cursor neschimbatã"
+msgstr "Afișare continuă poziție cursor"
 
-#: src/global.c:1371
-#, fuzzy
+#: src/global.c:1231
 msgid "Use of one more line for editing"
-msgstr "Foloseºte mai mult spaþiu pentru editare"
+msgstr "Folosire a unei linii suplimentare pentru editare"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
-msgstr "Rulare (scrolling) finã"
+msgstr "Derulare fină"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Rupere ușoară a liniilor lungi"
+
+#: src/global.c:1237
 msgid "Whitespace display"
-msgstr "Afiºeazã spaþiu-alb"
+msgstr "Afișare spațiu-alb"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
-msgstr "Evidenþiere sintaxã color"
+msgstr "Evidențiere sintaxă color"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
-msgstr "Tastã acasã inteligentã"
+msgstr "Tastă acasă inteligentă"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
-msgstr "Auto paragraf"
+msgstr "Auto identare"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
-msgstr "Taie pânã la sfârºit"
+msgstr "Decupare până la sfârșit"
 
-#: src/global.c:1385
-#, fuzzy
-msgid "Long line wrapping"
-msgstr "Trecere automatã (wrap) la linie nouã"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Rupere permanentă a liniilor lungi"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
-msgstr ""
+msgstr "Conversie a tab-urilor introduse în spații"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
-msgstr "Fiºiere copie de siguranþã (backup)"
+msgstr "Salvare fișiere copii de rezervă"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
-msgstr "Multiple bufere fiºiere"
+msgstr "Editare spații multiple de fișiere"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
-msgstr "Suport maus"
+msgstr "Funcționalitate maus"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
-msgstr "Nici o conversie de format DOS/Mac"
+msgstr "Conversie din formatul DOS/Mac"
 
-#: src/global.c:1397
-#, fuzzy
+#: src/global.c:1259
 msgid "Suspension"
-msgstr "Suspendã"
+msgstr "Suspendare"
 
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Trecere automatã (wrap) la linie nouã"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1022,17 +1106,18 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"Text de ajutor pentru comanda \"Cautã\"\n"
+" Text de ajutor pentru comanda de căutare\n"
 "\n"
-" Introduceþi cuvintele sau caracterele pe care aþi dori sã le cãutaþi, apoi "
-"apãsaþi Enter.  Dacã existã vreo potrivire pentru textul cãutat, ecranul va "
-"fi actualizat la locaþia cea mai apropiatã de locul unde aceastã potrivire a "
-"avut loc.\n"
+" Introduceți cuvintele sau caracterele pe care ați dori să le căutați, apoi "
+"apăsați Enter. Dacă există vreo potrivire pentru textul introdus, ecranul va "
+"fi actualizat la locația celei mai apropiate potriviri pentru textul "
+"căutat.\n"
 "\n"
-" ªirul cãutat anterior va fi arãtat în paranteze dupã prompt-ul de cãutare. "
-"Apãsând Enter fãrã a introduce vreun text va executa cãutarea anterioarã.  "
+" Textul căutat anterior va fi afișat între paranteze după prompt-ul de "
+"căutare. Apăsând Enter fără a introduce vreun text, se va executa căutarea "
+"cu textul căutat anterior. "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1040,12 +1125,13 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
-"Dacã aþi selectat text cu marcajul ºi apoi cãutaþi pentru a înlocui, numai "
-"potrivirile din textul selectat vor fi înlocuite.\n"
+"Dacă ați selectat text cu marcajul și apoi folosiți funcția de căutare "
+"pentru a înlocui, numai potrivirile din textul selectat vor fi înlocuite.\n"
+"\n"
+" Următoarele taste de funcții sunt disponibile în modul de căutare:\n"
 "\n"
-"Urmãtoarele taste de funcþii sunt disponibile în modul \"Cautã\":\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1056,15 +1142,17 @@ msgid ""
 " The following function keys are available in Go To Line mode:\n"
 "\n"
 msgstr ""
-"Textul de ajutor pentru comanda \"Du-te la linia\"\n"
+" Text de ajutor pentru comanda de deplasare la linia indicată\n"
 "\n"
-" Introduceþi numãrul liniei unde doriþi sã mergeþi ºi apãsaþi Enter. Dacã "
-"existã mai puþine linii de text decât numãrul introdus veþi ajunge la ultima "
-"linie a fiºierului.\n"
+" Introduceți numărul liniei unde doriți să ajungeți și apăsați Enter. Dacă "
+"există mai puține linii de text decât numărul introdus veți ajunge la ultima "
+"linie a fișierului.\n"
+"\n"
+" Următoarele taste de funcții sunt disponibile în modul de deplasare la "
+"linia:\n"
 "\n"
-" Urmãtoarele taste de funcþii sunt disponibile în modul \"Du-te la linia\":\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1076,18 +1164,19 @@ msgid ""
 "Meta-F toggle, or a nanorc file, inserting a file will cause it to be loaded "
 "into a separate buffer (use Meta-< and > to switch between file buffers).  "
 msgstr ""
-"Textul de ajutor pentru comanda \"Insereazã fiºier\"\n"
+" Text de ajutor pentru comanda de inserare fișier\n"
 "\n"
-" Tastaþi numele unui fiºier de introdus în buferul fiºierului curent la "
-"poziþia curentã a cursorului.\n"
+" Tastați numele unui fișier de inserat în spațiul fișierului curent. Va fi "
+"inserat acolo unde se află poziția cursorului.\n"
 "\n"
-"  Dacã aþi compilat nano cu suport pentru multiple bufere ºi aþi activat "
-"acestã opþiune cu indicatorii de linie de comandã -F sau --multibufer, "
-"comutatorul Meta-F, sau un fiºier nanorc, inserând un fiºier va face ca "
-"acesta sã fie încãrcat într-un alt bufer (folosiþi Meta-< ºi > pentru a "
-"comuta între bufere). "
+" Dacă ați compilat nano cu capacitatea de a gestiona simultan mai multe "
+"spații de fișiere și ați activat această opțiune cu opțiunea din linie de "
+"comandă -F sau --multibufer, comutatorul Meta-F, sau prin fișierul nanorc, "
+"inserarea unui fișier va face ca acesta să fie încărcat într-un spațiu "
+"separat (folosiți Meta-< și Meta-> pentru a comuta între spațiile de "
+"fișiere). "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1095,13 +1184,14 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
-"Dacã aveþi nevoie de un alt bufer gol, nu introduceþi nici un nume sau "
-"introduceþi un nume de fiºier ce nu existã ºi apãsaþi Enter.\n"
+"Dacă aveți nevoie de un alt spațiu gol, nu introduceți nici un nume sau "
+"introduceți un nume de fișier ce nu există și apăsați Enter.\n"
+"\n"
+" Următoarele taste de funcții sunt disponibile în modul inserare de "
+"fișiere:\n"
 "\n"
-" Urmãtoarele taste de funcþii sunt disponibile în modul \"Insereazã fiºier"
-"\":\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1116,20 +1206,20 @@ msgid ""
 " The following function keys are available in Write File mode:\n"
 "\n"
 msgstr ""
-"Textul de ajutor pentru comanda \"Scrie fiºier\"\n"
+" Text de ajutor pentru comanda de salvare a fișierului\n"
 "\n"
-" Tastaþi numele sub care doriþi sã salvaþi fiºierul curent ºi apãsaþi Enter "
-"pentru a salva fiºierul.\n"
+" Tastați numele sub care doriți să salvați fișierul curent și apăsați Enter "
+"pentru a salva fișierul.\n"
 "\n"
-" Dacã aþi selectat text cu marcajul, veþi fi interpolat sã salvaþi numai "
-"porþiunea selectatã într-un fiºier separat.  Pentru a reduce ºansa de a "
-"suprascrie fiºierul curent cu doar o porþiune a sa, numele fiºierului curent "
-"nu este implicit în acest mod.\n"
+" Dacă ați selectat text cu marcajul, vi se va propune să salvați doar "
+"porțiunea selectată într-un fișier separat. Pentru a micșora riscul de a "
+"suprascrie fișierul curent cu doar o porțiune a sa,în acest mod numele "
+"fișierului curent nu este propus implicit.\n"
 "\n"
-" Urmãtoarele taste de funcþii sunt disponibile în modul \"Scrie fiºier\"\n"
+" Următoarele taste de funcții sunt disponibile în modul salvare de fișier:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1142,20 +1232,20 @@ msgid ""
 " The following function keys are available in the file browser:\n"
 "\n"
 msgstr ""
-"Textul de ajutor pentru \"Navigator fiºiere\"\n"
+" Textul de ajutor pentru navigatorul de fișiere\n"
 "\n"
-" Navigatorul de fiºiere este folosit pentru a naviga vizual structura de "
-"directoare ºi a selecta un fiºier pentru citire sau scriere.  Puteþi folosi "
-"tastele cu sãgeþi sau Page Up/Down pentru a naviga prin fiºiere, ºi S sau "
-"Enter pentru a alege fiºierul selectat sau a intra într-un director "
-"selectat. Pentru a vã muta în sus un nivel, selectaþi directorul numit \".."
-"\" din capãtul de sus a listei de fiºiere.\n"
+" Navigatorul de fișiere este folosit pentru a parcurge vizual structura de "
+"directoare cu scopul de a selecta un fișier pentru citire sau scriere. "
+"Puteți folosi tastele cu săgeți sau Page Up/Down pentru a parcurge "
+"fișierele, tastele S sau Enter pentru a alege fișierul selectat sau a intra "
+"în directorul selectat. Pentru a urca în ierarhia directoarelor, selectați "
+"directorul numit „..� din partea de sus a listei de fișiere.\n"
 "\n"
-" Urmãtoarele taste de funcþii sunt disponibile în \"Navigator fiºiere\":\n"
+" Următoarele taste de funcții sunt disponibile în modul navigator de "
+"fișiere:\n"
 "\n"
 
-#: src/help.c:302
-#, fuzzy
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1168,23 +1258,28 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"Text de ajutor pentru comanda \"Cautã\"\n"
+" Text de ajutor pentru comanda de căutare a navigatorului\n"
 "\n"
-" Introduceþi cuvintele sau caracterele pe care aþi dori sã le cãutaþi, apoi "
-"apãsaþi Enter.  Dacã existã vreo potrivire pentru textul cãutat, ecranul va "
-"fi actualizat la locaþia cea mai apropiatã de locul unde aceastã potrivire a "
-"avut loc.\n"
+" Introduceți cuvintele sau caracterele pe care ați dori să le căutați, apoi "
+"apăsați Enter. Dacă există vreo potrivire pentru textul introdus, ecranul va "
+"fi actualizat la locația celei mai apropiate potriviri pentru textul "
+"căutat.\n"
+"\n"
+" Textul căutat anterior va fi afișat între paranteze după prompt-ul de "
+"căutare. Apăsând Enter fără a introduce vreun text va executa căutarea cu "
+"textul căutat anterior.\n"
 "\n"
-" ªirul cãutat anterior va fi arãtat în paranteze dupã prompt-ul de cãutare. "
-"Apãsând Enter fãrã a introduce vreun text va executa cãutarea anterioarã.  "
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
+" Următoarele taste de funcții sunt disponibile în modul de căutare "
+"navigator:\n"
+"\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1196,19 +1291,18 @@ msgid ""
 " The following function keys are available in Browser Go To Directory mode:\n"
 "\n"
 msgstr ""
-"Text de ajutor pentru comanda \"Navigator Du-te la Directorul\"\n"
+" Text de ajutor pentru comanda de schimbare a directorului\n"
 "\n"
-" Introduceþi numele directorului pe care aþi dori sã-l navigaþi.\n"
+" Introduceți numele directorului pe care ați dori să-l parcurgeți.\n"
 "\n"
-" Dacã completarea cu tab nu a fost deactivatã, puteþi folosi tasta TAB "
-"pentru a încerca sã completaþi automat numele directorului.\n"
+" Dacă completarea cu tab nu a fost dezactivată, puteți folosi tasta Tab "
+"pentru a încerca completarea automată a numelui directorului.\n"
 "\n"
-" Urmãtoarele taste de funcþii sunt disponibile în modul \"Navigator Du-te la "
-"Directorul\":\n"
+" Următoarele taste de funcții sunt disponibile în modul de schimbare a "
+"directorului:\n"
 "\n"
 
-#: src/help.c:328
-#, fuzzy
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1221,20 +1315,19 @@ msgid ""
 " The following function keys are available in Spell Check mode:\n"
 "\n"
 msgstr ""
-"Text de ajutor pentru \"Corector ortografic\"\n"
+" Text de ajutor pentru corectorul ortografic\n"
 "\n"
-" Corectorul ortografic verificã ortografierea întregului text din fiºierul "
-"curent.  Când este întâlnit un cuvânt necunoscut, acesta este evidenþiat ºi "
-"poate fi introdus/editat un înlocuitor.  Corectorul vã va întreba dacã "
-"doriþi sã înlocuiþi toate apariþiile cu aceeaºi greºealã în fiºierul curent, "
-"sau, dacã aþi selectat text cu marcajul, în textul selectat.\n"
+" Corectorul ortografic verifică toate textele fișierului curent. Când este "
+"întâlnit un cuvânt necunoscut, acesta va fi subliniat și va putea fi "
+"corectat. Apoi vi se va propune să înlocuiți fiecare apariție a acestui "
+"cuvânt greșit în fișierul curent, sau, dacă ați selectat text prin marcarea "
+"acestuia, în textul selectat.\n"
 "\n"
-" Urmãtoarele alte funcþii sunt disponibile în modul \"Corector ortografic"
-"\":\n"
+" Următoarele taste de funcții sunt disponibile în modul de corector "
+"ortografic:\n"
 "\n"
 
-#: src/help.c:343
-#, fuzzy
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1245,17 +1338,17 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-"Text de ajutor \"Comandã externã\"\n"
+" Text de ajutor pentru execuție comenzi externe\n"
 "\n"
-" Acest meniu vã permite sã inseraþi ieºirea unei comenzi executate de shell "
-"în buferul curent (sau într-un nou bufer în modul multibufer). Dacã doriþi "
-"un alt bufer gol, nu introduceþi nici o comandã.\n"
+" Acest meniu vă permite să inserați textul produs de execuția unei comenzi "
+"rulată de shell în spațiul curent (sau un spațiu nou în modul multi-spațiu). "
+"Dacă aveți nevoie de un spațiu gol, nu introduceți nici o comandă.\n"
 "\n"
-" Urmãtoarele taste sunt disponibile în acest mod:\n"
+" Următoarele taste de funcții sunt disponibile în modul de execuție comenzi "
+"externe:\n"
 "\n"
 
-#: src/help.c:356
-#, fuzzy
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1266,21 +1359,17 @@ msgid ""
 "showing the file being edited.  The status line is the third line from the "
 "bottom and shows important messages.  "
 msgstr ""
-" text ajutor pentru nano\n"
-"\n"
-" Editotul nano este proiectat sa emuleze funþionalitatea ºi uºurinþa de "
-"folosire a editorului de texte UW Pico.  Existã patru secþiuni principale "
-"ale editorului: Linia de sus aratã versiunea programului, numele fiºierului "
-"curent ce este editat ºi dacã fiºierul a fost sau nu modificat.  Urmãtoarea "
-"secþiune principalã este fereastra de editare ce aratã fiºierul ce este "
-"editat.  Linia de stare este a treia linie de jos ºi aratã mesaje "
-"importante.  Ultimele douã linii aratã cele mai frecvente scurtãturi "
-"folosite în editor.\n"
+" Text principal de ajutor pentru nano\n"
 "\n"
-" "
+" Editorul nano este conceput sa reproducă funcționalitatea și ușurința de "
+"utilizare ale editorului Pico de la Universitatea Washington. Există patru "
+"secțiuni principale ale editorului. Linia de sus arată versiunea "
+"programului, numele fișierului în curs de editare și dacă fișierul a fost "
+"modificat sau nu. Mai jos urmează fereastra de editare principală care arată "
+"fișierul în curs de modificare. Linia de stare este a treia linie de jos, "
+"aceasta afișează mesajele importante. "
 
-#: src/help.c:366
-#, fuzzy
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1290,13 +1379,16 @@ msgid ""
 "notated with the Meta (M-) symbol and can be entered using either the Esc, "
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
-"Notaþia pentru scurtãturi este dupã cum urmeazã: secvenþe Control-tastã sunt "
-"notate cu un simbol (^) ºi sunt introduse cu tasta Control (Ctrl) sau "
-"apãsând tasta Esc de douã ori.  Secvenþele Escape-tastã sunt notate cu "
-"simbolul Meta (M) ºi pot fi introduse folosind oricare din tastele Esc, Alt "
-"sau Meta, în funcþie de setarea tastaturii d-voastrã.  "
+"Ultimele două linii arată cele mai frecvente scurtături folosite în "
+"editor. \n"
+"\n"
+" Notația pentru scurtături este după cum urmează: Secvențele control-tastă "
+"sunt notate cu un simbol caret (^) și pot fi introduse fie folosind tasta "
+"Control (Ctrl) sau apăsând tasta Escape (Esc) de două ori. Secvențele Escape-"
+"tastă sunt notate cu simbolul Meta (M) și pot fi introduse folosind oricare "
+"din tastele Esc, Alt sau Meta, în funcție de configurația tastaturii. "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1304,493 +1396,494 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
-"De asemenea, apãsând tasta Esc de douã ori apoi tastând un numãr din trei "
-"cifre de la 000 la 255 va introduce caracterul cu codul ASCII "
-"corespunzãtor.  Urmãtoarele combinaþii de taste sunt disponibile în "
-"fereastra de editare principalã.  Tastele alternative sunt arãtate în "
-"paranteze:\n"
+"De asemenea, apăsând tasta Esc de două ori apoi tastând un număr din trei "
+"cifre de la 000 la 255 se va introduce caracterul cu codul ASCII "
+"corespunzător. Următoarele combinații de taste sunt disponibile în fereastra "
+"de editare principală. Tastele alternative sunt afișate între paranteze:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
-msgstr "activeazã/deactiveazã"
+msgstr "[activare | dezactivare]"
 
-#: src/nano.c:587
-#, fuzzy
+#: src/nano.c:601
 msgid "Key invalid in view mode"
-msgstr "Tastã ilegalã în modul VIZUALIZARE"
+msgstr "Tastă nevalidă în modul vizualizare"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
 "Buffer written to %s\n"
 msgstr ""
 "\n"
-"Bufer scris în %s\n"
+"Spațiu scris în %s\n"
 
-#: src/nano.c:697
-#, fuzzy, c-format
+#: src/nano.c:715
+#, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 "\n"
-"Bufer scris în %s\n"
+"Spațiu nu s-a scris în %s: %s\n"
 
-#: src/nano.c:700
-#, fuzzy, c-format
+#: src/nano.c:718
+#, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 "\n"
-"Bufer scris în %s\n"
+"Spațiul nu s-a scris: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
-msgstr "Dimensiunea ferestrei prea micã pentru nano...\n"
+msgstr "Dimensiunea ferestrei este prea mică pentru nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
+"Folosire: nano [OPȚIUNI] [[+LINIE,COLOANĂ] FIȘIER]...\n"
+"\n"
 
-#: src/nano.c:819
-#, fuzzy, c-format
+#: src/nano.c:839
+#, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr "Opþiune\t\tOpþiune lungã\t\tÎnþeles\n"
+msgstr "Opțiune\t\tOpțiune lungă GNU\t\tSemnificație\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
-msgstr "Opþiune\t\tÎnþeles\n"
-
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Aratã acest mesaj"
+msgstr "Opțiune\t\tSemnificație\n"
 
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
-msgstr ""
+msgstr "+LINIE,COLOANÄ‚"
 
-#: src/nano.c:826
-#, fuzzy
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
-msgstr "Începe la linia cu numãrul LINIE"
+msgstr "ÃŽncepe la linia LINIE, coloana COLOANÄ‚"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
-msgstr "Permite tasta acasã inteligentã"
+msgstr "Activează tasta acasă inteligentă"
 
-#: src/nano.c:829
-#, fuzzy
+#: src/nano.c:850
 msgid "Save backups of existing files"
-msgstr "Creazã copii de siguranþã (backup) la salvare"
+msgstr "Salvează copii de rezervă ale fișierelor existente"
 
-#: src/nano.c:830
-#, fuzzy
+#: src/nano.c:851
 msgid "-C <dir>"
-msgstr "-E [dir]"
+msgstr "-C <dir>"
 
-#: src/nano.c:830
-#, fuzzy
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
-msgstr "--backupdir=[dir]"
+msgstr "--backupdir=<dir>"
 
-#: src/nano.c:831
-#, fuzzy
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
-msgstr "Director pentru scrierea fiºierelor copie-de-siguranþã (backup)"
+msgstr "Director pentru salvarea fișierelor unice copiid de rezervă"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
-msgstr ""
+msgstr "Folosește bold în loc de textul video inversat"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
-msgstr ""
+msgstr "Convertește tab-urile introduse în spații"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
-msgstr "Activeazã bufere fiºier multiple"
+msgstr "Activează spații fișier multiple"
+
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Folosește fișiere de blocare în stilul vim"
 
-#: src/nano.c:845
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "Scrie în jurnal ºi citeºte istoria ºirurilor de cãutare/înlocuire"
+msgstr "Scrie în jurnal și citește istoria șirurilor de căutare/înlocuire"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
-msgstr "Nu te uita la fiºierele nanorc"
+msgstr "Nu te uita la fișierele nanorc"
 
-#: src/nano.c:851
-#, fuzzy
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
-msgstr "Reparã confuzia cu tastele Backspace/Delete"
+msgstr "Rezolvă problema de confuzie a tastelor numerice"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
-msgstr ""
+msgstr "Nu se adaugă linii noi la sfârșitul fișierelor"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
-msgstr "Nu converti fiºierele din formatul DOS/Mac"
+msgstr "Nu converti fișierele din formatul DOS/Mac"
 
-#: src/nano.c:858
-#, fuzzy
+#: src/nano.c:883
 msgid "Use one more line for editing"
-msgstr "Foloseºte mai mult spaþiu pentru editare"
+msgstr "Se folosește încă o linie pentru editare"
+
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Scrie în jurnal & citește locația poziției cursorului"
 
-#: src/nano.c:860
-#, fuzzy
+#: src/nano.c:889
 msgid "-Q <str>"
-msgstr "-Q [sir]"
+msgstr "-Q <str>"
 
-#: src/nano.c:860
-#, fuzzy
+#: src/nano.c:889
 msgid "--quotestr=<str>"
-msgstr "--quotestr=[ºir]"
+msgstr "--quotestr=<str>"
 
-#: src/nano.c:861
-#, fuzzy
+#: src/nano.c:890
 msgid "Quoting string"
-msgstr "ªir citate. implicit \"> \""
+msgstr "Text de citare"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
-msgstr "Mod restricþionat"
+msgstr "Mod restricționat"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "Derulare prin linie în locul jumătății de ecran"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:897
 msgid "-T <#cols>"
-msgstr "-T [#coloane]"
+msgstr "-T <#coloană>"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=[#coloane]"
+msgstr "--tabsize=<#număr>"
 
-#: src/nano.c:869
-#, fuzzy
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
-msgstr "Seteazã lãþimea unui tab în coloane ca #coloane"
+msgstr "Setează lungimea unui tab la #număr coloane"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
-msgstr ""
+msgstr "Realizează o clipire rapidă a barei de stare"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
-msgstr "Afiºeazã informaþii despre versiune ºi terminã"
+msgstr "Afișează informații despre versiune și termină"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
-msgstr ""
+msgstr "Detectează limitele cuvântului mai exact"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "-Y <str>"
-msgstr "-Y [ºir]"
+msgstr "-Y <str>"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "--syntax=<str>"
-msgstr "--syntax=[ºir]"
+msgstr "--syntax=<str>"
 
-#: src/nano.c:881
-#, fuzzy
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
-msgstr "Definiþie sintaxã de folosit"
+msgstr "Definiția sintaxei de folosit pentru colorare"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
-msgstr "Aratã continuu poziþia cursorului"
+msgstr "Arată continuu poziția cursorului"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
-msgstr "Reparã confuzia cu tastele Backspace/Delete"
+msgstr "Repară confuzia cu tastele Backspace/Delete"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Arată acest text de ajutor"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
-msgstr "Indent-eazã automatic liniile noi"
+msgstr "Indent-ează automatic liniile noi"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "Taie de la cursor la sfârºitul liniei"
+msgstr "Decupează de la cursor până la sfârșitul liniei"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Nu urma link-urile simbolice, scrie peste"
 
-#: src/nano.c:894
-#, fuzzy
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
-msgstr "Permite maus"
+msgstr "Activează folosirea mouse-ului"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Nu citi fișierul (doar scrie-l)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
-msgstr "-o [dir]"
+msgstr "-o <dir>"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
-msgstr "--operatingdir=[dir]"
+msgstr "--operatingdir=<dir>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
-msgstr "Seteazã directorul de operare"
+msgstr "Setează directorul de operare"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
-msgstr "Conservã tastele XON (^Q) ºi XOFF (^S)"
+msgstr "Conservă tastele XON (^Q) și XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "Ignoră silențios problemele la pornire cum ar fi fișierul rc"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:938
 msgid "-r <#cols>"
-msgstr "-r [#coloane]"
+msgstr "-r <#coloană>"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:938
 msgid "--fill=<#cols>"
-msgstr "--fill=[#coloane]"
+msgstr "--fill=<#număr>"
 
-#: src/nano.c:906
-#, fuzzy
-msgid "Set wrapping point at column #cols"
-msgstr "Seteazã lãþimea unui tab în coloane ca #coloane"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Setează punctul de rupere permanentă la coloana #număr"
 
-#: src/nano.c:909
-#, fuzzy
+#: src/nano.c:942
 msgid "-s <prog>"
-msgstr "-s [prog]"
+msgstr "-s <prog>"
 
-#: src/nano.c:909
-#, fuzzy
+#: src/nano.c:942
 msgid "--speller=<prog>"
-msgstr "--speller=[prog]"
+msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
-msgstr "Permite corector ortografic alternativ"
+msgstr "Activează corectorul ortografic alternativ"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "Salveazã automat la ieºire, nu întreba"
+msgstr "Salvează automat la ieșire, nu întreba"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
-#, fuzzy
+#: src/nano.c:947
 msgid "View mode (read-only)"
-msgstr "Mod vedere (numai citire)"
+msgstr "Mod vizualizare (doar citire)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Nu sparge (wrap) liniile lungi"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Nu strânge permanent liniile lungi"
 
-#: src/nano.c:922
-#, fuzzy
+#: src/nano.c:951
 msgid "Don't show the two help lines"
-msgstr "Nu arãta fereastra de ajutor"
+msgstr "Nu arăta cele două linii de ajutor"
 
-#: src/nano.c:923
-#, fuzzy
+#: src/nano.c:952
 msgid "Enable suspension"
-msgstr "Permite suspendarea"
+msgstr "Activează suspendarea"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr ""
-
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorat, pentru compatibilitate cu Pico)"
+msgstr "Activează ruperea ușoară a liniei"
 
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano versiunea %s (compilat %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano, versiunea %s\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 "\n"
-" Opþiuni compilare:"
+" Opțiuni compilate:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
-msgstr "Ne pare rãu, suportul pentru aceastã funcþie a fost deactivat"
+msgstr "Ne pare rău, suportul pentru această funcție a fost dezactivat"
+
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Nici un nume de fișier"
 
-#: src/nano.c:1044
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Salvez buferul modificat (RÃSPUNSUL \"Nu\" VA DISTRUGE SCHIMBÃRILE) ?"
+msgstr ""
+"Se salvează spațiul modificat? (prin răspunsul „Nu� se vor PIERDE "
+"modificările!) "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "Nu s-a putut redeschide stdin din tastatură, ne pare rău\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Se citește din stdin, ^C pentru a abandona\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
-msgstr "Am recepþionat SIGHUP sau SIGTERM\n"
+msgstr "Am recepționat SIGHUP sau SIGTERM\n"
 
-#: src/nano.c:1204
-#, fuzzy, c-format
+#: src/nano.c:1301
+#, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Folosiþi \"fg\" pentru a vã întoarce la nano"
+msgstr "Folosiți „fg� pentru a reveni la nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
-msgstr "activat"
+msgstr "activată"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
-msgstr "deactivat"
+msgstr "dezactivată"
 
-#: src/nano.c:1548 src/winio.c:1256
-#, fuzzy
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
-msgstr "Indicator (flag) necunoscut %s"
+msgstr "Comandă necunoscută"
 
-#: src/nano.c:1674
-#, fuzzy
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
-msgstr "XON ignorat, murmur, murmur."
+msgstr "XON ignorat, mormăit mormăit"
 
-#: src/nano.c:1679
-#, fuzzy
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
-msgstr "XOFF ignorat, murmur, murmur."
+msgstr "XON ignorat, mormăit mormăit"
 
-#: src/nano.c:2209 src/rcfile.c:1100
-#, fuzzy, c-format
+#: src/nano.c:2310 src/rcfile.c:1325
+#, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "Dimensiune tab cerutã %s invalidã"
+msgstr "Mărimea tab solicitată „%s� este nevalidă"
 
-#: src/nano.c:2268 src/rcfile.c:1025
-#, fuzzy, c-format
+#: src/nano.c:2374 src/rcfile.c:1250
+#, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "Dimensiune umplere cerutã %s invalidã"
+msgstr "Mărimea de umplere solicitată „%s� este nevalidă"
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Tastați „%s -h� pentru o listă de opțiuni disponibile.\n"
 
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Da"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
-msgstr "Tot"
+msgstr "Toate"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Nu"
 
-#: src/rcfile.c:130
-#, fuzzy, c-format
+#: src/rcfile.c:137
+#, c-format
 msgid "Error in %s on line %lu: "
-msgstr "Eroare în %s pe linia %d: "
+msgstr "Eroare în %s la linia %lu: "
 
-#: src/rcfile.c:185
-#, fuzzy, c-format
+#: src/rcfile.c:196
+#, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "Argumentul %s are \" neterminat"
+msgstr "Argumentul „%s� are un \" neterminat"
 
-#
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
-msgstr "ªirurile regex trebuie sã înceapã ºi sfârºeascã cu un caracter \""
+msgstr "Șirurile regex trebuie să înceapă și să se termine cu caracterul \""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "Regex incorect \"%s\": %s"
+msgstr "Regex incorect „%s�: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
-msgstr "Lipseºte nume sintaxã"
+msgstr "Lipsește nume sintaxă"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
-msgstr ""
+msgstr "Sintaxa „none� este rezervată"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
-msgstr ""
+msgstr "Sintaxa „default� nu trebuie să aibă extensii"
 
-#: src/rcfile.c:386 src/rcfile.c:483
-#, fuzzy
+#: src/rcfile.c:433
 msgid "Missing key name"
-msgstr "Lipseºte nume sintaxã"
+msgstr "Lipsește numele tastei"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Numele tastei este prea scurt"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr ""
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Numele tastei trebuie să înceapă cu „^�, „M� sau „F�"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "Trebuie specificată o funcție la care se asociază tasta"
+
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
+"Trebuie specificat un meniu (sau „all“) în care se asociază/anulează tasta"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:489
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr ""
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Imposibil de mapat numele „%s“ la o funcție"
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Nu am putut invoca \"%s\""
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Imposibil de mapat numele „%s“ la un meniu"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Funcția „%s“ nu există în meniul „%s“"
+
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Ne pare rău, tasta „%s“ nu poate fi reasociată"
 
-#: src/rcfile.c:625
-#, fuzzy, c-format
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Eroare la extinderea %s: %s"
+
+#: src/rcfile.c:672
+#, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
 "Valid colors are \"green\", \"red\", \"blue\",\n"
@@ -1798,459 +1891,487 @@ msgid ""
 "\"black\", with the optional prefix \"bright\"\n"
 "for foreground colors."
 msgstr ""
-"Culoare %s incorectã.\n"
-"Culori valide sunt \"green\"(verde), \"red\"(roºu), \"blue\"(albastru), \n"
-"\"white\"(alb), \"yellow\"(galben), \"cyan\", \"magenta\"(purpuriu) ºi \n"
-"\"black\"(negru), cu prefixul opþional \"bright\"(strãlucitor) \n"
-"pentru culorile de scriere."
-
-#: src/rcfile.c:647
-#, fuzzy
+"Culoarea „%s“ nu a fost înțeleasă.\n"
+"Culorile valide sunt „verde“, „roșu“, „albastru“,\n"
+"„alb“, „galben“, „bleu“, „magenta“ și\n"
+"„negru“, cu prefixul opțional „bright“\n"
+"pentru culorile de fundal."
+
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
-msgstr "Nu pot adãuga o directivã de culoare fãrã o linie de sintaxã"
+msgstr "Imposibil de adăugat o comandă de culoare fără o comandă de sintaxă"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
-msgstr "Lipseºte nume culoare"
+msgstr "Lipsește numele culorii"
 
-#: src/rcfile.c:672
-#, fuzzy, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Culoarea de fundal %s nu poate fi strãlucitoare"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
-msgstr ""
+msgstr "Lipsește șirul regex"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\"start=\" necesitã un \"end=\" corespunzãtor"
+msgstr "\"start=\" necesită un \"end=\" corespunzător"
 
-#: src/rcfile.c:804
-#, fuzzy
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Culoarea de fundal „%s“ nu poate fi bright"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
-msgstr "Nu pot adãuga o directivã de culoare fãrã o linie de sintaxã"
+msgstr "Imposibil de adăugat un antet de regex fără o comandă de sintaxă"
+
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Imposibil de adăugat un șir magic de regex fără o comandă de sintaxă"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Lipsește numele șiului magic"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "Imposibil de adăugat o analiză statică fără o comandă sintaxă"
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Comanda de analiză statică lipsește"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "Imposibil de adăugat utilitarul de formatare fără o comandă de sintaxă"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Lipsește comanda utilitarului de formatare"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
+"Eroare fatală: nu este asociată nici o tastă pentru funcția „%s�. Ieșire.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
+"Dacă este nevoie, folosiți nano cu opțiunea -I pentru a ajusta setările "
+"voastre nanorc.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Nu s-a putut găsi sintaxa „%s� pentru extindere"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr ""
+msgstr "Comanda „%s� nu este permisă într-un fișier inclus"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr ""
+msgstr "Sintaxa „%s� nu are comenzi de colorare"
 
-#: src/rcfile.c:966
-#, fuzzy, c-format
+#: src/rcfile.c:1171
+#, c-format
 msgid "Command \"%s\" not understood"
-msgstr "Comanda %s nu a fost înþeleasã"
+msgstr "Comanda „%s� nu a fost înțeleasă"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Lipseºte indicator (flag)"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Lipsește opțiunea"
 
-#: src/rcfile.c:994
-#, fuzzy, c-format
+#: src/rcfile.c:1208
+#, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "Opþiunea %s necesitã un argument"
+msgstr "Opțiunea „%s� necesită un argument"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
-msgstr ""
+msgstr "Opțiunea nu este un șir valid multioctet"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
-#, fuzzy
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
-msgstr "Sunt necesare douã caractere non-tab ºi non-spaþiu"
+msgstr "Sunt necesare caractere care nu sunt goale"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
-msgstr "Sunt necesare douã caractere de o singurã coloanã"
+msgstr "Sunt necesare două caractere (mono coloană)"
 
-#: src/rcfile.c:1114
-#, fuzzy, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Nu pot de-seta indicatorul (flag) %s"
+#: src/rcfile.c:1339
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Imposibil de dezactivat opțiunea „%s�"
 
-#: src/rcfile.c:1123
-#, fuzzy, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Indicator (flag) necunoscut %s"
+#: src/rcfile.c:1345
+#, c-format
+msgid "Unknown option \"%s\""
+msgstr "Opțiune „%s� necunoscută"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
-msgstr "Nu pot gãsi directorul meu home!  Uãu!"
+msgstr "Nu pot găsi directorul meu home!  Uau!"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Apăsați Enter pentru a continua pornirea nano.\n"
 
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "\"%.*s%s\" nu a fost gãsit"
+msgstr "„%.*s%s� nu a fost găsit"
 
-#
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Sensibil la majuscule]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Regexp]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [ÃŽnapoi]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
-msgstr " (de înlocuit) în selecþie"
+msgstr " (de înlocuire) în selecție"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
-msgstr " (de înlocuit)"
+msgstr " (de înlocuire)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
-msgstr "Înlocuieºte în acest caz?"
+msgstr "Se înlocuiește această apariție?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
-msgstr "Înlocuieºte cu"
+msgstr "Se înlocuiește cu"
 
-#: src/search.c:1004
-#, fuzzy, c-format
+#: src/search.c:986
+#, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
-msgstr[0] "Am înlocuit în %ld loc"
-msgstr[1] "Am înlocuit în %ld locuri"
+msgstr[0] "S-a înlocuit %lu apariție"
+msgstr[1] "S-au înlocuit %lu apariții"
+msgstr[2] "S-au înlocuit %lu de apariții"
 
-#: src/search.c:1034
-#, fuzzy
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
-msgstr "Introduceþi numãrul liniei"
+msgstr "Introduceți numărul liniei, numărul coloanei"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
-msgstr ""
+msgstr "Număr de linie sau coloană nevalid"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
-msgstr "Nu este o parantezã"
+msgstr "Nu este o paranteză"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
-msgstr "Nici o parantezã pereche"
+msgstr "Nu am găsit o paranteză pereche"
 
 #: src/text.c:54
 msgid "Mark Set"
-msgstr "Marcaj Setare"
+msgstr "Marcaj aplicat"
 
 #: src/text.c:58
-#, fuzzy
 msgid "Mark Unset"
-msgstr "Marcaj DEsetare"
+msgstr "Marcaj ridicat"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "Nici o operație de anulat!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
+"Eroare internă: nu se poate găsi o potrivire pentru linia %d. Vă rugăm să "
+"salvați fișierul."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
-msgstr ""
+msgstr "adăugare de text"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
-msgstr "Fiºier urmãtor"
+msgstr "ștergere de text"
 
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Trecere automatã (wrap) la linie nouã"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
-msgstr ""
+msgstr "fuziune de linii"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
-msgstr ""
+msgstr "decupare de text"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr ""
+msgstr "lipire de text"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr ""
+msgstr "linie nouă"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
-msgstr "Linia urmãtoare"
+msgstr "inserare de text"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
-msgstr " (de înlocuit)"
+msgstr "înlocuire de text"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr ""
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Eroare internă: tip necunoscut. Vă rugăm să salvați fișierul."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Acțiune anulată (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "Nimic de refăcut!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
+"Eroare internă: nu se poate pregăti repetarea acțunilor. Vă rugăm să salvați "
+"fișierul."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Acțiune refăcută (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Nu am putut pipe"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Nu am putut crea o țeavă"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
-msgstr "Nu am putut fork"
+msgstr "Nu am putut crea un proces nou"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
+"Eroare internă: nu se poate pregăti acțiunea de lipire. Vă rugăm să salvați "
+"fișierul."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
-msgstr "ªir greºit pentru ghilimele %s: %s"
+msgstr "Șir greșit de citare %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
-msgstr "Nu pot De-Alinia!"
+msgstr "Acum este posibilă de-alinierea!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
-msgstr "Editeazã o înlocuire"
-
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Nu am putut crea pipe"
+msgstr "Editează o înlocuire"
 
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "Creez listã cuvinte ortografiate greºit, vã rog aºteptaþi..."
+msgstr "Se creează lista cuvintelor ortografiate greșit, vă rog așteptați..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
-msgstr "Nu am putut obþine dimensiune bufer pentru pipe"
+msgstr "Nu am putut obține dimensiunea spațiului țeavă"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
-msgstr "Eroare invocare \"spell\""
+msgstr "Eroare la apelarea „spell�"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
-msgstr "Eroare invocare \"sort -f\""
+msgstr "Eroare la apelarea „sort -f�"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
-msgstr "Eroare invocare \"uniq\""
+msgstr "Eroare la apelarea „uniq�"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
-msgstr "Am terminat verificarea ortografiei"
+msgstr "Verificarea ortografică s-a terminat"
 
-#: src/text.c:2815
-#, fuzzy, c-format
+#: src/text.c:2759 src/text.c:3340
+#, c-format
 msgid "Error invoking \"%s\""
-msgstr "Eroare invocare \"spell\""
+msgstr "Eroare la apelarea „%s�"
 
-#: src/text.c:2960
-#, fuzzy, c-format
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Se apelează corectorul ortografic, vă rugăm așteptați"
+
+#: src/text.c:2902
+#, c-format
 msgid "Spell checking failed: %s"
-msgstr "Verificarea ortografiei a eºuat: %s: %s"
+msgstr "Corectarea ortografică a eșuat: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
-msgstr "Verificarea ortografiei a eºuat: %s: %s"
+msgstr "Verificarea ortografiei a eșuat: %s: %s"
+
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Nu este definit nici un analizor static pentru acest tip de fișiere!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Se salvează spațiul modificat înainte de analiza statică?"
 
-#: src/text.c:3030
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Se lansează analiza statică, vă rugăm așteptați"
+
+#: src/text.c:3125
 #, c-format
-msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Comanda „%s� nu a produs nicio linie analizabilă"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
+"Acest mesaj este pentru fișierul nedeschis %s, se deschide într-un spațiu "
+"nou?"
 
-#: src/text.c:3031
-#, fuzzy
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Ultimul mesaj"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Primul mesaj"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Eroare: nu este definit niciun utilitar de formatare"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Finalizat"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Se apelează utilitarul de formatare, vă rugăm așteptați"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Formatarea s-a finalizat"
+
+#: src/text.c:3438
+#, c-format
+msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgstr "%sCuvinte: %lu  Linii: %ld  Caractere: %lu"
+
+#: src/text.c:3439
 msgid "In Selection:  "
-msgstr "Adaugã Selecþie la fiºier"
+msgstr "În selecție:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Intrare Verbatim"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
-msgstr "nano a epuizat memoria!"
+msgstr "nano nu mai are memorie!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
-msgstr ""
+msgstr "Intrare Unicode"
 
-#
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Modificat"
 
-#
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Vedere"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "DIR:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
-msgstr "Fiºier:"
+msgstr "Fișier:"
 
-#: src/winio.c:3360
-#, fuzzy, c-format
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Avertizare: Modificare a unui fișier deblocat. Verificați permisiunile "
+"directorului?‎‬"
+
+#: src/winio.c:3377
+#, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr ""
-"linia %ld/%ld (%d%%), coloana %lu/%lu (%d%%), caracterul %lu/%ld (%d%%)"
+"linia %ld/%ld (%d%%), coloana %lu/%lu (%d%%), caracterul %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Editorul de texte nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "versiune"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
-msgstr "Adus pentru d-voastrã de:"
+msgstr "Prezentat de:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
-msgstr "Mulþumiri speciale lui:"
+msgstr "Mulțumiri speciale pentru:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
-msgstr "The Free Software Foundation"
+msgstr "Fundația Free Software"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "traducătorilor cei mulți și pentru TP"
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Pentru ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
-msgstr "ºi oricine altcineva a fost uitat..."
+msgstr "și oricine altcineva a fost uitat..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
-msgstr "Vã mulþumim cã folosiþi nano!"
-
-#~ msgid "Direction"
-#~ msgstr "Direcþie"
-
-#~ msgid "Invoke the help menu"
-#~ msgstr "Invocã meniul de ajutor"
-
-#~ msgid "Search for text within the editor"
-#~ msgstr "Cautã un anumit text în editor"
+msgstr "Vă mulțumim că folosiți nano!"
 
-#~ msgid "Replace text within the editor"
-#~ msgstr "Înlocuieºte textul din editor"
-
-#~ msgid "Find other bracket"
-#~ msgstr "Gãseºte cealaltã parantezã"
-
-#~ msgid "Make the current search/replace case (in)sensitive"
-#~ msgstr ""
-#~ "Executã cãutarea/înlocuirea curentã indiferentã/senzitivã la mãrimea "
-#~ "literelor"
-
-#~ msgid "Make the current search/replace go backwards"
-#~ msgstr "Executã cãutarea/înlocuirea curentã spre înapoi"
-
-#~ msgid "Prepend to the current file"
-#~ msgstr "Pre-adaugã la fiºierul curent"
-
-#~ msgid "Back up original file when saving"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
 #~ msgstr ""
-#~ "Creazã copie de siguranþã (backup) pentru fiºierul original la salvare"
-
-#~ msgid "Insert into new buffer"
-#~ msgstr "Insereazã în bufer nou"
-
-#~ msgid ""
-#~ "\n"
-#~ "Buffer not written to %s (too many backup files?)\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Buferul nu a fost scris în %s (prea multe fiºiere copii de siguranþã "
-#~ "<backup>?)\n"
-
-#~ msgid "Up"
-#~ msgstr "Sus"
-
-#~ msgid "Space"
-#~ msgstr "Spaþiu"
-
-#~ msgid ""
-#~ "Usage: nano [+LINE] [GNU long option] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Folosire: nano [+LINIE] [opþiune GNU lungã] [opþiune] [fiºier]\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: nano [+LINE] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Folosire: nano [+LINIE] [opþiune] [fiºier]\n"
-#~ "\n"
-
-#~ msgid "+LINE"
-#~ msgstr "+LINIE"
-
-#~ msgid "Use more space for editing"
-#~ msgstr "Foloseºte mai mult spaþiu pentru editare"
-
-#~ msgid "Do regular expression searches"
-#~ msgstr "Executã cãutãri cu expresii regulare"
-
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "Seteazã coloane de umplere (sparge/wrap linii la) #coloane"
-
-#~ msgid "Verbatim input"
-#~ msgstr "Intrare identicã"
-
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "Nu am putut crea fiºier temporar: %s"
-
-#~ msgid "Come on, be reasonable"
-#~ msgstr "Haideþi, fiþi rezonabil"
-
-#~ msgid "Refusing zero-length regex match"
-#~ msgstr "Refuz potrivire regex de lungime 0"
-
-#~ msgid "Can't open \"%s\": %s"
-#~ msgstr "Nu pot deschide \"%s\": %s"
+#~ "Eroare internă: nu se poate găsi o potrivire pentru linia %ld. Vă rugăm "
+#~ "să salvați fișierul."
diff --git a/po/ru.gmo b/po/ru.gmo
index de92535..318855b 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index 9ff51f7..57cae74 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,116 +3,144 @@
 # This file is distributed under the same license as the nano package.
 #
 # Sergey A. Ribalchenko <fisher@obu.ck.ua>, 2001.
-# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2006-2007, 2008.
+# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2006-2007, 2008, 2014.
 # Serge A. Ribalchenko <serge.fisher@gmail.com>, 2007, 2008.
 # Pavel Maryanov <acid@jack.kiev.ua>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.5\n"
+"Project-Id-Version: nano 2.3.3pre2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-11-08 13:17+0200\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2014-05-27 08:39+0200\n"
 "Last-Translator: Pavel Maryanov <acid@jack.kiev.ua>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Poedit 1.6.5\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "К каталогу"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Отменено"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "�е удаёт�� выйти за границы %s в ограниченном режиме"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "Ошибка чтени� %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "�е удаёт�� переме�тить каталог"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(каталог)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(вверх)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Пои�к"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [С учётом реги�тра]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [РегВыр]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [�азад]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Пои�к завёрнут"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Это един�твенное �овпадение"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "�ечего и�кать"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"�е удало�ь получить мой идентификатор пользовател� дл� файла блокировки "
+"(ошибка getpwuid())"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "�е удало�ь определить им� компьютера дл� файла блокировки: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Ошибка запи�и файла блокировки %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Ошибка удалени� файла блокировки %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Ошибка открыти� файла блокировки %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "Ошибка чтени� файла блокировки %s: �едо�таточно данных прочитано"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, fuzzy, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Ошибка запи�и файла блокировки %s: %s"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "�е удаёт�� в�тавить файл �наружи %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "�ет больше открытых файловых буферов"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "Переключено в %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "�овый буфер"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
@@ -120,7 +148,7 @@ msgstr[0] "Прочитана %lu �трока (преобразовано из
 msgstr[1] "Прочитано %lu �троки (преобразовано из формата Mac и DOS)"
 msgstr[2] "Прочитано %lu �трок (преобразовано из формата Mac и DOS)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -138,7 +166,7 @@ msgstr[2] ""
 "Прочитано %lu �трок (преобразовано из формата Mac и DOS; предупреждение: нет "
 "до�тупа на запи�ь)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
@@ -146,7 +174,7 @@ msgstr[0] "Прочитана %lu �трока (преобразовано из
 msgstr[1] "Прочитано %lu �троки (преобразовано из формата Mac)"
 msgstr[2] "Прочитано %lu �трок (преобразовано из формата Mac)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -162,7 +190,7 @@ msgstr[2] ""
 "Прочитано %lu �трок (преобразовано из формата Mac; предупреждение: нет "
 "до�тупа на запи�ь)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
@@ -170,7 +198,7 @@ msgstr[0] "Прочитана %lu �трока (преобразовано из
 msgstr[1] "Прочитано %lu �троки (преобразовано из формата DOS)"
 msgstr[2] "Прочитано %lu �трок (преобразовано из формата DOS)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -186,7 +214,7 @@ msgstr[2] ""
 "Прочитано %lu �трок (преобразовано из формата DOS; предупреждение: нет "
 "до�тупа на запи�ь)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
@@ -194,7 +222,7 @@ msgstr[0] "Прочитана %lu �трока"
 msgstr[1] "Прочитано %lu �троки"
 msgstr[2] "Прочитано %lu �трок"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
@@ -202,85 +230,93 @@ msgstr[0] "Прочитана %lu �трока (предупреждение: н
 msgstr[1] "Прочитаны %lu �троки (предупреждение: нет до�тупа на запи�ь)"
 msgstr[2] "Прочитано %lu �трок (предупреждение: нет до�тупа на запи�ь)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Чтение файла"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "�овый файл"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "Файл «%s» не найден"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "Файл «%s» �вл�ет�� каталогом"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "Файл «%s» �вл�ет�� файлом у�трой�тва"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Команда дл� выполнени� в новом буфере [от %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Команда дл� выполнени� [от %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Файл дл� в�тавки в новый буфер [от %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Файл дл� в�тавки [от %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "�едопу�тима� клавиша в немногобуферном режиме"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"�е удало�ь запи�ать файл резервной копии, продолжить �охранение? (Ответьте � "
+"- е�ли не уверены)"
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "�е удаёт�� запи�ать за пределами %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "�е удаёт�� допи�ать в начале или в конце � параметром --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Ошибка запи�и файла резервной копии %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "Слишком много резервных файлов?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Ошибка запи�и %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "Ошибка запи�и временного файла: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
@@ -288,375 +324,331 @@ msgstr[0] "Запи�ана %lu �трока"
 msgstr[1] "Запи�ано %lu �троки"
 msgstr[2] "Запи�ано %lu �трок"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [формат DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [формат Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Копи�]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Добавить выделенное в начало файла"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Добавить выделенное в конец файла"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Запи�ать выделенное в файл"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Им� файла дл� добавлени� (в конец)"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Им� файла дл� добавлени� (в начало)"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Им� файла дл� запи�и"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Файл �уще�твует. ПЕРЕЗ�ПИС�ТЬ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Запи�ать файл под ДРУГИМ ИМЕ�ЕМ?"
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "Файл был изменён по�ле открыти�. Продолжить �охранение?"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(ещё)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"�ажмите ВВОД дл� продолжени� запу�ка nano.\n"
+"�ажмите ВВОД дл� продолжени�.\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Отмена"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Замена"
+#: src/files.c:2989
+#, fuzzy, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"�е удало�ь �оздать каталог %s: %s\n"
+"Он требует�� дл� �охранени�/загрузки и�тории пои�ка или позиции кур�ора\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "�е замен�ть"
+#: src/files.c:2995
+#, fuzzy, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"Путь %s - не �вл�ет�� каталогом, но должен им быть.\n"
+"Nano не �может загрузить или �охранить и�торию пои�ка или позицию кур�ора\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Уч.реги�тр"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Обнаружен �тарый файл и�тории nano (%s), который � попытал�� переме�тить\n"
+"на новое ме�то (%s), но произошла ошибка: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "�азад"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Обнаружен �тарый файл и�тории nano (%s), который � переме�тил\n"
+"на новое ме�то (%s)\n"
+"(�мотрите в nano FAQ об �том изменении)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Рег.выраж."
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Выход"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "ПредИ�тор"
+#: src/global.c:478
+msgid "Close"
+msgstr "Закрыть"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "СледИ�тор"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Отмен. вырезку"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "К �троке"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Отмен. ра�т�ж."
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "�айти далее"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "ПервыйФайл"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "По�леднФайл"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "К файлам"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "Формат DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Формат Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Доп. в начало"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Доп. в конец"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Резерв. копи�"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Выполнить команду"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Перейти к"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Помощь"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Выход"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Пои�к"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "ПредCтр"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "СледCтр"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "ПервСтрока"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Замена"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "По�лСтрока"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "К �троке"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Прио�тановка"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Пред. �трока"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "�ачПар"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "След. �трока"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "КонПар"
+#: src/global.c:497
+msgid "Read File"
+msgstr "ЧитФайл"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Выровн�ть"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Обновить"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "В�тавить файл"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "К �троке"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Выровн�ть текущий абзац"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Отменить текущую функцию"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Показать �ту �правку"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Закрыть текущий буфер / Выйти из nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Выход из nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Запи�ать текущий файл на ди�к"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "В�тавить другой файл в текущий"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "И�кать тек�т или регул�рное выражение"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "Перейти на предыдущий �кран"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "И�кать тек�т"
 
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "Перейти на �ледующий �кран"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Перейти на �кран вверх"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Перейти на �кран вниз"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Вырезать текущую �троку и �охранить её в буфере обмена"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "В�тавить �одержимое буфера обмена в текущую �троку"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Показать положение кур�ора"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Проверить орфографию, е�ли до�тупно"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Заменить тек�т или регул�рное выражение"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Перейти на указанный номер �троки и �толбца"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Отметить тек�т в текущей позиции кур�ора"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Отметить тек�т от текущей позиции кур�ора"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr "Повторить по�ледний пои�к"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Копировать текущую �троку и �охранить ее в буфере обмена"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Увеличить от�туп �троки"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Уменьшить от�туп �троки"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Отменить по�леднее дей�твие"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Повторить по�леднее отменённое дей�твие"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Вперёд на один �имвол"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "�азад на один �имвол"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Вперёд на одно �лово"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "�азад на одно �лово"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "�а предыдущую �троку"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "�а �ледующую �троку"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "�а начало текущей �троки"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "В конец текущей �троки"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "�а начало текущего абзаца; потом �ледующего абзаца"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "В конец текущего абзаца; потом �ледующего абзаца"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "�а первую �троку файла"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "�а по�леднюю �троку файла"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "�а �оответ�твующую �кобку"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "Прокрутить одну �троку вверх, не перемеща� кур�ор"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "Прокрутить одну �троку вниз, не перемеща� кур�ор"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Перейти в предыдущий буфер"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Перейти в �ледующий буфер"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "В�тавить �ледующую комбинацию клавиш как е�ть"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "В�тавить табул�цию в позиции кур�ора"
 
@@ -664,330 +656,436 @@ msgstr "В�тавить табул�цию в позиции кур�ора"
 msgid "Insert a newline at the cursor position"
 msgstr "В�тавить �троку в позиции кур�ора"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Удалить �имвол под кур�ором"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Удалить �имвол �лева от кур�ора"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Вырезать от позиции кур�ора до конца файла"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Выровн�ть по ширине текущий абзац"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "Под�читать количе�тво �лов, �трок и �имволов"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Обновить текущий �кран"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Прио�тановить редактор (е�ли включено)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "И�кать � учётом реги�тра"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "Изменить направление пои�ка"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "И�пользовать регул�рные выражени�"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Сбро�ить предыдущую �троку пои�ка/замены"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Сбро�ить �ледующую �троку пои�ка/замены"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Перейти в файловый браузер"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "И�пользовать формат DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "И�пользовать формат Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Добавл�ть в конец"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Добавл�ть в начало"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Делать резервные копии оригинала"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Выполнить внешнюю команду"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "И�пользовать новый буфер"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Выйти из файлового браузера"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Перейти к первому файлу в �пи�ке"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Перейти к по�леднему файлу в �пи�ке"
 
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "Перейти к �ледующему файлу в �пи�ке"
-
-#: src/global.c:642
+#: src/global.c:634
 msgid "Go to the previous file in the list"
 msgstr "Перейти к предыдущему файлу в �пи�ке"
 
-#: src/global.c:643
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Перейти к �ледующему файлу в �пи�ке"
+
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "Перейти к каталогу"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Закрыть"
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Проверить �интак�и� кода, е�ли до�тупно"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "�а предыдущее �ообщение"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "�а �ледующее �ообщение"
+
+#: src/global.c:642
+#, fuzzy
+msgid "Invoke formatter, if available"
+msgstr "Проверить �интак�и� кода, е�ли до�тупно"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Помощь"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Отмена"
+
+#: src/global.c:678
+msgid "Write Out"
 msgstr "Запи�ать"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Перейти к"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Вырезать"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Выровн�ть"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "ЧитФайл"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Словарь"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Вырезать"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Пров. �интак."
+
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "Формат DOS"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "ОтмВыравн"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Уч.реги�тр"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "ОтмВырезк"
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Рег.выраж."
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "�азад"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "�е замен�ть"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "ТекПозиц"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Словарь"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "ПредCтр"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "СледCтр"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "ПервСтрока"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "По�лСтрока"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "�а �кобку"
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Отметить"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Копировать"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "От�туп"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "ОтмОт�тупа"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Отмена"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Повтор"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Вперёд"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "�азад"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "След. �лово"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Вперёд"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Пред. �лово"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Пред. �трока"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "След. �трока"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "След. �лово"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "�ачало"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Конец"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "�айти другую �кобку"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "�ачПар"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "КонПар"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Прокрутить вверх"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Прокрутить вниз"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "Предыдущий файл"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Следующий файл"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Ввод «как е�ть»"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Подробный"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Табул�ци�"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Ввод"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Возврат каретки"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "Обрез. до конца"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Счётчик �лов"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Прио�тановка"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "ПредИ�тор"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "СледИ�тор"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "К �троке"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "Формат DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Формат Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Доп. в начало"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Доп. в конец"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Резерв. копи�"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Выполнить команду"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "К файлам"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "ПервыйФайл"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "По�леднФайл"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Пред. �ообщ. пров."
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "След. �ообщ. пров."
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Режим �правки"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Отображение по�то�нного положени� кур�ора"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "И�пользование дополнительной �троки дл� редактировани�"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Плавна� прокрутка"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "М�гкий перено� длинных �трок"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Отображение пробелов"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Под�ветка �интак�и�а"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Умна� клавиша HOME"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "�втоот�тупы"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Вырезать до конца"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Перено� длинных �трок"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Же�ткий перено� длинных �трок"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Конвертаци� табул�ций в пробелы"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "Резервные файлы"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "�е�колько файловых буферов"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Поддержка мыши"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Без преобразовани� из формата DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Прио�тановка"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "М�гкий перено� �трок"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1009,7 +1107,7 @@ msgstr ""
 "пои�ка. Е�ли нажать клаишу ВВОД без редактировани� тек�та, будет продолжен "
 "предыдущий пои�к.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1023,7 +1121,7 @@ msgstr ""
 " Следующие функциональные клавиши до�тупны в режиме пои�ка:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1043,7 +1141,7 @@ msgstr ""
 " Следующие функциональные клавиши до�тупны в режиме Перейти к �троке:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1066,7 +1164,7 @@ msgstr ""
 "файла в отдельный буфер (и�пользуйте Meta-< and > дл� переключени� между "
 "файловыми буферами).  "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1080,7 +1178,7 @@ msgstr ""
 " Следующие функциональные клавиши до�тупны в режиме В�тавка файла:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1107,7 +1205,7 @@ msgstr ""
 " Следующие клавиши до�тупны в режиме запи�и файла:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1127,12 +1225,12 @@ msgstr ""
 "Пользуйте�ь клавишами �о �трелками или PageUp/PageDown дл� перехода по "
 "�одержимому каталога, и клавишами S или ВВОД дл� выбора нужного файла или "
 "входа в выбранный каталог. Дл� перемещени� вверх на одну директорию, "
-"выберите директорию, названную \"..\" в �амом верху �пи�ка файлов.\n"
+"выберите директорию, названную «..» в �амом верху �пи�ка файлов.\n"
 "\n"
 " Следующие функциональные клавиши до�тупны в про�мотрщике файлов:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1158,16 +1256,15 @@ msgstr ""
 " Следующие функциональные клавиши до�тупны в режиме пои�ка:\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-"  Следующие функциональные клавиши до�тупны в режиме Пои�к про�мотрщика :\n"
-":\n"
+" Следующие функциональные клавиши до�тупны в режиме Пои�к про�мотрщика:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1190,7 +1287,7 @@ msgstr ""
 "Про�мотрщика:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1214,7 +1311,7 @@ msgstr ""
 " Следующие функциональные клавиши до�тупны в режиме проверки правопи�ани�:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1235,7 +1332,7 @@ msgstr ""
 " Следующие функциональные клавиши до�тупны в режиме Внешн�� Команда:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1246,7 +1343,7 @@ msgid ""
 "showing the file being edited.  The status line is the third line from the "
 "bottom and shows important messages.  "
 msgstr ""
-" Тек�т помощи nano\n"
+"Тек�т помощи nano\n"
 "\n"
 " Редактор nano разработан дл� �мул�ции функционально�ти и про�тоты "
 "и�пользовани� оригинального редактора UW Pico. Редактор разбит на 4 о�новные "
@@ -1255,7 +1352,7 @@ msgstr ""
 "�то главное окно редактировани�, в котором отображен редактируемый файл. "
 "Строка �о�то�ни� - 3 �трока �низу - показывает разные важные �ообщени�.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1273,7 +1370,7 @@ msgstr ""
 "и могут быть введены при помощи кнопок Esc, Alt или Meta, в зави�имо�ти от "
 "и�пользуемой клавиатуры.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1287,15 +1384,15 @@ msgstr ""
 "возра�танию:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "разрешить/запретить"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "�еверна� клавиша в режиме про�мотра"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1304,7 +1401,7 @@ msgstr ""
 "\n"
 "Буфер запи�ан в %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1313,7 +1410,7 @@ msgstr ""
 "\n"
 "Буфер не запи�ан в %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1322,11 +1419,11 @@ msgstr ""
 "\n"
 "Буфер не запи�ан в %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Размер окна �лишком мал дл� Nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1335,251 +1432,257 @@ msgstr ""
 "И�пользование: nano [ОПЦИИ] [[+СТРОК�,СТОЛБЕЦ] Ф�ЙЛ]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Опци�\t\tДлинна� форма\t\tЗначение\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Опци�\t\tЗначение\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Показывать �то �ообщение"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+СТРОК�,СТОЛБЕЦ"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "�ачать �о �троки СТРОК�, �толбца СТОЛБЕЦ"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Включить умную клавишу home"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Делать резервные копии �уще�твующих файлов при �охранении"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <дир>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<дир>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "Каталог дл� �охранени� уникальных резервных файлов"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "И�пользовать жирный шрифт вме�то обычного"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Конвертировать табул�ции в пробелы"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Разрешить не�колько файловых буферов"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "И�пользовать файлы блокировки (vim-�тиль)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Сохран�ть и читать и�торию пои�ка/замены �трок"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "�е и�пользовать на файлы nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Решить проблему зави�ани� цифровой клавиатуры"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "�е добавл�ть пу�тые �троки в конце файла"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "�е преобразовывать из DOS/Mac формата"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "И�пользование дополнительной �троки дл� редактировани�"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Сохран�ть и загружать позицию кур�ора"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <�тр>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<�тр>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Строка цитировани�"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Запрещенный режим"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "По�трочна� прокрутка вме�то полу-�кранной"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#чи�>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#чи�>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "У�тановить ширину табул�ции в #чи� �толбцов"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Делать бы�трую очи�тку �троки �о�то�ни�"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Показать вер�ию и выйти"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Определ�ть границы �лов более точно"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <�тр>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<�тр>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "И�пользовать опи�ание �интак�и�а дл� под�ветки"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "По�то�нно показывать позицию кур�ора"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Решить проблему Backspace/Delete"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Показать �ту �правку"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "�втоматиче�кий от�туп на новых �троках"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Вырезать от кур�ора до конца �троки"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "�е �ледовать по �имвольным ��ылкам, перепи�ывать"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "Разрешить и�пользование мыши"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "�е читать файл (только пи�ать его)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <дир>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<дир>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "У�тановить рабочий каталог"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Зарезервировать кнопки XON (^Q) и XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "Молча игнорировать ошибки запу�ка, например rc-файла"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#�толбцы>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#�толбцы>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "У�тановить точку перено�а �троки на #�толбцы"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "У�тановить точку же�ткого перено�а �троки на #�толбцы"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <программа>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<программа>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "И�пользовать альтернативную программу проверки орфографии"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "�втозапи�ь при выходе, без лишних вопро�ов"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Разрешить функцию отмены дей�твий [ЭКСПЕРИМЕ�Т�ЛЬ��Я]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Режим про�мотра (только чтение)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "�е перено�ить длинные �троки"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "�е делать же�ткий перено� длинных �трок"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "�е показывать две �троки помощи внизу"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "Разрешить прио�тановку"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "Включить м�гкий перено� �трок"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(игнорирует��, дл� �овме�тимо�ти � Pico)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano вер�и� %s (�обрано %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " Эл. почта: nano@nano-editor.org\tСайт: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1588,154 +1691,180 @@ msgstr ""
 "\n"
 " Параметры �борки:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Поддержка �той функции была отключена"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "Сохранить изменённый буфер? (И��ЧЕ ВСЕ ИЗМЕ�Е�ИЯ БУДУТ ПОТЕРЯ�Ы)"
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "�е удало�ь повторно открыть �тандартный ввод � клавиатуры\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "Чтение из �тандартного ввода. ^C дл� прерывани�\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Получен SIGHUP или SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "И�пользуйте «fg» дл� возврата в nano\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "включено"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "отключено"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "�еизве�тна� команда"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON проигнорирован, мр-бр-бр"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF проигнорирован, мр-бр-бр"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "Запрошенный размер табул�ции «%s» не подходит"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "Запрошенный размер заполнени� «%s» не подходит"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Введите «%s -h» дл� получени� �пи�ка до�тупных опций.\n"
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "YyДд"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn�н"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "AaВв"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Да"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "В�е"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "�ет"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Ошибка в позиции %s �троки %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "�ргумент %s имеет незакрытую \""
+msgstr "�ргумент «%s» имеет незакрытую \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
 "Строки регул�рных выражений должны начинать�� и заканчивать�� �имволом \""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Плохое регул�рное выражение «%s»: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "От�ут�твует название �интак�и�а"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "Синтак�и� «none» зарезервирован"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "Синтак�и� «default» не должен иметь ра�ширений"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "От�ут�твует название клавиши"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "прив�зки клавиш должны начинать�� � «^», «M» или «F»"
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "�азвание ключа �лишком короткое"
+
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Прив�зки клавиш должны начинать�� � «^», «M» или «F»"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr "Укажите функцию, которой назначает�� клавиша"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "Укажите меню, которому назначает�� клавиша (или «all»)"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
+"Вы должны указать им� меню (или «в�е») на которое нужно назначить/убрать "
+"назначение клавиши"
+
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "�е удало�ь �опо�тавить им� «%s» к функции"
+
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "�е удало�ь �опо�тавить им� «%s» к меню"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:528
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "�е удало�ь �опо�тавить им� «%s» функции"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:543
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "�е удало�ь �опо�тавить им� «%s» меню"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Прив�зка «%s» не может быть переназначена"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:629
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "Прив�зка «%s» не �вл�ет�� допу�тимой"
+msgid "Error expanding %s: %s"
+msgstr "Ошибка ра�ширени� %s: %s"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1750,116 +1879,172 @@ msgstr ""
 "«black», � необ�зательным префик�ом «bright»\n"
 "дл� цвета фона."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "�е удаёт�� добавить команду цвета без команды �интак�и�а"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "От�ут�твует название цвета"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Цвет фона \"%s\" не может быть �ветлым"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "От�ут�твует регул�рное выражение"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\"start=\" требует �оответ�твующего \"end=\""
+msgstr "«start=» требует �оответ�твующего «end=»"
+
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Цвет фона «%s» не может быть �ветлым"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "�е удаёт�� добавить рег. выражение заголовка без команды �интак�и�а"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "�е удаёт�� добавить магиче�кое рег. выражение без команды �интак�и�а"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "От�ут�твует магиче�ка� �трока"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "�е удаёт�� добавить анализатор �интак�и�а без команды �интак�и�а"
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "От�ут�твует команда анализатора �интак�и�а"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "�е удаёт�� добавить анализатор �интак�и�а без команды �интак�и�а"
+
+#: src/rcfile.c:1015
+#, fuzzy
+msgid "Missing formatter command"
+msgstr "От�ут�твует команда анализатора �интак�и�а"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Критиче�ка� ошибка: дл� дей�тви� \"%s\" не назначены клавиши"
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "Критиче�ка� ошибка: дл� функции «%s» не назначены клавиши.  Выхожу.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"Выхожу.  И�пользуйте nano � опцией -I е�ли требует�� под�троить параметры "
-"вашего nanorc\n"
+"И�пользуйте nano � опцией -I, е�ли требует�� под�троить параметры вашего "
+"nanorc.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "�е удало�ь �опо�тавить им� «%s» к ра�ширению"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr "Команда \"%s\" не разрешена во включенном файле"
+msgstr "Команда «%s» не разрешена во включенном файле"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr "Синтак�и� \"%s\" не имеет цветовых команд"
+msgstr "Синтак�и� «%s» не имеет цветовых команд"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "�е пон�тна� команда \"%s\""
+msgstr "�епон�тна� команда «%s»"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "От�ут�твует опци�"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Параметр от�ут�твует "
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "Опци� \"%s\" требует аргумент"
+msgstr "Опци� «%s» требует аргумент"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Опци� не правильна� многобайтова� �трока"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Требует�� не пу�той �имвол"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Требует�� два одно�трочных �имвола"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "�е удаёт�� �н�ть флаг  \"%s\""
+msgid "Cannot unset option \"%s\""
+msgstr "�е удало�ь �н�ть опцию «%s»"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "�еизве�тный флаг \"%s\""
+msgid "Unknown option \"%s\""
+msgstr "�еизве�тна� опци� «%s»"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "�е могу найти �об�твенную домашнюю директорию! Йой!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"�ажмите ВВОД дл� продолжени� запу�ка nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "\"%.*s%s\" не найден"
+msgstr "«%.*s%s» не найден"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [С учётом реги�тра]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [РегВыр]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [�азад]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (что мен�ть) в выделении"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (что мен�ть)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Заменить �то вхождение?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Заменить на"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
@@ -1867,19 +2052,20 @@ msgstr[0] "Замененное %lu вхождение"
 msgstr[1] "Замененные %lu вхождени�"
 msgstr[2] "Заменено %lu вхождений"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Введите номер �троки и �толбца"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "�еправильный номер �троки или �толбца"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "�е �кобка"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "�ет �оответ�твующей �кобки"
 
@@ -1891,218 +2077,316 @@ msgstr "Метка у�тановлена"
 msgid "Mark Unset"
 msgstr "Метка �н�та"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "Буфер отмены дей�твий пу�т!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
-"Внутренн�� ошибка: не удаёт�� �опо�тавить �троку %d. Сохраните �вою работу"
+"Внутренн�� ошибка: не удаёт�� �опо�тавить �троку %d. Сохраните �вою работу."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "добавление тек�та"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "удаление тек�та"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "перено� �троки"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "объединение �трок"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "обрезка тек�та"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "отмена обрезки тек�та"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "нова� �трока"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "в�тавка тек�та"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "замена тек�та"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr "Внутренн�� ошибка: неизве�тный тип. Сохраните �вою работу"
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Отменённое дей�твие (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "�ечего повтор�ть!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "Внутренн�� ошибка: ошибка на�тройки повтора. Сохраните �вою работу"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr ""
+"Внутренн�� ошибка: ошибка на�тройки повторени� изменени�. Сохраните �вою "
+"работу."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Повторённое дей�твие (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "�е удало�ь перенаправить в конвейер"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "�е удало�ь �оздать конвейер"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "�е удало�ь �оздать дочерний проце��"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
-"Внутренн�� ошибка: ошибка на�тройки отмены образки. Сохраните �вою работу"
+"Внутренн�� ошибка: ошибка на�тройки отмены обрезки. Сохраните �вою работу."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Внутренн�� ошибка: неизве�тный тип. Сохраните �вою работу"
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "�едопу�тима� �трока цитировани� %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Сейча� можно отменить выравнивание!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Редактировать замену"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "�е удало�ь �оздать конвейер"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Идёт �оздание �пи�ка ошибочных �лов. Подождите..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "�е удало�ь получить размер буфера конвейера"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
-msgstr "Ошибка выполнени� \"spell\""
+msgstr "Ошибка выполнени� «spell»"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
-msgstr "Ошибка выполнени� \"sort -f\""
+msgstr "Ошибка выполнени� «sort -f»"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
-msgstr "Ошибка выполнени� \"uniq\""
+msgstr "Ошибка выполнени� «uniq»"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Проверка правопи�ани� завершена"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "Ошибка выполнени� \"%s\""
+msgstr "Ошибка выполнени� «%s»"
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Запу�к проверки орфографии, подождите"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Проверка правопи�ани� не удала�ь: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Проверка правопи�ани� не удала�ь: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Дл� данного типа файла не на�троена программа проверки �интак�и�а!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Сохранить измененный буфер перед проверкой?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Запу�к проверки, подождите"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Получено 0 ра�познанных �трок от комманды: %s"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr "Это �ообщение о не открытом файле %s, открыть его в новом буфере?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "По�леднее �ообщение"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Первое �ообщение"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+#, fuzzy
+msgid "Invoking formatter, please wait"
+msgstr "Запу�к проверки, подождите"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sСлов: %lu  Строк: %ld  Символов: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "В выделении:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Ввод «как е�ть»"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "�едо�таточно пам�ти дл� nano!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Юникод код"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "Изменён"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Смотр"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "Дир:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Файл:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Предупреждение: Измен�� не заблокированный файл, провер�ть до�туп к каталогу?"
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "�трока %ld/%ld (%d%%), �толбец %lu/%lu (%d%%), �имвол %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Тек�товый редактор nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "вер�и�"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Предо�тавлен вам:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "О�оба� благодарно�ть:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr ""
 "The Free Software Foundation (фонд �вободного программного обе�печени�)"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "Дл� ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr ""
 "Дмитрию Р�занцеву за помощь в переводе и в�ем о�тальным, кого мы забыли "
 "упом�нуть..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Спа�ибо за то, что выбрали nano!"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Разрешить функцию отмены дей�твий [ЭКСПЕРИМЕ�Т�ЛЬ��Я]"
+
+#~ msgid "line wrap"
+#~ msgstr "перено� �троки"
+
+#~ msgid "Insert File"
+#~ msgstr "В�тавить файл"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Перейти на предыдущий �кран"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "�айти другую �кобку"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Перено� длинных �трок"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "М�гкий перено� �трок"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(игнорирует��, дл� �овме�тимо�ти � Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Укажите меню, которому назначает�� клавиша (или «all»)"
+
+#~ msgid "Missing flag"
+#~ msgstr "От�ут�твует опци�"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Внутренн�� ошибка: неизве�тный тип. Сохраните �вою работу"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr "Внутренн�� ошибка: ошибка на�тройки повтора. Сохраните �вою работу"
+
+#~ msgid "Could not pipe"
+#~ msgstr "�е удало�ь перенаправить в конвейер"
diff --git a/po/rw.gmo b/po/rw.gmo
deleted file mode 100644
index 9ca4657..0000000
--- a/po/rw.gmo
+++ /dev/null
diff --git a/po/rw.po b/po/rw.po
deleted file mode 100644
index 0e7bfc2..0000000
--- a/po/rw.po
+++ /dev/null
@@ -1,2454 +0,0 @@
-# translation of nano to Kinyarwanda.
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# This file is distributed under the same license as the nano package.
-# Steve Murphy <murf@e-tools.com>, 2005
-# Steve performed initial rough translation from compendium built from translations provided by the following translators:
-# Philibert Ndandali  <ndandali@yahoo.fr>, 2005.
-# Viateur MUGENZI <muvia1@yahoo.fr>, 2005.
-# Noëlla Mupole <s24211045@tuks.co.za>, 2005.
-# Carole Karema <karemacarole@hotmail.com>, 2005.
-# JEAN BAPTISTE NGENDAHAYO <ngenda_denis@yahoo.co.uk>, 2005.
-# Augustin KIBERWA  <akiberwa@yahoo.co.uk>, 2005.
-# Donatien NSENGIYUMVA <ndonatienuk@yahoo.co.uk>, 2005.
-# Antoine Bigirimana <antoine@e-tools.com>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: nano 1.3.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2005-04-03 10:55-0700\n"
-"Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
-"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/browser.c:220
-msgid "Go To Directory"
-msgstr ""
-
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
-msgid "Cancelled"
-msgstr "Kureka"
-
-#: src/browser.c:266 src/browser.c:314
-#, fuzzy, c-format
-msgid "Can't go outside of %s in restricted mode"
-msgstr "Gyayo Hanze Bya in Nta gukoresha bisesuye Ubwoko"
-
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
-#, c-format
-msgid "Error reading %s: %s"
-msgstr ""
-
-#: src/browser.c:303
-#, fuzzy
-msgid "Can't move up a directory"
-msgstr "Kwimura Hejuru a bushyinguro"
-
-#. TRANSLATORS: Try to keep this at most 7
-#. * characters.
-#: src/browser.c:665 src/browser.c:674
-msgid "(dir)"
-msgstr ""
-
-#. TRANSLATORS: Try to keep this at most 12
-#. * characters.
-#: src/browser.c:671
-msgid "(parent dir)"
-msgstr ""
-
-# #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
-# offmgr/source\offapp\dialog\inetdlg.src:RID_OFADLG_INTERNET.1.RID_SVXPAGE_INET_SEARCH.text
-# #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
-# offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_INET_DLG.3.text
-#: src/browser.c:801 src/search.c:185
-msgid "Search"
-msgstr "Gushaka"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr ""
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr ""
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr ""
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
-msgid "Search Wrapped"
-msgstr ""
-
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
-#, fuzzy
-msgid "This is the only occurrence"
-msgstr "ni i ukugaragara"
-
-#: src/browser.c:1042 src/search.c:583
-#, fuzzy
-msgid "No current search pattern"
-msgstr "KIGEZWEHO Gushaka Ishusho"
-
-#: src/files.c:125
-#, fuzzy, c-format
-msgid "Can't insert file from outside of %s"
-msgstr "Kongeramo IDOSIYE Bivuye Hanze Bya"
-
-#: src/files.c:234
-#, fuzzy
-msgid "No more open file buffers"
-msgstr "Birenzeho Gufungura IDOSIYE"
-
-#: src/files.c:250
-#, fuzzy, c-format
-msgid "Switched to %s"
-msgstr "Kuri"
-
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
-msgid "New Buffer"
-msgstr ""
-
-#: src/files.c:633
-#, fuzzy, c-format
-msgid "Read %lu line (Converted from DOS and Mac format)"
-msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
-msgstr[0] "Umurongo Bivuye Na Imiterere"
-
-#: src/files.c:638
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
-"permission)"
-msgstr[0] "Umurongo Bivuye Na Imiterere"
-
-#: src/files.c:644
-#, fuzzy, c-format
-msgid "Read %lu line (Converted from Mac format)"
-msgid_plural "Read %lu lines (Converted from Mac format)"
-msgstr[0] "Umurongo Bivuye Imiterere"
-
-#: src/files.c:648
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from Mac format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "Umurongo Bivuye Imiterere"
-
-#: src/files.c:654
-#, fuzzy, c-format
-msgid "Read %lu line (Converted from DOS format)"
-msgid_plural "Read %lu lines (Converted from DOS format)"
-msgstr[0] "Umurongo Bivuye Imiterere"
-
-#: src/files.c:658
-#, fuzzy, c-format
-msgid ""
-"Read %lu line (Converted from DOS format - Warning: No write permission)"
-msgid_plural ""
-"Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "Umurongo Bivuye Imiterere"
-
-#: src/files.c:664
-#, fuzzy, c-format
-msgid "Read %lu line"
-msgid_plural "Read %lu lines"
-msgstr[0] "Umurongo"
-
-#: src/files.c:667
-#, c-format
-msgid "Read %lu line ( Warning: No write permission)"
-msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/files.c:700 src/files.c:736
-#, fuzzy
-msgid "Reading File"
-msgstr "Idosiye"
-
-#: src/files.c:706
-#, fuzzy
-msgid "New File"
-msgstr "Idosiye"
-
-# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
-# sw/source\ui\dochdl\dochdl.src:STR_NOGLOS2.text
-# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
-# sw/source\ui\uiview\view.src:STR_NOGLOS2.text
-#: src/files.c:709
-#, fuzzy, c-format
-msgid "\"%s\" not found"
-msgstr "\"%s\"ntibyabonetse"
-
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
-#, fuzzy, c-format
-msgid "\"%s\" is a directory"
-msgstr "\"%s\"ni a bushyinguro"
-
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
-#, fuzzy, c-format
-msgid "\"%s\" is a device file"
-msgstr "Idosiye ni a APAREYE IDOSIYE"
-
-#: src/files.c:817
-#, fuzzy, c-format
-msgid "Command to execute in new buffer [from %s] "
-msgstr "Kuri Gukora in Gishya Bivuye"
-
-#: src/files.c:819
-#, fuzzy, c-format
-msgid "Command to execute [from %s] "
-msgstr "Kuri Gukora Bivuye"
-
-#: src/files.c:825
-#, fuzzy, c-format
-msgid "File to insert into new buffer [from %s] "
-msgstr "Idosiye Kuri Kongeramo Gishya Bivuye"
-
-#: src/files.c:827
-#, fuzzy, c-format
-msgid "File to insert [from %s] "
-msgstr "Idosiye Kuri Kongeramo Bivuye"
-
-#: src/files.c:1077
-#, fuzzy
-msgid "Key invalid in non-multibuffer mode"
-msgstr "in Ubwoko"
-
-#: src/files.c:1486
-#, fuzzy, c-format
-msgid "Can't write outside of %s"
-msgstr "Kwandika Hanze Bya"
-
-#: src/files.c:1501
-#, fuzzy
-msgid "Cannot prepend or append to a symlink with --nofollow set"
-msgstr "Cyangwa Kongeraho... Kuri a Na: Gushyiraho"
-
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
-#, fuzzy, c-format
-msgid "Error writing backup file %s: %s"
-msgstr "IDOSIYE"
-
-#: src/files.c:1582 src/nano.c:701
-#, fuzzy
-msgid "Too many backup files?"
-msgstr "Idosiye"
-
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
-#, c-format
-msgid "Error writing %s: %s"
-msgstr ""
-
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
-#, fuzzy, c-format
-msgid "Error writing temp file: %s"
-msgstr "IDOSIYE"
-
-#: src/files.c:1900
-#, fuzzy, c-format
-msgid "Wrote %lu line"
-msgid_plural "Wrote %lu lines"
-msgstr[0] "Umurongo"
-
-#: src/files.c:2004
-msgid " [DOS Format]"
-msgstr ""
-
-#: src/files.c:2005
-msgid " [Mac Format]"
-msgstr ""
-
-#: src/files.c:2007
-msgid " [Backup]"
-msgstr ""
-
-#: src/files.c:2015
-#, fuzzy
-msgid "Prepend Selection to File"
-msgstr "Kuri Idosiye"
-
-#: src/files.c:2016
-#, fuzzy
-msgid "Append Selection to File"
-msgstr "Kuri Idosiye"
-
-#: src/files.c:2017
-#, fuzzy
-msgid "Write Selection to File"
-msgstr "Kuri Idosiye"
-
-#: src/files.c:2020
-#, fuzzy
-msgid "File Name to Prepend to"
-msgstr "Idosiye Kuri Kuri"
-
-#: src/files.c:2021
-#, fuzzy
-msgid "File Name to Append to"
-msgstr "Idosiye Kuri Kuri"
-
-#: src/files.c:2022
-#, fuzzy
-msgid "File Name to Write"
-msgstr "Idosiye Kuri"
-
-#: src/files.c:2153
-#, fuzzy
-msgid "File exists, OVERWRITE ? "
-msgstr "Idosiye"
-
-#: src/files.c:2162
-#, fuzzy
-msgid "Save file under DIFFERENT NAME ? "
-msgstr "Kubika IDOSIYE"
-
-#: src/files.c:2173
-msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
-
-#: src/files.c:2611
-#, fuzzy
-msgid "(more)"
-msgstr "(Birenzeho"
-
-#: src/files.c:2694 src/rcfile.c:1220
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Press Enter to continue starting nano.\n"
-msgstr "Kuri urifuzagukomeza"
-
-# crashrep/source\all\crashrep.lng:%CANCEL_BUTTON%.text
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Kureka"
-
-# offmgr/source\offapp\dialog\autocdlg.src:RID_OFA_AUTOCORR_DLG.1.RID_OFAPAGE_AUTOCORR_REPLACE.text
-#: src/global.c:416
-msgid "Replace"
-msgstr "Gusimbura"
-
-#: src/global.c:417
-msgid "No Replace"
-msgstr ""
-
-#: src/global.c:420
-msgid "Case Sens"
-msgstr ""
-
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_AXIS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_X_AXIS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_Y_AXIS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_Z_AXIS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_GRID.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_LINE.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib.src:TAB_TITLE.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib.src:TAB_LEGEND.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib.src:TAB_DATA_LINE.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib.src:TAB_DATA_POINT.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib3.src:TAB_DIAGRAM_FLOOR.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib3.src:TAB_DIAGRAM_AREA.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib4.src:TAB_DIAGRAM_STOCK_LOSS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib4.src:TAB_DIAGRAM_STOCK_PLUS.1.text
-#: src/global.c:421
-#, fuzzy
-msgid "Backwards"
-msgstr "Inyuma"
-
-#: src/global.c:425
-msgid "Regexp"
-msgstr ""
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-#, fuzzy
-msgid "PrevHstory"
-msgstr "Urutonde"
-
-#: src/global.c:452
-#, fuzzy
-msgid "NextHstory"
-msgstr "Urutonde"
-
-#: src/global.c:453
-msgid "Go To Text"
-msgstr ""
-
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
-msgid "WhereIs Next"
-msgstr ""
-
-# svx/source\dialog\paragrph.src:RID_SVXPAGE_STD_PARAGRAPH.FT_FLINEINDENT.text
-#: src/global.c:457
-#, fuzzy
-msgid "First File"
-msgstr "Umurongo ubanza"
-
-# svx/source\dialog\paragrph.src:RID_SVXPAGE_ALIGN_PARAGRAPH.FT_LASTLINE.text
-#: src/global.c:458
-#, fuzzy
-msgid "Last File"
-msgstr "Umurongo wa nyuma"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr ""
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr ""
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr ""
-
-# 214
-#: src/global.c:464
-msgid "Append"
-msgstr "kugereka"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr ""
-
-# 503
-#: src/global.c:466
-#, fuzzy
-msgid "Backup File"
-msgstr "inyibutsabubiko"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr ""
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr ""
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr ""
-
-# #-#-#-#-#  setup2.pot (PACKAGE VERSION)  #-#-#-#-#
-# setup2/source\ui\app.src:STR_RESTART_BTN_NO.text
-# #-#-#-#-#  setup2.pot (PACKAGE VERSION)  #-#-#-#-#
-# setup2/source\ui\pages\phavefun.src:RESID_PAGE_PAGEHAVEFUN.STR_LOGOUT_BTN_NO.text
-#: src/global.c:481
-msgid "Exit"
-msgstr "Gusohoka"
-
-#: src/global.c:482
-msgid "Where Is"
-msgstr ""
-
-#: src/global.c:483
-msgid "Prev Page"
-msgstr ""
-
-# sc/sdi\scslots.src:SID_PREVIEW_NEXT.text
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Ipaji ikurikira"
-
-# svx/source\dialog\paragrph.src:RID_SVXPAGE_STD_PARAGRAPH.FT_FLINEINDENT.text
-#: src/global.c:485
-#, fuzzy
-msgid "First Line"
-msgstr "Umurongo ubanza"
-
-# svx/source\dialog\paragrph.src:RID_SVXPAGE_ALIGN_PARAGRAPH.FT_LASTLINE.text
-#: src/global.c:486
-#, fuzzy
-msgid "Last Line"
-msgstr "Umurongo wa nyuma"
-
-#: src/global.c:487
-msgid "Suspend"
-msgstr ""
-
-#: src/global.c:489
-#, fuzzy
-msgid "Beg of Par"
-msgstr "Bya"
-
-#: src/global.c:490
-#, fuzzy
-msgid "End of Par"
-msgstr "Impera Bya"
-
-#: src/global.c:491
-msgid "FullJstify"
-msgstr ""
-
-# dbaccess/source/ui/inc/toolbox.hrc:MID_SBA_QRY_REFRESH.text
-#: src/global.c:493
-msgid "Refresh"
-msgstr "Kugira gishya"
-
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Kongeramo Idosiye"
-
-#: src/global.c:497
-#, fuzzy
-msgid "Go To Line"
-msgstr "Gya kumurongo"
-
-#: src/global.c:500
-#, fuzzy
-msgid "Justify the current paragraph"
-msgstr "i KIGEZWEHO Igika"
-
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
-#, fuzzy
-msgid "Cancel the current function"
-msgstr "i KIGEZWEHO Umumaro"
-
-#: src/global.c:506
-msgid "Display this help text"
-msgstr ""
-
-#: src/global.c:509
-#, fuzzy
-msgid "Close the current file buffer / Exit from nano"
-msgstr "Funga IDOSIYE Bivuye"
-
-#: src/global.c:511
-#, fuzzy
-msgid "Exit from nano"
-msgstr "Bivuye"
-
-#: src/global.c:515
-#, fuzzy
-msgid "Write the current file to disk"
-msgstr "i KIGEZWEHO IDOSIYE Kuri"
-
-#: src/global.c:517
-#, fuzzy
-msgid "Insert another file into the current one"
-msgstr "IDOSIYE i KIGEZWEHO"
-
-#: src/global.c:519
-#, fuzzy
-msgid "Search for a string or a regular expression"
-msgstr "Ibisanzwe"
-
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Kuri i Ibanjirije Mugaragaza"
-
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Kuri i Komeza>> Mugaragaza"
-
-#: src/global.c:523
-#, fuzzy
-msgid "Cut the current line and store it in the cutbuffer"
-msgstr "i KIGEZWEHO Umurongo Na in i"
-
-#: src/global.c:525
-#, fuzzy
-msgid "Uncut from the cutbuffer into the current line"
-msgstr "Bivuye i i KIGEZWEHO Umurongo"
-
-#: src/global.c:527
-#, fuzzy
-msgid "Display the position of the cursor"
-msgstr "i Ibirindiro Bya i indanga"
-
-#: src/global.c:529
-#, fuzzy
-msgid "Invoke the spell checker, if available"
-msgstr "i Genzuranyuguti NIBA Bihari"
-
-#: src/global.c:531
-#, fuzzy
-msgid "Replace a string or a regular expression"
-msgstr "Ibisanzwe"
-
-#: src/global.c:532
-#, fuzzy
-msgid "Go to line and column number"
-msgstr "Kuri a Umurongo Umubare"
-
-#: src/global.c:534
-#, fuzzy
-msgid "Mark text at the cursor position"
-msgstr "Umwandiko ku i indanga Ibirindiro"
-
-#: src/global.c:535
-#, fuzzy
-msgid "Repeat last search"
-msgstr "Iheruka Gushaka"
-
-#: src/global.c:537
-#, fuzzy
-msgid "Copy the current line and store it in the cutbuffer"
-msgstr "i KIGEZWEHO Umurongo Na in i"
-
-#: src/global.c:538
-#, fuzzy
-msgid "Indent the current line"
-msgstr "Kuri i KIGEZWEHO IDOSIYE"
-
-#: src/global.c:539
-#, fuzzy
-msgid "Unindent the current line"
-msgstr "Kuri i KIGEZWEHO IDOSIYE"
-
-#: src/global.c:540
-msgid "Undo the last operation"
-msgstr ""
-
-#: src/global.c:541
-msgid "Redo the last undone operation"
-msgstr ""
-
-#: src/global.c:543
-#, fuzzy
-msgid "Go forward one character"
-msgstr "Imbere Inyuguti"
-
-#: src/global.c:544
-#, fuzzy
-msgid "Go back one character"
-msgstr "Inyuma Inyuguti"
-
-#: src/global.c:546
-#, fuzzy
-msgid "Go forward one word"
-msgstr "Imbere ijambo"
-
-#: src/global.c:547
-#, fuzzy
-msgid "Go back one word"
-msgstr "subira inyuma ijambo"
-
-#: src/global.c:549
-#, fuzzy
-msgid "Go to previous line"
-msgstr "Kuri i Ibanjirije Umurongo"
-
-#: src/global.c:550
-#, fuzzy
-msgid "Go to next line"
-msgstr "Kuri i Komeza>> Umurongo"
-
-#: src/global.c:551
-#, fuzzy
-msgid "Go to beginning of current line"
-msgstr "Kuri i Itangiriro Bya i KIGEZWEHO Umurongo"
-
-#: src/global.c:552
-#, fuzzy
-msgid "Go to end of current line"
-msgstr "Kuri i Impera Bya i KIGEZWEHO Umurongo"
-
-#: src/global.c:555
-#, fuzzy
-msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "Kuri i Itangiriro Bya i KIGEZWEHO Igika"
-
-#: src/global.c:557
-#, fuzzy
-msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Kuri i Impera Bya i KIGEZWEHO Igika"
-
-#: src/global.c:560
-#, fuzzy
-msgid "Go to the first line of the file"
-msgstr "Kuri i Itangira Umurongo Bya i IDOSIYE"
-
-#: src/global.c:562
-#, fuzzy
-msgid "Go to the last line of the file"
-msgstr "Kuri i Iheruka Umurongo Bya i IDOSIYE"
-
-#: src/global.c:564
-#, fuzzy
-msgid "Go to the matching bracket"
-msgstr "a"
-
-#: src/global.c:566
-msgid "Scroll up one line without scrolling the cursor"
-msgstr ""
-
-#: src/global.c:568
-msgid "Scroll down one line without scrolling the cursor"
-msgstr ""
-
-#: src/global.c:572
-#, fuzzy
-msgid "Switch to the previous file buffer"
-msgstr "Kuri i Ibanjirije IDOSIYE"
-
-#: src/global.c:574
-#, fuzzy
-msgid "Switch to the next file buffer"
-msgstr "Kuri i Komeza>> IDOSIYE"
-
-#: src/global.c:577
-#, fuzzy
-msgid "Insert the next keystroke verbatim"
-msgstr "Inyuguti S"
-
-#: src/global.c:579
-#, fuzzy
-msgid "Insert a tab at the cursor position"
-msgstr "a Isunika Inyuguti ku i indanga Ibirindiro"
-
-#: src/global.c:581
-#, fuzzy
-msgid "Insert a newline at the cursor position"
-msgstr "a Garuka ku i indanga Ibirindiro"
-
-#: src/global.c:583
-#, fuzzy
-msgid "Delete the character under the cursor"
-msgstr "i Inyuguti i indanga"
-
-#: src/global.c:585
-#, fuzzy
-msgid "Delete the character to the left of the cursor"
-msgstr "i Inyuguti Kuri i Ibumoso: Bya i indanga"
-
-#: src/global.c:588
-#, fuzzy
-msgid "Cut from the cursor position to the end of the file"
-msgstr "Bivuye i indanga Ibirindiro Kuri i Impera Bya i IDOSIYE"
-
-#: src/global.c:591
-#, fuzzy
-msgid "Justify the entire file"
-msgstr "i IDOSIYE"
-
-#: src/global.c:595
-msgid "Count the number of words, lines, and characters"
-msgstr ""
-
-#: src/global.c:598
-#, fuzzy
-msgid "Refresh (redraw) the current screen"
-msgstr "Kongera Gushushanya i KIGEZWEHO Mugaragaza"
-
-#: src/global.c:600
-msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
-
-#: src/global.c:603
-msgid "Toggle the case sensitivity of the search"
-msgstr ""
-
-#: src/global.c:605
-#, fuzzy
-msgid "Reverse the direction of the search"
-msgstr "i Ibirindiro Bya i indanga"
-
-#: src/global.c:609
-#, fuzzy
-msgid "Toggle the use of regular expressions"
-msgstr "Ibisanzwe"
-
-#: src/global.c:613
-#, fuzzy
-msgid "Recall the previous search/replace string"
-msgstr "i Ibanjirije Gushaka Gusimbura Ikurikiranyanyuguti"
-
-#: src/global.c:615
-#, fuzzy
-msgid "Recall the next search/replace string"
-msgstr "i Ibanjirije Gushaka Gusimbura Ikurikiranyanyuguti"
-
-#: src/global.c:618
-#, fuzzy
-msgid "Go to file browser"
-msgstr "Kuri IDOSIYE Mucukumbuzi"
-
-#: src/global.c:621
-#, fuzzy
-msgid "Toggle the use of DOS format"
-msgstr "IDOSIYE Inyuma in Imiterere"
-
-#: src/global.c:622
-#, fuzzy
-msgid "Toggle the use of Mac format"
-msgstr "IDOSIYE Inyuma in Imiterere"
-
-#: src/global.c:624
-msgid "Toggle appending"
-msgstr ""
-
-#: src/global.c:625
-msgid "Toggle prepending"
-msgstr ""
-
-#: src/global.c:628
-msgid "Toggle backing up of the original file"
-msgstr ""
-
-#: src/global.c:629
-#, fuzzy
-msgid "Execute external command"
-msgstr "external Komandi:"
-
-#: src/global.c:633
-#, fuzzy
-msgid "Toggle the use of a new buffer"
-msgstr "OYA Kubona Ingano Bya"
-
-#: src/global.c:636
-#, fuzzy
-msgid "Exit from the file browser"
-msgstr "Bivuye i IDOSIYE Mucukumbuzi"
-
-#: src/global.c:638
-#, fuzzy
-msgid "Go to the first file in the list"
-msgstr "Kuri i Itangira Umurongo Bya i IDOSIYE"
-
-#: src/global.c:640
-#, fuzzy
-msgid "Go to the last file in the list"
-msgstr "Kuri i Iheruka Umurongo Bya i IDOSIYE"
-
-#: src/global.c:641
-#, fuzzy
-msgid "Go to the next file in the list"
-msgstr "Kuri i Komeza>> Umurongo"
-
-#: src/global.c:642
-#, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Kuri i Ibanjirije Umurongo"
-
-#: src/global.c:643
-#, fuzzy
-msgid "Go to directory"
-msgstr "Kuri bushyinguro"
-
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\macrodlg.src:RID_MACROCHOOSER.RID_PB_CLOSE.text
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\macrodlg.src:RID_STR_CLOSE.text
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\moduldlg.src:RID_TP_MODULS.RID_PB_CLOSE.text
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\moduldlg.src:RID_TP_LIBS.RID_PB_CLOSE.text
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Gufunga"
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
-msgstr ""
-
-# sc/source\ui\src\scstring.src:SCSTR_HOR_JUSTIFY_BLOCK.text
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
-msgid "Justify"
-msgstr "Gukwiza umurongo wose"
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-#, fuzzy
-msgid "Read File"
-msgstr "Idosiye"
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr ""
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr ""
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr ""
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
-msgid "Cur Pos"
-msgstr ""
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr ""
-
-#: src/global.c:771
-msgid "Mark Text"
-msgstr ""
-
-#: src/global.c:777
-msgid "Copy Text"
-msgstr ""
-
-#: src/global.c:780
-msgid "Indent Text"
-msgstr ""
-
-#: src/global.c:783
-msgid "Unindent Text"
-msgstr ""
-
-#: src/global.c:787
-msgid "Undo"
-msgstr ""
-
-#: src/global.c:790
-msgid "Redo"
-msgstr ""
-
-# sch/sdi\schslots.src:SID_ROW_MOREFRONT.text
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Imbere"
-
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_AXIS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_X_AXIS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_Y_AXIS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_Z_AXIS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_GRID.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib2.src:TAB_LINE.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib.src:TAB_TITLE.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib.src:TAB_LEGEND.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib.src:TAB_DATA_LINE.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib.src:TAB_DATA_POINT.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib3.src:TAB_DIAGRAM_FLOOR.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib3.src:TAB_DIAGRAM_AREA.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib4.src:TAB_DIAGRAM_STOCK_LOSS.1.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib4.src:TAB_DIAGRAM_STOCK_PLUS.1.text
-#: src/global.c:806 src/global.c:810
-msgid "Back"
-msgstr "Inyuma"
-
-#: src/global.c:817
-msgid "Next Word"
-msgstr ""
-
-#: src/global.c:820
-msgid "Prev Word"
-msgstr ""
-
-#: src/global.c:824
-msgid "Prev Line"
-msgstr ""
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr ""
-
-#: src/global.c:830
-msgid "Home"
-msgstr "Home"
-
-# officecfg/registry\schema\org\openoffice\Office\DataAccess.xcs:....FormSearchOptions.SearchPosition..end-of-field.text
-#: src/global.c:833
-msgid "End"
-msgstr "Impera"
-
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr ""
-
-#: src/global.c:848
-msgid "Scroll Up"
-msgstr ""
-
-#: src/global.c:851
-msgid "Scroll Down"
-msgstr ""
-
-#: src/global.c:856
-#, fuzzy
-msgid "Previous File"
-msgstr "Idosiye"
-
-#: src/global.c:858
-#, fuzzy
-msgid "Next File"
-msgstr "Idosiye"
-
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr ""
-
-# sc/source\ui\src\textdlgs.src:RID_SCDLG_PARAGRAPH.1.RID_SVXPAGE_TABULATOR.text
-#: src/global.c:867
-msgid "Tab"
-msgstr "Isimbuka"
-
-# LOCALIZATION NOTE : BLOCK end GLYPHS
-# Enter, backspace, and Tab might have both glyphs and text
-# if the keyboards usually have a glyph,
-# if there is a meaningful translation,
-# or if keyboards are localized
-# then translate them or insert the appropriate glyph
-# otherwise you should probably just translate the glyph regions
-# LOCALIZATION NOTE : BLOCK maybe GLYPHS
-#: src/global.c:870
-msgid "Enter"
-msgstr "Injiza"
-
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\basidesh.src:RID_POPUP_TABBAR.SID_BASICIDE_DELETECURRENT.text
-# #-#-#-#-#  basctl.pot (PACKAGE VERSION)  #-#-#-#-#
-# basctl/source\basicide\brkdlg.src:RID_BASICIDE_BREAKPOINTDLG.RID_PB_DEL.text
-#: src/global.c:873
-msgid "Delete"
-msgstr "Gusiba"
-
-# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
-# sw/sdi\swslots.src:FN_BACKSPACE.text
-# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
-# sw/sdi\swslots.src:FN_SHIFT_BACKSPACE.text
-#: src/global.c:876
-msgid "Backspace"
-msgstr "Gusiba usubira inyuma"
-
-#: src/global.c:893
-msgid "CutTillEnd"
-msgstr ""
-
-#: src/global.c:906
-msgid "Word Count"
-msgstr ""
-
-#: src/global.c:1367
-#, fuzzy
-msgid "Help mode"
-msgstr "Ubwoko"
-
-#: src/global.c:1369
-#, fuzzy
-msgid "Constant cursor position display"
-msgstr "indanga Ibirindiro"
-
-#: src/global.c:1371
-#, fuzzy
-msgid "Use of one more line for editing"
-msgstr "Bya Birenzeho Umwanya kugirango"
-
-#: src/global.c:1373
-msgid "Smooth scrolling"
-msgstr ""
-
-#: src/global.c:1375
-#, fuzzy
-msgid "Whitespace display"
-msgstr "Kugaragaza"
-
-#: src/global.c:1377
-#, fuzzy
-msgid "Color syntax highlighting"
-msgstr "Igaragaza cyane"
-
-#: src/global.c:1379
-#, fuzzy
-msgid "Smart home key"
-msgstr "Ku Ntangiriro Urufunguzo"
-
-#: src/global.c:1381
-#, fuzzy
-msgid "Auto indent"
-msgstr "Ikurura"
-
-#: src/global.c:1383
-#, fuzzy
-msgid "Cut to end"
-msgstr "Kuri Impera"
-
-#: src/global.c:1385
-#, fuzzy
-msgid "Long line wrapping"
-msgstr "Umurongo Gufunika"
-
-#: src/global.c:1387
-msgid "Conversion of typed tabs to spaces"
-msgstr ""
-
-#: src/global.c:1389
-#, fuzzy
-msgid "Backup files"
-msgstr "Idosiye"
-
-#: src/global.c:1391
-#, fuzzy
-msgid "Multiple file buffers"
-msgstr "IDOSIYE"
-
-#: src/global.c:1393
-#, fuzzy
-msgid "Mouse support"
-msgstr "Gushigikira"
-
-#: src/global.c:1395
-#, fuzzy
-msgid "No conversion from DOS/Mac format"
-msgstr "Ihindurangero Bivuye Imiterere"
-
-#: src/global.c:1397
-msgid "Suspension"
-msgstr ""
-
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Umurongo Gufunika"
-
-#: src/help.c:236
-#, fuzzy
-msgid ""
-"Search Command Help Text\n"
-"\n"
-" Enter the words or characters you would like to search for, and then press "
-"Enter.  If there is a match for the text you entered, the screen will be "
-"updated to the location of the nearest match for the search string.\n"
-"\n"
-" The previous search string will be shown in brackets after the search "
-"prompt.  Hitting Enter without entering any text will perform the previous "
-"search.  "
-msgstr ""
-"i Amagambo Cyangwa Inyuguti nka Kuri Gushaka kugirango Hanyuma kanda ni a "
-"BIHUYE kugirango i Umwandiko i Mugaragaza Kuri i Ahantu Bya i BIHUYE "
-"kugirango i Gushaka Ikurikiranyanyuguti Ibanjirije Gushaka "
-"Ikurikiranyanyuguti in Udusodeko Nyuma i Gushaka Urwinjiriro Umwandiko i "
-"Ibanjirije Gushaka Byahiswemo Umwandiko Na: i Ikimenyetso Na Hanyuma Gushaka "
-"Kuri Gusimbura in i Byahiswemo Umwandiko Umumaro Utubuto Bihari in Ubwoko"
-
-#: src/help.c:245
-msgid ""
-"If you have selected text with the mark and then search to replace, only "
-"matches in the selected text will be replaced.\n"
-"\n"
-" The following function keys are available in Search mode:\n"
-"\n"
-msgstr ""
-
-#: src/help.c:251
-#, fuzzy
-msgid ""
-"Go To Line Help Text\n"
-"\n"
-" Enter the line number that you wish to go to and hit Enter.  If there are "
-"fewer lines of text than the number you entered, you will be brought to the "
-"last line of the file.\n"
-"\n"
-" The following function keys are available in Go To Line mode:\n"
-"\n"
-msgstr ""
-"i Umurongo Umubare Kuri Gyayo Kuri Na kanda Bike Imirongo Bya Umwandiko i "
-"Umubare Kuri i Iheruka Umurongo Bya i IDOSIYE Umumaro Utubuto Bihari in "
-"Ubwoko"
-
-#: src/help.c:260
-#, fuzzy
-msgid ""
-"Insert File Help Text\n"
-"\n"
-" Type in the name of a file to be inserted into the current file buffer at "
-"the current cursor location.\n"
-"\n"
-" If you have compiled nano with multiple file buffer support, and enable "
-"multiple file buffers with the -F or --multibuffer command line flags, the "
-"Meta-F toggle, or a nanorc file, inserting a file will cause it to be loaded "
-"into a separate buffer (use Meta-< and > to switch between file buffers).  "
-msgstr ""
-"Idosiye in i Izina: Bya a IDOSIYE Kuri Byinjijwemo i KIGEZWEHO IDOSIYE ku i "
-"KIGEZWEHO indanga Ahantu Na: Igikubo IDOSIYE Gushigikira Na Gushoboza "
-"Igikubo Na: i Cyangwa Komandi: Umurongo Amabendera i Mukomatanya Cyangwa a "
-"IDOSIYE a IDOSIYE Kuri a Gukoresha Na Kuri Hindura hagati IDOSIYE "
-"Ahatanditseho OYA Injiza Izina ry'idosiye: Cyangwa Ubwoko in a Izina "
-"ry'idosiye: ku i Urwinjiriro Na Kanda Umumaro Utubuto Bihari in Idosiye "
-"Ubwoko"
-
-#: src/help.c:269
-msgid ""
-"If you need another blank buffer, do not enter any filename, or type in a "
-"nonexistent filename at the prompt and press Enter.\n"
-"\n"
-" The following function keys are available in Insert File mode:\n"
-"\n"
-msgstr ""
-
-#: src/help.c:275
-#, fuzzy
-msgid ""
-"Write File Help Text\n"
-"\n"
-" Type the name that you wish to save the current file as and press Enter to "
-"save the file.\n"
-"\n"
-" If you have selected text with the mark, you will be prompted to save only "
-"the selected portion to a separate file.  To reduce the chance of "
-"overwriting the current file with just a portion of it, the current filename "
-"is not the default in this mode.\n"
-"\n"
-" The following function keys are available in Write File mode:\n"
-"\n"
-msgstr ""
-"Idosiye i Izina: Kuri Kubika i KIGEZWEHO IDOSIYE Nka Na kanda Kuri Kubika i "
-"IDOSIYE Byahiswemo Umwandiko Na: i Ikimenyetso Kuri Kubika i Byahiswemo Kuri "
-"a IDOSIYE i Bya i KIGEZWEHO IDOSIYE Na: a Bya i KIGEZWEHO Izina ry'idosiye: "
-"ni OYA i Mburabuzi in iyi Ubwoko Umumaro Utubuto Bihari in Idosiye Ubwoko"
-
-#: src/help.c:289
-#, fuzzy
-msgid ""
-"File Browser Help Text\n"
-"\n"
-" The file browser is used to visually browse the directory structure to "
-"select a file for reading or writing.  You may use the arrow keys or Page Up/"
-"Down to browse through the files, and S or Enter to choose the selected file "
-"or enter the selected directory.  To move up one level, select the directory "
-"called \"..\" at the top of the file list.\n"
-"\n"
-" The following function keys are available in the file browser:\n"
-"\n"
-msgstr ""
-"Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-"."
-
-#: src/help.c:302
-#, fuzzy
-msgid ""
-"Browser Search Command Help Text\n"
-"\n"
-" Enter the words or characters you would like to search for, and then press "
-"Enter.  If there is a match for the text you entered, the screen will be "
-"updated to the location of the nearest match for the search string.\n"
-"\n"
-" The previous search string will be shown in brackets after the search "
-"prompt.  Hitting Enter without entering any text will perform the previous "
-"search.\n"
-"\n"
-msgstr ""
-"i Amagambo Cyangwa Inyuguti nka Kuri Gushaka kugirango Hanyuma kanda ni a "
-"BIHUYE kugirango i Umwandiko i Mugaragaza Kuri i Ahantu Bya i BIHUYE "
-"kugirango i Gushaka Ikurikiranyanyuguti Ibanjirije Gushaka "
-"Ikurikiranyanyuguti in Udusodeko Nyuma i Gushaka Urwinjiriro Umwandiko i "
-"Ibanjirije Gushaka Byahiswemo Umwandiko Na: i Ikimenyetso Na Hanyuma Gushaka "
-"Kuri Gusimbura in i Byahiswemo Umwandiko Umumaro Utubuto Bihari in Ubwoko"
-
-#: src/help.c:311
-msgid ""
-" The following function keys are available in Browser Search mode:\n"
-"\n"
-msgstr ""
-
-#: src/help.c:315
-#, fuzzy
-msgid ""
-"Browser Go To Directory Help Text\n"
-"\n"
-" Enter the name of the directory you would like to browse to.\n"
-"\n"
-" If tab completion has not been disabled, you can use the Tab key to "
-"(attempt to) automatically complete the directory name.\n"
-"\n"
-" The following function keys are available in Browser Go To Directory mode:\n"
-"\n"
-msgstr ""
-"i Izina: Bya i bushyinguro nka Kuri Gushakisha... Kuri Isunika OYA "
-"Yahagaritswe Gukoresha i Urufunguzo Kuri Kuri ku buryo bwikora Byuzuye i "
-"bushyinguro Izina: Umumaro Utubuto Bihari in Ubwoko"
-
-#: src/help.c:328
-#, fuzzy
-msgid ""
-"Spell Check Help Text\n"
-"\n"
-" The spell checker checks the spelling of all text in the current file.  "
-"When an unknown word is encountered, it is highlighted and a replacement can "
-"be edited.  It will then prompt to replace every instance of the given "
-"misspelled word in the current file, or, if you have selected text with the "
-"mark, in the selected text.\n"
-"\n"
-" The following function keys are available in Spell Check mode:\n"
-"\n"
-msgstr ""
-"Genzuranyuguti i Ivuganyuguti Bya Byose Umwandiko in i KIGEZWEHO IDOSIYE "
-"Kitazwi ijambo ni ni Na a Hanyuma Urwinjiriro Kuri Gusimbura buri Urugero "
-"Bya i ijambo in i KIGEZWEHO IDOSIYE Cyangwa NIBA Byahiswemo Umwandiko Na: i "
-"Ikimenyetso in i Byahiswemo Umwandiko Ikindi Imimaro Bihari in Ubwoko"
-
-#: src/help.c:343
-#, fuzzy
-msgid ""
-"Execute Command Help Text\n"
-"\n"
-" This mode allows you to insert the output of a command run by the shell "
-"into the current buffer (or a new buffer in multiple file buffer mode).  If "
-"you need another blank buffer, do not enter any command.\n"
-"\n"
-" The following function keys are available in Execute Command mode:\n"
-"\n"
-msgstr ""
-"Ibikubiyemo Kuri Kongeramo i Ibisohoka Bya a Komandi: Gukoresha ku i "
-"Igikonoshwa i KIGEZWEHO Cyangwa a Gishya in Ubwoko Ahatanditseho OYA Injiza "
-"Komandi: Utubuto Bihari in iyi Ubwoko"
-
-#: src/help.c:356
-msgid ""
-"Main nano help text\n"
-"\n"
-" The nano editor is designed to emulate the functionality and ease-of-use of "
-"the UW Pico text editor.  There are four main sections of the editor.  The "
-"top line shows the program version, the current filename being edited, and "
-"whether or not the file has been modified.  Next is the main editor window "
-"showing the file being edited.  The status line is the third line from the "
-"bottom and shows important messages.  "
-msgstr ""
-
-#: src/help.c:366
-msgid ""
-"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 and can be entered either by using the Control "
-"(Ctrl) key or pressing the Escape (Esc) key twice.  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.  "
-msgstr ""
-
-#: src/help.c:375
-msgid ""
-"Also, pressing Esc twice and then typing a three-digit decimal number from "
-"000 to 255 will enter the character with the corresponding value.  The "
-"following keystrokes are available in the main editor window.  Alternative "
-"keys are shown in parentheses:\n"
-"\n"
-msgstr ""
-
-#: src/help.c:407 src/help.c:483
-#, fuzzy
-msgid "enable/disable"
-msgstr "Gushoboza"
-
-#: src/nano.c:587
-#, fuzzy
-msgid "Key invalid in view mode"
-msgstr "in Ubwoko"
-
-#: src/nano.c:695
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Buffer written to %s\n"
-msgstr "Kuri"
-
-#: src/nano.c:697
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Buffer not written to %s: %s\n"
-msgstr "Kuri"
-
-#: src/nano.c:700
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Buffer not written: %s\n"
-msgstr "Kuri"
-
-#: src/nano.c:723
-#, fuzzy
-msgid "Window size is too small for nano...\n"
-msgstr "Ingano ni Gitoya kugirango"
-
-#: src/nano.c:816
-#, c-format
-msgid ""
-"Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
-"\n"
-msgstr ""
-
-#: src/nano.c:819
-#, c-format
-msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr ""
-
-#: src/nano.c:821
-#, c-format
-msgid "Option\t\tMeaning\n"
-msgstr ""
-
-#: src/nano.c:824
-#, fuzzy
-msgid "Show this message"
-msgstr "iyi Ubutumwa"
-
-#: src/nano.c:825
-msgid "+LINE,COLUMN"
-msgstr ""
-
-#: src/nano.c:826
-#, fuzzy
-msgid "Start at line LINE, column COLUMN"
-msgstr "Gutangira ku Umurongo Umubare"
-
-#: src/nano.c:828
-#, fuzzy
-msgid "Enable smart home key"
-msgstr "Cyiza Ku Ntangiriro Urufunguzo"
-
-#: src/nano.c:829
-#, fuzzy
-msgid "Save backups of existing files"
-msgstr "Idosiye ku Kubika"
-
-#: src/nano.c:830
-#, fuzzy
-msgid "-C <dir>"
-msgstr "-E"
-
-#: src/nano.c:830
-msgid "--backupdir=<dir>"
-msgstr ""
-
-#: src/nano.c:831
-#, fuzzy
-msgid "Directory for saving unique backup files"
-msgstr "kugirango Inyibutsa Idosiye"
-
-#: src/nano.c:834
-msgid "Use bold instead of reverse video text"
-msgstr ""
-
-#: src/nano.c:837
-msgid "Convert typed tabs to spaces"
-msgstr ""
-
-#: src/nano.c:840
-#, fuzzy
-msgid "Enable multiple file buffers"
-msgstr "Igikubo IDOSIYE"
-
-#: src/nano.c:845
-#, fuzzy
-msgid "Log & read search/replace string history"
-msgstr "Gusoma Gushaka Gusimbura Ikurikiranyanyuguti Urutonde"
-
-#: src/nano.c:848
-#, fuzzy
-msgid "Don't look at nanorc files"
-msgstr "ku Idosiye"
-
-#: src/nano.c:851
-msgid "Fix numeric keypad key confusion problem"
-msgstr ""
-
-#: src/nano.c:853
-msgid "Don't add newlines to the ends of files"
-msgstr ""
-
-#: src/nano.c:856
-#, fuzzy
-msgid "Don't convert files from DOS/Mac format"
-msgstr "GUHINDURA Idosiye Bivuye Imiterere"
-
-#: src/nano.c:858
-#, fuzzy
-msgid "Use one more line for editing"
-msgstr "Bya Birenzeho Umwanya kugirango"
-
-#: src/nano.c:860
-msgid "-Q <str>"
-msgstr ""
-
-#: src/nano.c:860
-msgid "--quotestr=<str>"
-msgstr ""
-
-#: src/nano.c:861
-#, fuzzy
-msgid "Quoting string"
-msgstr "Ikurikiranyanyuguti Mburabuzi"
-
-#: src/nano.c:863
-#, fuzzy
-msgid "Restricted mode"
-msgstr "Ubwoko"
-
-#: src/nano.c:866
-msgid "Scroll by line instead of half-screen"
-msgstr ""
-
-#: src/nano.c:868
-#, fuzzy
-msgid "-T <#cols>"
-msgstr "-R"
-
-#: src/nano.c:868
-msgid "--tabsize=<#cols>"
-msgstr ""
-
-#: src/nano.c:869
-#, fuzzy
-msgid "Set width of a tab to #cols columns"
-msgstr "Ubugari Bya a Isunika in Kuri"
-
-#: src/nano.c:871
-msgid "Do quick statusbar blanking"
-msgstr ""
-
-#: src/nano.c:874
-#, fuzzy
-msgid "Print version information and exit"
-msgstr "Verisiyo Ibisobanuro Na Gusohoka"
-
-#: src/nano.c:877
-msgid "Detect word boundaries more accurately"
-msgstr ""
-
-#: src/nano.c:880
-msgid "-Y <str>"
-msgstr ""
-
-#: src/nano.c:880
-msgid "--syntax=<str>"
-msgstr ""
-
-#: src/nano.c:881
-#, fuzzy
-msgid "Syntax definition to use for coloring"
-msgstr "Insobanuro Kuri Gukoresha"
-
-#: src/nano.c:883
-#, fuzzy
-msgid "Constantly show cursor position"
-msgstr "Garagaza indanga Ibirindiro"
-
-#: src/nano.c:885
-msgid "Fix Backspace/Delete confusion problem"
-msgstr ""
-
-#: src/nano.c:888
-#, fuzzy
-msgid "Automatically indent new lines"
-msgstr "Ikurura Gishya Imirongo"
-
-#: src/nano.c:889
-#, fuzzy
-msgid "Cut from cursor to end of line"
-msgstr "Bivuye indanga Kuri Impera Bya Umurongo"
-
-#: src/nano.c:892
-#, fuzzy
-msgid "Don't follow symbolic links, overwrite"
-msgstr "amahuza Guhindura"
-
-#: src/nano.c:894
-#, fuzzy
-msgid "Enable the use of the mouse"
-msgstr "Imbeba"
-
-#: src/nano.c:897
-#, fuzzy
-msgid "-o <dir>"
-msgstr "-o"
-
-#: src/nano.c:897
-#, fuzzy
-msgid "--operatingdir=<dir>"
-msgstr "bushyinguro"
-
-#: src/nano.c:898
-#, fuzzy
-msgid "Set operating directory"
-msgstr "bushyinguro"
-
-#: src/nano.c:901
-#, fuzzy
-msgid "Preserve XON (^Q) and XOFF (^S) keys"
-msgstr "Na Utubuto"
-
-#: src/nano.c:903
-msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
-
-#: src/nano.c:905
-#, fuzzy
-msgid "-r <#cols>"
-msgstr "-R"
-
-#: src/nano.c:905
-#, fuzzy
-msgid "--fill=<#cols>"
-msgstr "--Kuzuza"
-
-#: src/nano.c:906
-#, fuzzy
-msgid "Set wrapping point at column #cols"
-msgstr "Ubugari Bya a Isunika in Kuri"
-
-#: src/nano.c:909
-#, fuzzy
-msgid "-s <prog>"
-msgstr "-S"
-
-#: src/nano.c:909
-msgid "--speller=<prog>"
-msgstr ""
-
-#: src/nano.c:910
-msgid "Enable alternate speller"
-msgstr ""
-
-#: src/nano.c:913
-#, fuzzy
-msgid "Auto save on exit, don't prompt"
-msgstr "Kubika ku Gusohoka Urwinjiriro"
-
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
-#, fuzzy
-msgid "View mode (read-only)"
-msgstr "Gusoma Ubwoko"
-
-#: src/nano.c:920
-#, fuzzy
-msgid "Don't wrap long lines"
-msgstr "Gufunika Imirongo"
-
-#: src/nano.c:922
-#, fuzzy
-msgid "Don't show the two help lines"
-msgstr "Garagaza Ifashayobora Idirishya"
-
-#: src/nano.c:923
-#, fuzzy
-msgid "Enable suspension"
-msgstr "Imbeba"
-
-#: src/nano.c:924
-msgid "Enable soft line wrapping"
-msgstr ""
-
-#: src/nano.c:928
-#, fuzzy
-msgid "(ignored, for Pico compatibility)"
-msgstr "(kugirango Bihuye neza"
-
-#: src/nano.c:938
-#, fuzzy, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr "Verisiyo"
-
-#: src/nano.c:943
-#, fuzzy, c-format
-msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
-msgstr "Muhinduzi HTTP www Muhinduzi org"
-
-#: src/nano.c:944
-#, fuzzy, c-format
-msgid ""
-"\n"
-" Compiled options:"
-msgstr "Amahitamo"
-
-#: src/nano.c:1022
-#, fuzzy
-msgid "Sorry, support for this function has been disabled"
-msgstr "Gushigikira kugirango iyi Umumaro Yahagaritswe"
-
-#: src/nano.c:1044
-#, fuzzy
-msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Kubika Byahinduwe"
-
-#: src/nano.c:1088
-msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
-
-#: src/nano.c:1114
-#, c-format
-msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
-
-#: src/nano.c:1182
-#, fuzzy
-msgid "Received SIGHUP or SIGTERM\n"
-msgstr "Cyangwa"
-
-#: src/nano.c:1204
-#, fuzzy, c-format
-msgid "Use \"fg\" to return to nano.\n"
-msgstr "Kuri Garuka Kuri"
-
-#: src/nano.c:1386
-#, fuzzy
-msgid "enabled"
-msgstr "Bikora"
-
-#: src/nano.c:1387
-#, fuzzy
-msgid "disabled"
-msgstr "Yahagaritswe"
-
-#: src/nano.c:1548 src/winio.c:1256
-#, fuzzy
-msgid "Unknown Command"
-msgstr "Ibendera"
-
-#: src/nano.c:1674
-msgid "XON ignored, mumble mumble"
-msgstr ""
-
-#: src/nano.c:1679
-msgid "XOFF ignored, mumble mumble"
-msgstr ""
-
-#: src/nano.c:2209 src/rcfile.c:1100
-#, fuzzy, c-format
-msgid "Requested tab size \"%s\" is invalid"
-msgstr "Isunika Ingano Sibyo"
-
-#: src/nano.c:2268 src/rcfile.c:1025
-#, fuzzy, c-format
-msgid "Requested fill size \"%s\" is invalid"
-msgstr "Kuzuza Ingano Sibyo"
-
-#. TRANSLATORS: For the next three strings, if possible, specify
-#. * the single-byte shortcuts for both your language and English.
-#. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
-msgid "Yy"
-msgstr ""
-
-#: src/prompt.c:1260
-msgid "Nn"
-msgstr ""
-
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Table.Settings.Numbering..10.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Frame.Settings.Numbering..10.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Graphic.Settings.Numbering..10.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Calc.Settings.Numbering..10.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Draw.Settings.Numbering..10.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Chart.Settings.Numbering..10.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Image.Settings.Numbering..10.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Formula.Settings.Numbering..10.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Impress.Settings.Numbering..10.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.OLEMisc.Settings.Numbering..10.text
-#: src/prompt.c:1261
-#, fuzzy
-msgid "Aa"
-msgstr "aa"
-
-#: src/prompt.c:1275
-msgid "Yes"
-msgstr "Yego"
-
-# basctl/source\basicide\basidesh.src:RID_STR_ALL.text
-#: src/prompt.c:1280
-msgid "All"
-msgstr "Byose"
-
-#: src/prompt.c:1285
-msgid "No"
-msgstr "Oya"
-
-#: src/rcfile.c:130
-#, fuzzy, c-format
-msgid "Error in %s on line %lu: "
-msgstr "in ku Umurongo"
-
-#: src/rcfile.c:185
-#, c-format
-msgid "Argument '%s' has an unterminated \""
-msgstr ""
-
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
-#, fuzzy
-msgid "Regex strings must begin and end with a \" character"
-msgstr "Ikurikiranyanyuguti Na Impera Na: a Inyuguti"
-
-#: src/rcfile.c:238 src/search.c:62
-#, c-format
-msgid "Bad regex \"%s\": %s"
-msgstr ""
-
-#: src/rcfile.c:258
-#, fuzzy
-msgid "Missing syntax name"
-msgstr "Izina:"
-
-#: src/rcfile.c:316
-msgid "The \"none\" syntax is reserved"
-msgstr ""
-
-#: src/rcfile.c:323
-msgid "The \"default\" syntax must take no extensions"
-msgstr ""
-
-#: src/rcfile.c:386 src/rcfile.c:483
-#, fuzzy
-msgid "Missing key name"
-msgstr "Izina:"
-
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
-
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr ""
-
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr ""
-
-#: src/rcfile.c:426
-#, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr ""
-
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "OYA"
-
-#: src/rcfile.c:454
-#, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
-
-#: src/rcfile.c:625
-#, fuzzy, c-format
-msgid ""
-"Color \"%s\" not understood.\n"
-"Valid colors are \"green\", \"red\", \"blue\",\n"
-"\"white\", \"yellow\", \"cyan\", \"magenta\" and\n"
-"\"black\", with the optional prefix \"bright\"\n"
-"for foreground colors."
-msgstr ""
-"OYA Amabara Icyatsi Umutuku Ubururu Umweru Umuhondo Ubururu bukeye Umutuku "
-"werurutse umukara Na: i Bitari ngombwa Imbanziriza Bibonerana kugirango "
-"Amabara"
-
-#: src/rcfile.c:647
-#, fuzzy
-msgid "Cannot add a color command without a syntax command"
-msgstr "Kongeramo a Ibara a Umurongo"
-
-#: src/rcfile.c:652
-#, fuzzy
-msgid "Missing color name"
-msgstr "Ibara Izina:"
-
-#: src/rcfile.c:672
-#, fuzzy, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Ibara Bibonerana"
-
-#: src/rcfile.c:690 src/rcfile.c:809
-msgid "Missing regex string"
-msgstr ""
-
-#: src/rcfile.c:762
-#, fuzzy
-msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\"Gutangira a Impera"
-
-#: src/rcfile.c:804
-#, fuzzy
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Kongeramo a Ibara a Umurongo"
-
-#: src/rcfile.c:874
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr ""
-
-#: src/rcfile.c:876
-msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
-msgstr ""
-
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
-#, c-format
-msgid "Command \"%s\" not allowed in included file"
-msgstr ""
-
-#: src/rcfile.c:951 src/rcfile.c:1128
-#, c-format
-msgid "Syntax \"%s\" has no color commands"
-msgstr ""
-
-#: src/rcfile.c:966
-#, fuzzy, c-format
-msgid "Command \"%s\" not understood"
-msgstr "OYA"
-
-#: src/rcfile.c:972
-#, fuzzy
-msgid "Missing flag"
-msgstr "Ibendera"
-
-#: src/rcfile.c:994
-#, c-format
-msgid "Option \"%s\" requires an argument"
-msgstr ""
-
-#: src/rcfile.c:1012
-msgid "Option is not a valid multibyte string"
-msgstr ""
-
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
-#, fuzzy
-msgid "Non-blank characters required"
-msgstr "Isunika Na Umwanya Inyuguti Bya ngombwa"
-
-#: src/rcfile.c:1048
-#, fuzzy
-msgid "Two single-column characters required"
-msgstr "UMWE Inkingi Inyuguti Bya ngombwa"
-
-#: src/rcfile.c:1114
-#, fuzzy, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Ibendera"
-
-#: src/rcfile.c:1123
-#, fuzzy, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Ibendera"
-
-#: src/rcfile.c:1182
-#, fuzzy
-msgid "I can't find my home directory!  Wah!"
-msgstr "Gushaka Ku Ntangiriro bushyinguro"
-
-#: src/search.c:96
-#, fuzzy, c-format
-msgid "\"%.*s%s\" not found"
-msgstr ""
-"\"%.*Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-"."
-
-#: src/search.c:205
-#, fuzzy
-msgid " (to replace) in selection"
-msgstr "(Kuri Gusimbura in Ihitamo"
-
-#: src/search.c:207
-#, fuzzy
-msgid " (to replace)"
-msgstr "(Kuri Gusimbura"
-
-#: src/search.c:784
-#, fuzzy
-msgid "Replace this instance?"
-msgstr "iyi Urugero"
-
-# offmgr/source\offapp\dialog\fontsubs.src:RID_SVX_FONT_SUBSTITUTION.STR_HEADER4.text
-#: src/search.c:962
-msgid "Replace with"
-msgstr "Gusimbuza na"
-
-#: src/search.c:1004
-#, fuzzy, c-format
-msgid "Replaced %lu occurrence"
-msgid_plural "Replaced %lu occurrences"
-msgstr[0] "ukugaragara"
-
-#: src/search.c:1034
-#, fuzzy
-msgid "Enter line number, column number"
-msgstr "Injiza inomero y'umurongo"
-
-#: src/search.c:1061
-msgid "Invalid line or column number"
-msgstr ""
-
-#: src/search.c:1214
-#, fuzzy
-msgid "Not a bracket"
-msgstr "a"
-
-#: src/search.c:1281
-msgid "No matching bracket"
-msgstr ""
-
-#: src/text.c:54
-msgid "Mark Set"
-msgstr ""
-
-#: src/text.c:58
-msgid "Mark Unset"
-msgstr ""
-
-#: src/text.c:443
-msgid "Nothing in undo buffer!"
-msgstr ""
-
-#: src/text.c:455 src/text.c:593
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
-msgstr ""
-
-#: src/text.c:466 src/text.c:603
-msgid "text add"
-msgstr ""
-
-#: src/text.c:475 src/text.c:613
-#, fuzzy
-msgid "text delete"
-msgstr "Idosiye"
-
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Umurongo Gufunika"
-
-#: src/text.c:503 src/text.c:636
-msgid "line join"
-msgstr ""
-
-#: src/text.c:514 src/text.c:651
-msgid "text cut"
-msgstr ""
-
-#: src/text.c:518 src/text.c:655
-msgid "text uncut"
-msgstr ""
-
-#: src/text.c:522 src/text.c:622
-msgid "line break"
-msgstr ""
-
-#: src/text.c:532 src/text.c:665
-#, fuzzy
-msgid "text insert"
-msgstr "Idosiye"
-
-#: src/text.c:550 src/text.c:659
-#, fuzzy
-msgid "text replace"
-msgstr "(Kuri Gusimbura"
-
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr ""
-
-#: src/text.c:563
-#, c-format
-msgid "Undid action (%s)"
-msgstr ""
-
-#: src/text.c:578
-msgid "Nothing to re-do!"
-msgstr ""
-
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr ""
-
-#: src/text.c:676
-#, c-format
-msgid "Redid action (%s)"
-msgstr ""
-
-#: src/text.c:766
-#, fuzzy
-msgid "Could not pipe"
-msgstr "OYA"
-
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
-#, fuzzy
-msgid "Could not fork"
-msgstr "OYA"
-
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
-
-#: src/text.c:1870
-#, fuzzy, c-format
-msgid "Bad quote string %s: %s"
-msgstr "Gushyiraho akugarizo Ikurikiranyanyuguti"
-
-#: src/text.c:2267
-#, fuzzy
-msgid "Can now UnJustify!"
-msgstr "NONEAHA"
-
-#: src/text.c:2462
-#, fuzzy
-msgid "Edit a replacement"
-msgstr "a"
-
-#: src/text.c:2548
-#, fuzzy
-msgid "Could not create pipe"
-msgstr "OYA Kurema"
-
-#: src/text.c:2550
-#, fuzzy
-msgid "Creating misspelled word list, please wait..."
-msgstr "ijambo Urutonde Tegereza"
-
-#: src/text.c:2642
-#, fuzzy
-msgid "Could not get size of pipe buffer"
-msgstr "OYA Kubona Ingano Bya"
-
-#: src/text.c:2693
-#, fuzzy
-msgid "Error invoking \"spell\""
-msgstr "Genzuranyuguti"
-
-#: src/text.c:2696
-#, fuzzy
-msgid "Error invoking \"sort -f\""
-msgstr "Ishungura F"
-
-#: src/text.c:2699
-msgid "Error invoking \"uniq\""
-msgstr ""
-
-#: src/text.c:2756 src/text.c:2965
-#, fuzzy
-msgid "Finished checking spelling"
-msgstr "Ivuganyuguti"
-
-#: src/text.c:2815
-#, fuzzy, c-format
-msgid "Error invoking \"%s\""
-msgstr "Genzuranyuguti"
-
-#: src/text.c:2960
-#, fuzzy, c-format
-msgid "Spell checking failed: %s"
-msgstr "Byanze"
-
-#: src/text.c:2962
-#, fuzzy, c-format
-msgid "Spell checking failed: %s: %s"
-msgstr "Byanze"
-
-#: src/text.c:3030
-#, c-format
-msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
-msgstr ""
-
-#: src/text.c:3031
-#, fuzzy
-msgid "In Selection:  "
-msgstr "Kuri Idosiye"
-
-#: src/utils.c:405 src/utils.c:417
-#, fuzzy
-msgid "nano is out of memory!"
-msgstr "ni Inyuma Bya Ububiko"
-
-#. TRANSLATORS: This is displayed during the input of a
-#. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
-msgid "Unicode Input"
-msgstr ""
-
-# sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_DOC_MODIFIED.text
-#: src/winio.c:2149 src/winio.c:2153
-msgid "Modified"
-msgstr "Byahinduwe"
-
-# #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
-# offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_GENERAL_OPTIONS.5.text
-# #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
-# offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_SW_EDITOPTIONS.3.text
-# #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
-# offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_SW_ONLINEOPTIONS.2.text
-# #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
-# offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_SC_EDITOPTIONS.3.text
-# #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
-# offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_SD_EDITOPTIONS.3.text
-# #-#-#-#-#  offmgr.pot (PACKAGE VERSION)  #-#-#-#-#
-# offmgr/source\offapp\dialog\treeopt.src:RID_OFADLG_OPTIONS_TREE_PAGES.SID_SD_GRAPHIC_OPTIONS.3.text
-#: src/winio.c:2150
-msgid "View"
-msgstr "Igaragaza"
-
-#: src/winio.c:2164
-msgid "DIR:"
-msgstr ""
-
-# sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_LINKERRORFILE.text
-#: src/winio.c:2171
-msgid "File:"
-msgstr "Idosiye:"
-
-#: src/winio.c:3360
-#, fuzzy, c-format
-msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
-msgstr "Umurongo Col INYUGUTI"
-
-#: src/winio.c:3492
-#, fuzzy
-msgid "The nano text editor"
-msgstr "Umwandiko Muhinduzi"
-
-# goodies/source\filter.vcl\eps\dlgeps.src:DLG_EXPORT_EPS.GRP_VERSION.text
-#: src/winio.c:3493
-#, fuzzy
-msgid "version"
-msgstr "Verisiyo"
-
-#: src/winio.c:3494
-#, fuzzy
-msgid "Brought to you by:"
-msgstr "Kuri ku"
-
-#: src/winio.c:3495
-#, fuzzy
-msgid "Special thanks to:"
-msgstr "Kuri"
-
-#: src/winio.c:3496
-msgid "The Free Software Foundation"
-msgstr ""
-
-#: src/winio.c:3497
-msgid "For ncurses:"
-msgstr ""
-
-#: src/winio.c:3498
-#, fuzzy
-msgid "and anyone else we forgot..."
-msgstr "Na Ikindi Twebwe"
-
-#: src/winio.c:3499
-#, fuzzy
-msgid "Thank you for using nano!"
-msgstr "kugirango ikoresha"
-
-# #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
-# sc/source\ui\src\miscdlgs.src:RID_SCDLG_FILLSERIES.FL_DIRECTION.text
-# #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
-# sc/source\ui\src\sortdlg.src:RID_SCPAGE_SORT_OPTIONS.FL_DIRECTION.text
-#~ msgid "Direction"
-#~ msgstr "Icyerekezo"
-
-#, fuzzy
-#~ msgid "Invoke the help menu"
-#~ msgstr "i Ifashayobora Ibikubiyemo"
-
-#, fuzzy
-#~ msgid "Search for text within the editor"
-#~ msgstr "kugirango Umwandiko muri i Muhinduzi"
-
-#, fuzzy
-#~ msgid "Replace text within the editor"
-#~ msgstr "Umwandiko muri i Muhinduzi"
-
-#, fuzzy
-#~ msgid "Find other bracket"
-#~ msgstr "Ikindi"
-
-#, fuzzy
-#~ msgid "Make the current search/replace case (in)sensitive"
-#~ msgstr "i KIGEZWEHO Gushaka Gusimbura in"
-
-#, fuzzy
-#~ msgid "Make the current search/replace go backwards"
-#~ msgstr "i KIGEZWEHO Gushaka Gusimbura Gyayo Inyuma"
-
-#, fuzzy
-#~ msgid "Prepend to the current file"
-#~ msgstr "Kuri i KIGEZWEHO IDOSIYE"
-
-#, fuzzy
-#~ msgid "Back up original file when saving"
-#~ msgstr "Hejuru Umwimerere IDOSIYE Ryari: Mu kubika"
-
-#, fuzzy
-#~ msgid "Insert into new buffer"
-#~ msgstr "Gishya"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Buffer not written to %s (too many backup files?)\n"
-#~ msgstr "OYA Kuri Inyibutsa Idosiye"
-
-#, fuzzy
-#~ msgid ""
-#~ " nano help text\n"
-#~ "\n"
-#~ " The nano editor is designed to emulate the functionality and ease-of-use "
-#~ "of the UW Pico text editor.  There are four main sections of the editor.  "
-#~ "The top line shows the program version, the current filename being "
-#~ "edited, and whether or not the file has been modified.  Next is the main "
-#~ "editor window showing the file being edited.  The status line is the "
-#~ "third line from the 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 and can be entered either by using the "
-#~ "Control (Ctrl) key or pressing the Esc key twice.  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.  Also, pressing "
-#~ "Esc twice and then typing a three-digit decimal number from 000 to 255 "
-#~ "will enter the character with the corresponding value.  The following "
-#~ "keystrokes are available in the main editor window.  Alternative keys are "
-#~ "shown in parentheses:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Ifashayobora Muhinduzi ni Kuri i Na Bya Gukoresha Bya i Umwandiko "
-#~ "Muhinduzi Ibyatoranyijwe Bya i Muhinduzi Hejuru: Umurongo i Porogaramu "
-#~ "Verisiyo i KIGEZWEHO Izina ry'idosiye: Na Cyangwa OYA i IDOSIYE "
-#~ "Byahinduwe ni i Muhinduzi Idirishya i IDOSIYE Imimerere Umurongo ni i "
-#~ "Umurongo Bivuye i Hasi: Na By'ingirakamaro Ubutumwa Hasi: Imirongo "
-#~ "Garagaza i in i Muhinduzi kugirango ni Nka Urufunguzo Na: a IKIMENYETSO "
-#~ "Na ku ikoresha i Urufunguzo Cyangwa i Urufunguzo Urufunguzo Na: i "
-#~ "IKIMENYETSO Na ikoresha i Cyangwa Urufunguzo ku Mwandikisho Imikorere Na "
-#~ "Hanyuma Kwandika: a NYACUMI Umubare Bivuye 000 Kuri Injiza i Inyuguti Na: "
-#~ "i Agaciro Bihari in i Muhinduzi Idirishya Utubuto in"
-
-# sc/source\ui\src\optdlg.src:RID_SCPAGE_LAYOUT.LB_ALIGN.3.text
-#~ msgid "Up"
-#~ msgstr "Hejuru"
-
-# svx/source\dialog\sdstring.src:RID_SVXSTR_BMP5.text
-#~ msgid "Space"
-#~ msgstr "Umwanya"
-
-#, fuzzy
-#~ msgid ""
-#~ "Usage: nano [+LINE] [GNU long option] [option] [file]\n"
-#~ "\n"
-#~ msgstr "Ihitamo Ihitamo IDOSIYE"
-
-#, fuzzy
-#~ msgid ""
-#~ "Usage: nano [+LINE] [option] [file]\n"
-#~ "\n"
-#~ msgstr "Ihitamo IDOSIYE"
-
-#, fuzzy
-#~ msgid "Use more space for editing"
-#~ msgstr "Birenzeho Umwanya kugirango"
-
-#, fuzzy
-#~ msgid "Do regular expression searches"
-#~ msgstr "Ibisanzwe imvugo"
-
-#, fuzzy
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "Kuzuza Kuri Gufunika Imirongo ku"
-
-#, fuzzy
-#~ msgid "Verbatim input"
-#~ msgstr "Iyinjiza"
-
-#, fuzzy
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "OYA Kurema IDOSIYE"
-
-#, fuzzy
-#~ msgid "Come on, be reasonable"
-#~ msgstr "ku"
-
-#, fuzzy
-#~ msgid "Refusing zero-length regex match"
-#~ msgstr "Zeru Uburebure BIHUYE"
diff --git a/po/sl.gmo b/po/sl.gmo
new file mode 100644
index 0000000..1173b6d
--- /dev/null
+++ b/po/sl.gmo
diff --git a/po/sl.po b/po/sl.po
new file mode 100644
index 0000000..7c16537
--- /dev/null
+++ b/po/sl.po
@@ -0,0 +1,2434 @@
+# Slovenian translation of nano.
+# Copyright (C) 2009 - 2013 Free Software Foundation, Inc.
+# This file is distributed under the same license as the nano package.
+#
+# Damir Jerovšek <damir.jerovsek@gmail.com>, 2012.
+# Matej Urban�i� <matej.urban@gmail.com>, 2012.
+# Klemen Košir <klemen913@gmail.com>, 2009, 2012, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: nano 2.3.2pre4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2013-03-18 21:33+0100\n"
+"Last-Translator: Klemen Košir <klemen913@gmail.com>\n"
+"Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
+"X-Generator: Poedit 1.5.5\n"
+
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
+msgid "Go To Directory"
+msgstr "Pojdi v mapo"
+
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
+msgid "Cancelled"
+msgstr "Preklicano"
+
+#: src/browser.c:246 src/browser.c:293
+#, c-format
+msgid "Can't go outside of %s in restricted mode"
+msgstr "V omejenem na�inu ni mogo�e zapustiti %s"
+
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
+#, c-format
+msgid "Error reading %s: %s"
+msgstr "Napaka med branjem %s: %s"
+
+#: src/browser.c:283
+msgid "Can't move up a directory"
+msgstr "Mape ni mogo�e premakniti višje"
+
+#. TRANSLATORS: Try to keep this at most 7
+#. * characters.
+#: src/browser.c:626 src/browser.c:635
+msgid "(dir)"
+msgstr "(mapa)"
+
+#. TRANSLATORS: Try to keep this at most 12
+#. * characters.
+#: src/browser.c:632
+msgid "(parent dir)"
+msgstr "(nad. mapa)"
+
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
+msgid "Search"
+msgstr "Iskanje"
+
+#: src/browser.c:812 src/search.c:382
+msgid "Search Wrapped"
+msgstr "Iskanje je ovito"
+
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
+msgid "This is the only occurrence"
+msgstr "To je edina pojavitev niza"
+
+#: src/browser.c:915 src/search.c:569
+msgid "No current search pattern"
+msgstr "Ni trenutnega vzorca iskanja"
+
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"Istovetnosti za zaklepno datoteko ni mogo�e dolo�iti. Funkcija getpwuid() je "
+"spodletela."
+
+#: src/files.c:145
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Imena gostitelja zaklepne datoteke ni mogo�e dolo�iti: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Med zapisovanjem zaklepne datoteke %s je prišlo do napake: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Med brisanjem zaklepne datoteke %s je prišlo do napake: %s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Med odpiranjem zaklepne datoteke %s je prišlo do napake: %s"
+
+#: src/files.c:282
+#, fuzzy, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+"Med branjem zaklepne datoteke %s je prišlo do napake. Prebranih je bilo "
+"premalo podatkov."
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, fuzzy, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Med zapisovanjem zaklepne datoteke %s je prišlo do napake: %s"
+
+#: src/files.c:339
+#, c-format
+msgid "Can't insert file from outside of %s"
+msgstr "Ni mogo�e vstaviti datoteke izven %s"
+
+#: src/files.c:467
+msgid "No more open file buffers"
+msgstr "Ni ve� medpomnilnikov odprtih datotek"
+
+#: src/files.c:484
+#, c-format
+msgid "Switched to %s"
+msgstr "Preklopljeno na %s"
+
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
+msgid "New Buffer"
+msgstr "Nov medpomnilnik"
+
+#: src/files.c:874
+#, c-format
+msgid "Read %lu line (Converted from DOS and Mac format)"
+msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
+msgstr[0] "Prebranih je %lu vrstic (pretvorjeno iz oblike DOS in Mac)"
+msgstr[1] "Prebrana je %lu vrstica (pretvorjeno iz oblike DOS in Mac)"
+msgstr[2] "Prebrani sta %lu vrstici (pretvorjeno iz oblike DOS in Mac)"
+msgstr[3] "Prebrane so %lu vrstice (pretvorjeno iz oblike DOS in Mac)"
+
+#: src/files.c:879
+#, c-format
+msgid ""
+"Read %lu line (Converted from DOS and Mac format - Warning: No write "
+"permission)"
+msgid_plural ""
+"Read %lu lines (Converted from DOS and Mac format - Warning: No write "
+"permission)"
+msgstr[0] ""
+"Prebranih je %lu vrstic (pretvorjeno iz oblike DOS in Mac - Opozorilo: ni "
+"dovoljenj za pisanje)"
+msgstr[1] ""
+"Prebrana je %lu vrstica (pretvorjeno iz oblike DOS in Mac - Opozorilo: ni "
+"dovoljenj za pisanje)"
+msgstr[2] ""
+"Prebrani sta %lu vrstici (pretvorjeno iz oblike DOS in Mac - Opozorilo: ni "
+"dovoljenj za pisanje)"
+msgstr[3] ""
+"Prebrane so %lu vrstice (pretvorjeno iz oblike DOS in Mac - Opozorilo: ni "
+"dovoljenj za pisanje)"
+
+#: src/files.c:885
+#, c-format
+msgid "Read %lu line (Converted from Mac format)"
+msgid_plural "Read %lu lines (Converted from Mac format)"
+msgstr[0] "Prebranih je %lu vrstic (pretvorjeno iz oblike Mac)"
+msgstr[1] "Prebrana je %lu vrstica (pretvorjeno iz oblike Mac)"
+msgstr[2] "Prebrani sta %lu vrstici (pretvorjeno iz oblike Mac)"
+msgstr[3] "Prebrane so %lu vrstice (pretvorjeno iz oblike Mac)"
+
+#: src/files.c:889
+#, c-format
+msgid ""
+"Read %lu line (Converted from Mac format - Warning: No write permission)"
+msgid_plural ""
+"Read %lu lines (Converted from Mac format - Warning: No write permission)"
+msgstr[0] ""
+"Prebranih je %lu vrstic (pretvorjeno iz oblike Mac - Opozorilo: ni dovoljenj "
+"za pisanje)"
+msgstr[1] ""
+"Prebrana je %lu vrstica (pretvorjeno iz oblike Mac - Opozorilo: ni dovoljenj "
+"za pisanje)"
+msgstr[2] ""
+"Prebrani sta %lu vrstici (pretvorjeno iz oblike Mac - Opozorilo: ni "
+"dovoljenj za pisanje)"
+msgstr[3] ""
+"Prebrane so %lu vrstice (pretvorjeno iz oblike Mac - Opozorilo: ni dovoljenj "
+"za pisanje)"
+
+#: src/files.c:895
+#, c-format
+msgid "Read %lu line (Converted from DOS format)"
+msgid_plural "Read %lu lines (Converted from DOS format)"
+msgstr[0] "Prebranih je %lu vrstic (Pretvorjeno iz oblike DOS)"
+msgstr[1] "Prebrana je %lu vrstica (Pretvorjeno iz oblike DOS)"
+msgstr[2] "Prebrani sta %lu vrstici (Pretvorjeno iz oblike DOS)"
+msgstr[3] "Prebrane so %lu vrstice (Pretvorjeno iz oblike DOS)"
+
+#: src/files.c:899
+#, c-format
+msgid ""
+"Read %lu line (Converted from DOS format - Warning: No write permission)"
+msgid_plural ""
+"Read %lu lines (Converted from DOS format - Warning: No write permission)"
+msgstr[0] ""
+"Prebranih je %lu vrstic (Pretvorjeno iz oblike DOS - Opozorilo: ni dovoljenj "
+"za pisanje)"
+msgstr[1] ""
+"Prebrana je %lu vrstica (Pretvorjeno iz oblike DOS - Opozorilo: ni dovoljenj "
+"za pisanje)"
+msgstr[2] ""
+"Prebrani sta %lu vrstici (Pretvorjeno iz oblike DOS - Opozorilo: ni "
+"dovoljenj za pisanje)"
+msgstr[3] ""
+"Prebrane so %lu vrstice (Pretvorjeno iz oblike DOS - Opozorilo: ni dovoljenj "
+"za pisanje)"
+
+#: src/files.c:905
+#, c-format
+msgid "Read %lu line"
+msgid_plural "Read %lu lines"
+msgstr[0] "Prebranih je %lu vrstic"
+msgstr[1] "Prebrana je %lu vrstica"
+msgstr[2] "Prebrani sta %lu vrstici"
+msgstr[3] "Prebrane so %lu vrstice"
+
+#: src/files.c:908
+#, c-format
+msgid "Read %lu line ( Warning: No write permission)"
+msgid_plural "Read %lu lines (Warning: No write permission)"
+msgstr[0] "Prebranih je %lu vrstic (opozorilo: ni dovoljenj za pisanje)"
+msgstr[1] "Prebrana je %lu vrstica (opozorilo: ni dovoljenj za pisanje)"
+msgstr[2] "Prebrani sta %lu vrstici (opozorilo: ni dovoljenj za pisanje)"
+msgstr[3] "Prebrane so %lu vrstice (opozorilo: ni dovoljenj za pisanje)"
+
+#: src/files.c:943 src/files.c:980
+msgid "Reading File"
+msgstr "Branje datoteke"
+
+#: src/files.c:950
+msgid "New File"
+msgstr "Nova datoteka"
+
+#: src/files.c:953
+#, c-format
+msgid "\"%s\" not found"
+msgstr "\"%s\" ni mogo�e najti"
+
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
+#, c-format
+msgid "\"%s\" is a directory"
+msgstr "\"%s\" je mapa"
+
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
+#, c-format
+msgid "\"%s\" is a device file"
+msgstr "\"%s\" je datoteka naprave"
+
+#: src/files.c:1060
+#, c-format
+msgid "Command to execute in new buffer [from %s] "
+msgstr "Ukaz za izvedbo v novem medpomnilniku [iz %s] "
+
+#: src/files.c:1062
+#, c-format
+msgid "Command to execute [from %s] "
+msgstr "Ukaz za izvedbo [iz %s] "
+
+#: src/files.c:1069
+#, c-format
+msgid "File to insert into new buffer [from %s] "
+msgstr "Datoteka za vstavitev v nov medpomnilnik [iz %s] "
+
+#: src/files.c:1071
+#, c-format
+msgid "File to insert [from %s] "
+msgstr "Datoteka za vstavitev [iz %s] "
+
+#: src/files.c:1320
+msgid "Key invalid in non-multibuffer mode"
+msgstr "Neveljavna tipka v ne-ve�-medpomnilniškem na�inu"
+
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"Varnostne datoteke ni mogo�e zapisati. Ali želite datoteko vseeno shraniti? "
+"Če niste popolnoma prepri�ani, pritisnite N."
+
+#: src/files.c:1746
+#, c-format
+msgid "Can't write outside of %s"
+msgstr "Ni mogo�e pisati zunaj %s"
+
+#: src/files.c:1761
+msgid "Cannot prepend or append to a symlink with --nofollow set"
+msgstr ""
+"Ni mogo�e pripeti na za�etek ali pripeti k simbolni povezavi z --nofollow"
+
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
+#, c-format
+msgid "Error writing backup file %s: %s"
+msgstr "Napaka med pisanjem datoteke varnostne kopije %s: %s"
+
+#: src/files.c:1844 src/nano.c:719
+msgid "Too many backup files?"
+msgstr "Ali je preve� varnostnih kopij datotek?"
+
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
+#, c-format
+msgid "Error writing %s: %s"
+msgstr "Napaka med pisanjem %s:%s"
+
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
+#, c-format
+msgid "Error writing temp file: %s"
+msgstr "Napaka med pisanjem v za�asno datoteko: %s"
+
+#: src/files.c:2173
+#, c-format
+msgid "Wrote %lu line"
+msgid_plural "Wrote %lu lines"
+msgstr[0] "Zapisanih je %lu vrstic"
+msgstr[1] "Zapisana je %lu vrstica"
+msgstr[2] "Zapisani sta %lu vrstici"
+msgstr[3] "Zapisane so %lu vrstice"
+
+#: src/files.c:2278
+msgid " [DOS Format]"
+msgstr " [Oblika DOS]"
+
+#: src/files.c:2279
+msgid " [Mac Format]"
+msgstr " [Oblika Mac]"
+
+#: src/files.c:2281
+msgid " [Backup]"
+msgstr " [Varnostna kopija]"
+
+#: src/files.c:2289
+msgid "Prepend Selection to File"
+msgstr "Pripni izbiro pred datoteko"
+
+#: src/files.c:2290
+msgid "Append Selection to File"
+msgstr "Pripni izbiro datoteki"
+
+#: src/files.c:2291
+msgid "Write Selection to File"
+msgstr "Zapiši izbiro v datoteko"
+
+#: src/files.c:2294
+msgid "File Name to Prepend to"
+msgstr "Ime datoteke, ki naj bo pripeta na za�etek"
+
+#: src/files.c:2295
+msgid "File Name to Append to"
+msgstr "Ime datoteke, ki naj bo pripeta"
+
+#: src/files.c:2296
+msgid "File Name to Write"
+msgstr "Ime datoteke za zapis"
+
+#: src/files.c:2427
+msgid "File exists, OVERWRITE ? "
+msgstr "Datoteka že obstraja. Ali naj bo prepisana? "
+
+#: src/files.c:2436
+msgid "Save file under DIFFERENT NAME ? "
+msgstr "Ali želite datoteko shraniti z DRUGIM imenom? "
+
+#: src/files.c:2450
+msgid "File was modified since you opened it, continue saving ? "
+msgstr ""
+"Datoteka je bila po odpiranju spremenjena. Ali jo želite vseeno shraniti? "
+
+#: src/files.c:2882
+msgid "(more)"
+msgstr "(ve�)"
+
+#: src/files.c:2974
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue\n"
+msgstr ""
+"\n"
+"Za nadaljevanje pritisnite Enter\n"
+
+#: src/files.c:2989
+#, fuzzy, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Mape %s ni mogo�e ustvariti: %s\n"
+"Mapa je namenjena shranjevanju in nalaganju zgodovine iskanja in položaja "
+"kazalke\n"
+
+#: src/files.c:2995
+#, fuzzy, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"Pot %s ni mapa.\n"
+"S programom Nano ne bo mogo�e shranjevati in nalagati zgodovine iskanja in "
+"položaja kazalke\n"
+
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Zaznana je bila opuš�ena datoteka zgodovine (%s). Med premikanjem\n"
+"datoteke na prednostno mesto (%s) je prišlo do napake: %s"
+
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Zaznana je bila opuš�ena datoteka zgodovine (%s).\n"
+"Premaknjena je na prednostno mesto (%s)\n"
+"Za ve� podrobnosti si poglejte pogosto zastavljena vprašanja."
+
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Kon�aj"
+
+#: src/global.c:478
+msgid "Close"
+msgstr "Zapri"
+
+#: src/global.c:479
+#, fuzzy
+msgid "Uncut Text"
+msgstr "Odizr. be."
+
+#: src/global.c:481
+#, fuzzy
+msgid "Unjustify"
+msgstr "Odporavnaj"
+
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
+msgid "WhereIs Next"
+msgstr "Iš�i nas."
+
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
+msgid "Where Is"
+msgstr "Poiš�i"
+
+#: src/global.c:493
+msgid "Replace"
+msgstr "Zamenjaj"
+
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "V vrstico"
+
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Pred. vrs."
+
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Nasl. vrs."
+
+#: src/global.c:497
+msgid "Read File"
+msgstr "Odpri dat."
+
+#: src/global.c:499
+msgid "FullJstify"
+msgstr "Pop. por."
+
+#: src/global.c:501
+msgid "Refresh"
+msgstr "Osveži"
+
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
+msgid "Justify the current paragraph"
+msgstr "Poravnaj trenutni odstavek"
+
+#: src/global.c:509
+msgid "Cancel the current function"
+msgstr "Prekli�i trenutno funkcijo"
+
+#: src/global.c:510
+msgid "Display this help text"
+msgstr "Pokaži to besedilo pomo�i"
+
+#: src/global.c:513
+msgid "Close the current file buffer / Exit from nano"
+msgstr "Zapri trenutni medpomnilnik datoteke / Kon�aj nano"
+
+#: src/global.c:515
+msgid "Exit from nano"
+msgstr "Kon�aj nano"
+
+#: src/global.c:519
+msgid "Write the current file to disk"
+msgstr "Zapiši trenutno datoteko na disk"
+
+#: src/global.c:521
+msgid "Insert another file into the current one"
+msgstr "Vstavi drugo datoteko v trenutno"
+
+#: src/global.c:523
+msgid "Search for a string or a regular expression"
+msgstr "Poiš�i niz znakov ali logi�ni izraz"
+
+#: src/global.c:526
+#, fuzzy
+msgid "Search for a string"
+msgstr "Poiš�i niz znakov ali logi�ni izraz"
+
+#: src/global.c:528
+#, fuzzy
+msgid "Go one screenful up"
+msgstr "Pojdi na naslednji zaslon"
+
+#: src/global.c:529
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "Pojdi na naslednji zaslon"
+
+#: src/global.c:531
+msgid "Cut the current line and store it in the cutbuffer"
+msgstr "Izreži trenutno vrstico in jo shrani v medpomnil. izreza"
+
+#: src/global.c:533
+msgid "Uncut from the cutbuffer into the current line"
+msgstr "Prilepi iz medpomnilnika izreza v trenutno vrstico"
+
+#: src/global.c:534
+msgid "Display the position of the cursor"
+msgstr "Prikaži položaj kazalke"
+
+#: src/global.c:536
+msgid "Invoke the spell checker, if available"
+msgstr "Vklju�i �rkovalnik, �e je na voljo"
+
+#: src/global.c:538
+msgid "Replace a string or a regular expression"
+msgstr "Zamenjaj niz ali logi�ni izraz"
+
+#: src/global.c:539
+msgid "Go to line and column number"
+msgstr "Pojdi v Å¡tevilko vrstice in stolpca"
+
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
+msgstr "Ozna�i besedilo na mestu kazalke"
+
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
+msgstr "Ponovi zadnje iskanje"
+
+#: src/global.c:544
+msgid "Copy the current line and store it in the cutbuffer"
+msgstr "Kopiraj trenutno vrstico in jo shrani v medpomni. izreza"
+
+#: src/global.c:545
+msgid "Indent the current line"
+msgstr "Zamakni trenutno vrstico"
+
+#: src/global.c:546
+msgid "Unindent the current line"
+msgstr "Odstrani zamik trenutne vrstice"
+
+#: src/global.c:547
+msgid "Undo the last operation"
+msgstr "Razveljavi zadnje dejanje"
+
+#: src/global.c:548
+msgid "Redo the last undone operation"
+msgstr "Uveljavi zadnje razveljavljeno dejanje"
+
+#: src/global.c:550
+msgid "Go forward one character"
+msgstr "Pojdi naprej za en znak"
+
+#: src/global.c:551
+msgid "Go back one character"
+msgstr "Pojdi nazaj za en znak"
+
+#: src/global.c:553
+msgid "Go forward one word"
+msgstr "Pojdi naprej za eno besedo"
+
+#: src/global.c:554
+msgid "Go back one word"
+msgstr "Pojdi nazaj za eno besedo"
+
+#: src/global.c:556
+msgid "Go to previous line"
+msgstr "Pojdi v predhodno vrstico"
+
+#: src/global.c:557
+msgid "Go to next line"
+msgstr "Pojdi v naslednjo vrstico"
+
+#: src/global.c:558
+msgid "Go to beginning of current line"
+msgstr "Pojdi na za�etek trenutne vrstice"
+
+#: src/global.c:559
+msgid "Go to end of current line"
+msgstr "Pojdi na konec trenutne vrstice"
+
+#: src/global.c:562
+msgid "Go to beginning of paragraph; then of previous paragraph"
+msgstr "Pojdi na za�etek odstavka; nato prejšnjega odstavka"
+
+#: src/global.c:564
+msgid "Go just beyond end of paragraph; then of next paragraph"
+msgstr "Pojdi preko konca odstavka; nato naslednjega odstavka"
+
+#: src/global.c:566
+msgid "Go to the first line of the file"
+msgstr "Pojdi v prvo vrstico datoteke"
+
+#: src/global.c:567
+msgid "Go to the last line of the file"
+msgstr "Pojdi v zadnjo vrstico datoteke"
+
+#: src/global.c:569
+msgid "Go to the matching bracket"
+msgstr "Pojdi do ujemajo�ega oklepaja"
+
+#: src/global.c:571
+msgid "Scroll up one line without scrolling the cursor"
+msgstr "Pomakni se navzgor za eno vrstico brez drsenja kazalke"
+
+#: src/global.c:573
+msgid "Scroll down one line without scrolling the cursor"
+msgstr "Pomakni se navzdol za eno vrstico brez drsenja kazalke"
+
+#: src/global.c:576
+msgid "Switch to the previous file buffer"
+msgstr "Preklopi na prejšnji medpomnilnik datoteke"
+
+#: src/global.c:577
+msgid "Switch to the next file buffer"
+msgstr "Preklopi na naslednji medpomnilnik datoteke"
+
+#: src/global.c:579
+msgid "Insert the next keystroke verbatim"
+msgstr "Vstavi naslednji natan�ni pritisk tipk"
+
+#: src/global.c:580
+msgid "Insert a tab at the cursor position"
+msgstr "Vstavi tabulator na položaju kazalke"
+
+#: src/global.c:581
+msgid "Insert a newline at the cursor position"
+msgstr "Vstavi novo vrstico na položaju kazalke"
+
+#: src/global.c:582
+msgid "Delete the character under the cursor"
+msgstr "Izbriši znak pod kazalko"
+
+#: src/global.c:584
+msgid "Delete the character to the left of the cursor"
+msgstr "Izbriši znak levo od kazalke"
+
+#: src/global.c:587
+msgid "Cut from the cursor position to the end of the file"
+msgstr "Izreži s položaja kazalke na konec datoteke"
+
+#: src/global.c:590
+msgid "Justify the entire file"
+msgstr "Poravnaj celotno datoteko"
+
+#: src/global.c:594
+msgid "Count the number of words, lines, and characters"
+msgstr "Preštej število besed, vrstic in znakov"
+
+#: src/global.c:597
+msgid "Refresh (redraw) the current screen"
+msgstr "Osveži (ponovno nariši) trenutni zaslon"
+
+#: src/global.c:599
+msgid "Suspend the editor (if suspend is enabled)"
+msgstr "Daj urejevalnik v pripravljenost (�e je omogo�eno)"
+
+#: src/global.c:602
+msgid "Toggle the case sensitivity of the search"
+msgstr "Preklopi lo�evanje velikosti �rk iskanja"
+
+#: src/global.c:604
+msgid "Reverse the direction of the search"
+msgstr "Obrni smer iskanja"
+
+#: src/global.c:608
+msgid "Toggle the use of regular expressions"
+msgstr "Preklopi uporabo logi�nih izrazov"
+
+#: src/global.c:612
+msgid "Recall the previous search/replace string"
+msgstr "Prikli�i predhodni niz iskanja/zamenjave"
+
+#: src/global.c:614
+msgid "Recall the next search/replace string"
+msgstr "Prikli�i naslednji niz iskanja/zamenjave"
+
+#: src/global.c:617
+msgid "Go to file browser"
+msgstr "Pojdi v brskalnik datotek"
+
+#: src/global.c:620
+msgid "Toggle the use of DOS format"
+msgstr "Preklopi uporabo oblike DOS"
+
+#: src/global.c:621
+msgid "Toggle the use of Mac format"
+msgstr "Preklopi uporabo oblike Mac"
+
+#: src/global.c:622
+msgid "Toggle appending"
+msgstr "Preklopi pripenjanje"
+
+#: src/global.c:623
+msgid "Toggle prepending"
+msgstr "Preklopi pripenjanje na za�etek"
+
+#: src/global.c:624
+msgid "Toggle backing up of the original file"
+msgstr "Preklopi ustvarjanje varnostne kopije izvirne datoteke"
+
+#: src/global.c:625
+msgid "Execute external command"
+msgstr "Izvedi zunanji ukaz"
+
+#: src/global.c:628
+msgid "Toggle the use of a new buffer"
+msgstr "Preklopi uporabo novega medpomnilnika"
+
+#: src/global.c:631
+msgid "Exit from the file browser"
+msgstr "Kon�aj brskalnik datotek"
+
+#: src/global.c:632
+msgid "Go to the first file in the list"
+msgstr "Pojdi k prvi datoteki na seznamu"
+
+#: src/global.c:633
+msgid "Go to the last file in the list"
+msgstr "Pojdi k zadnji datoteki na seznamu"
+
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "Pojdi k predhodni datoteki na seznamu"
+
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Pojdi k naslednji datoteki na seznamu"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Pojdi v mapo"
+
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Vklju�i �rkovalnik, �e je na voljo"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Pojdi v predhodno vrstico"
+
+#: src/global.c:641
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "Pojdi v naslednjo vrstico"
+
+#: src/global.c:642
+#, fuzzy
+msgid "Invoke formatter, if available"
+msgstr "Vklju�i �rkovalnik, �e je na voljo"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Pomo�"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Prekli�i"
+
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
+msgstr "Zapiši"
+
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Pojdi v mapo"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Izre. bes."
+
+#: src/global.c:728
+msgid "Justify"
+msgstr "Poravnaj"
+
+#: src/global.c:733
+msgid "To Spell"
+msgstr "ÄŒrkuj"
+
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "V vrstico"
+
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "oblika DOS"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Lo�. �rk"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Log. izraz"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Nazaj"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Brez. zam."
+
+#: src/global.c:770
+msgid "Cur Pos"
+msgstr "Položaj kaz."
+
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Pred. str."
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Nasl. str."
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Prva vrst."
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Zad. vrst."
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ni oklepaj"
+
+#: src/global.c:797
+msgid "Mark Text"
+msgstr "Ozna. bes."
+
+#: src/global.c:800
+msgid "Copy Text"
+msgstr "Kopi. bes."
+
+#: src/global.c:803
+msgid "Indent Text"
+msgstr "Zama. bes."
+
+#: src/global.c:805
+msgid "Unindent Text"
+msgstr "Odzam. be."
+
+#: src/global.c:808
+msgid "Undo"
+msgstr "Razveljavi"
+
+#: src/global.c:810
+msgid "Redo"
+msgstr "Uveljavi"
+
+#: src/global.c:814 src/global.c:820
+msgid "Back"
+msgstr "Nazaj"
+
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Naprej"
+
+#: src/global.c:827
+msgid "Prev Word"
+msgstr "Pred. bes."
+
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Nasl. bes."
+
+#: src/global.c:833
+msgid "Home"
+msgstr "Domov"
+
+#: src/global.c:835
+msgid "End"
+msgstr "Konec"
+
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Za�. odst."
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Kon. odst."
+
+#: src/global.c:851
+msgid "Scroll Up"
+msgstr "Pomik gor"
+
+#: src/global.c:853
+msgid "Scroll Down"
+msgstr "Pomik dol"
+
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
+msgstr "Predhodna datoteka"
+
+#: src/global.c:860
+msgid "Next File"
+msgstr "Naslednja datoteka"
+
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
+msgstr "Natan�ni vnos"
+
+#: src/global.c:872
+msgid "Tab"
+msgstr "Tabulator"
+
+#: src/global.c:874
+msgid "Enter"
+msgstr "Enter"
+
+#: src/global.c:876
+msgid "Delete"
+msgstr "Delete"
+
+#: src/global.c:878
+msgid "Backspace"
+msgstr "Vra�alka"
+
+#: src/global.c:888
+msgid "CutTillEnd"
+msgstr "IzrezDoKonca"
+
+#: src/global.c:898
+msgid "Word Count"
+msgstr "Å tetje besed"
+
+#: src/global.c:905
+msgid "Suspend"
+msgstr "V priprav."
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Prej. Zgo."
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "Nasl. Zgo."
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Nasl. bes."
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "oblika DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "oblika Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Pripni"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Pripni na za�et."
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Varnostna kopija"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Izvedi ukaz"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Do datotek"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Prva dat."
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Zadnja dat."
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "Pred. vrs."
+
+#: src/global.c:979
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "Nasl. vrs."
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
+msgid "Help mode"
+msgstr "Na�in pomo�i"
+
+#: src/global.c:1229
+msgid "Constant cursor position display"
+msgstr "Stalni prikaz položaja kazalke"
+
+#: src/global.c:1231
+msgid "Use of one more line for editing"
+msgstr "Uporaba ene vrstice ve� za urejanje"
+
+#: src/global.c:1233
+msgid "Smooth scrolling"
+msgstr "Gladko drsenje"
+
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Ne lomi dolgih vrstic"
+
+#: src/global.c:1237
+msgid "Whitespace display"
+msgstr "Prikaz presledkov"
+
+#: src/global.c:1239
+msgid "Color syntax highlighting"
+msgstr "Barvno poudarjanje skladnje"
+
+#: src/global.c:1241
+msgid "Smart home key"
+msgstr "Pametna tipka za Domov"
+
+#: src/global.c:1243
+msgid "Auto indent"
+msgstr "Samodejno zamikanje"
+
+#: src/global.c:1245
+msgid "Cut to end"
+msgstr "Izreži do konca"
+
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Ne lomi dolgih vrstic"
+
+#: src/global.c:1249
+msgid "Conversion of typed tabs to spaces"
+msgstr "Pretvarjanje tabulatorjev v presledne znake"
+
+#: src/global.c:1251
+msgid "Backup files"
+msgstr "Datoteke varnostnih kopij"
+
+#: src/global.c:1253
+msgid "Multiple file buffers"
+msgstr "Ve� medpomnilnikov datotek"
+
+#: src/global.c:1255
+msgid "Mouse support"
+msgstr "Podpora za miško"
+
+#: src/global.c:1257
+msgid "No conversion from DOS/Mac format"
+msgstr "Ni pretvorbe iz oblike DOS/Mac"
+
+#: src/global.c:1259
+msgid "Suspension"
+msgstr "Stanje pripravljenosti"
+
+#: src/help.c:205
+msgid ""
+"Search Command Help Text\n"
+"\n"
+" Enter the words or characters you would like to search for, and then press "
+"Enter.  If there is a match for the text you entered, the screen will be "
+"updated to the location of the nearest match for the search string.\n"
+"\n"
+" The previous search string will be shown in brackets after the search "
+"prompt.  Hitting Enter without entering any text will perform the previous "
+"search.  "
+msgstr ""
+"Pomo� za ukaz iskanja\n"
+"\n"
+" Vnesite besede ali znake, ki jih želite poiskati, in vnos potrdite. Ko je "
+"niz najden, se na zaslonu pokaže mesto prvega zadetka.\n"
+"\n"
+" Predhodni iskalni niz bo prikazan v oklepajih. Pritisk vnosne tipke brez "
+"predhodnega vnosa besedila, izvede predhodno iskanje.  "
+
+#: src/help.c:214
+msgid ""
+"If you have selected text with the mark and then search to replace, only "
+"matches in the selected text will be replaced.\n"
+"\n"
+" The following function keys are available in Search mode:\n"
+"\n"
+msgstr ""
+"Kadar je izbrano besedilo z oznako in je uporabljena možnost iskanja in "
+"zamenjave, bodo zamenjani le nizi v izbranem besedilu.\n"
+"\n"
+" V na�inu Iskanja so na voljo naslednje funkcijske tipke:\n"
+"\n"
+
+#: src/help.c:220
+msgid ""
+"Go To Line Help Text\n"
+"\n"
+" Enter the line number that you wish to go to and hit Enter.  If there are "
+"fewer lines of text than the number you entered, you will be brought to the "
+"last line of the file.\n"
+"\n"
+" The following function keys are available in Go To Line mode:\n"
+"\n"
+msgstr ""
+"Pomo� za skok v vrstico\n"
+"\n"
+" Vnesite številko vrstice, v katero želite sko�iti, in pritisnite vnosno "
+"tipko. Kadar je število vrstic besedila manjše do vpisanega števila, bo "
+"kazalka premaknjena v zadnjo vrstico.\n"
+"\n"
+"V na�inu V vrstico so na voljo naslednje funkcijske tipke:\n"
+"\n"
+
+#: src/help.c:229
+msgid ""
+"Insert File Help Text\n"
+"\n"
+" Type in the name of a file to be inserted into the current file buffer at "
+"the current cursor location.\n"
+"\n"
+" If you have compiled nano with multiple file buffer support, and enable "
+"multiple file buffers with the -F or --multibuffer command line flags, the "
+"Meta-F toggle, or a nanorc file, inserting a file will cause it to be loaded "
+"into a separate buffer (use Meta-< and > to switch between file buffers).  "
+msgstr ""
+"Pomo� za vstavljanje datoteke\n"
+"\n"
+" Vnesite ime datoteke, ki jo želite vstaviti v medpomnilnik trenutne "
+"datoteke na trenutnem položaju kazalke.\n"
+"\n"
+" V primeru, da je program nano kodno preveden s podporo ve� medpomnilnikom "
+"in so medpomnilniki ve� datotek omogo�eni z zastavicami ukazne vrstice -F "
+"ali --multibuffer ali datoteko nanorc, bo datoteka naložena v lo�en "
+"medpomnilnik (za preklop med medpomnilniki datotek je na voljo bližnjica "
+"Meta-< in >).  "
+
+#: src/help.c:238
+msgid ""
+"If you need another blank buffer, do not enter any filename, or type in a "
+"nonexistent filename at the prompt and press Enter.\n"
+"\n"
+" The following function keys are available in Insert File mode:\n"
+"\n"
+msgstr ""
+"Kadar potrebujete dodaten prazen medpomnilnik, ob pozivu ne vnašajte imen "
+"datotek ali pa vnesite neobstoje�e ime datoteke, nato pritisnite vnosno "
+"tipko.\n"
+"\n"
+" V na�inu vstavljanja datoteke so na voljo naslednje funkcijske tipke:\n"
+"\n"
+
+#: src/help.c:244
+msgid ""
+"Write File Help Text\n"
+"\n"
+" Type the name that you wish to save the current file as and press Enter to "
+"save the file.\n"
+"\n"
+" If you have selected text with the mark, you will be prompted to save only "
+"the selected portion to a separate file.  To reduce the chance of "
+"overwriting the current file with just a portion of it, the current filename "
+"is not the default in this mode.\n"
+"\n"
+" The following function keys are available in Write File mode:\n"
+"\n"
+msgstr ""
+"Pomo� za zapisovanje datotek\n"
+"\n"
+" Vnesite ime, s katerim želite shraniti trenutno datoteko, in pritisnite "
+"vnosno tipko za potrditev. \n"
+"\n"
+" Če ste izbrali besedilo z oznako, bo prikazana možnost za shranjevanje le "
+"izbranega dela besedila v lo�eno datoteko. Za zmanjšanje možnosti prepisa "
+"trenutne datoteke, v tem na�inu trenutno ime ni dolo�eno privzeto.\n"
+"\n"
+" V na�inu zapisovanja so na voljo naslednje funkcijske tipke:\n"
+"\n"
+
+#: src/help.c:258
+msgid ""
+"File Browser Help Text\n"
+"\n"
+" The file browser is used to visually browse the directory structure to "
+"select a file for reading or writing.  You may use the arrow keys or Page Up/"
+"Down to browse through the files, and S or Enter to choose the selected file "
+"or enter the selected directory.  To move up one level, select the directory "
+"called \"..\" at the top of the file list.\n"
+"\n"
+" The following function keys are available in the file browser:\n"
+"\n"
+msgstr ""
+"Pomo� za brskalnik datotek\n"
+"\n"
+" Brskalnik je uporaben pri iskanju datotek po drevesu map. Uporabiti je "
+"mogo�e smerne tipke in tipki stran gor in dol ter S ali vnosno tipko za "
+"izbor datoteke oziroma vstop v izbrano mapo. Za premik na višjo raven map, "
+"izberite mapo z oznako \"..\" na vrhu seznama datotek.\n"
+"\n"
+"  V na�inu brskanja so na voljo naslednje funkcijske tipke:\n"
+"\n"
+
+#: src/help.c:271
+msgid ""
+"Browser Search Command Help Text\n"
+"\n"
+" Enter the words or characters you would like to search for, and then press "
+"Enter.  If there is a match for the text you entered, the screen will be "
+"updated to the location of the nearest match for the search string.\n"
+"\n"
+" The previous search string will be shown in brackets after the search "
+"prompt.  Hitting Enter without entering any text will perform the previous "
+"search.\n"
+"\n"
+msgstr ""
+"Pomo� za brskanje med ukazi\n"
+"\n"
+" Vnesite besede in znake, ki jih želite poiskati, in pritisnite vnosno "
+"tipko.  Če je niz najden, se na zaslonu pokaže mesto prvega zadetka.\n"
+"\n"
+" Predhodni iskalni niz bo prikazan v oklepajih. Pritisk vnosne tipke, brez "
+"predhodnega vnosa besedila, izvede predhodno iskanje.\n"
+"\n"
+
+#: src/help.c:280
+msgid ""
+" The following function keys are available in Browser Search mode:\n"
+"\n"
+msgstr ""
+" V na�inu iskanja v brskalniku so na voljo naslednje funkcijske tipke:\n"
+"\n"
+
+#: src/help.c:284
+msgid ""
+"Browser Go To Directory Help Text\n"
+"\n"
+" Enter the name of the directory you would like to browse to.\n"
+"\n"
+" If tab completion has not been disabled, you can use the Tab key to "
+"(attempt to) automatically complete the directory name.\n"
+"\n"
+" The following function keys are available in Browser Go To Directory mode:\n"
+"\n"
+msgstr ""
+"Pomo� za premikanje med mapami\n"
+"\n"
+" Vnesite ime mape, po kateri želite brskati.\n"
+"\n"
+" Kadar je omogo�ena možnost dopolnjevanja niza, se s tipko Tab ime mape "
+"samodejno dopolni.\n"
+"\n"
+" V na�inu premikanja med mapami v brskalniku so na voljo naslednje "
+"funkcijske tipke:\n"
+"\n"
+
+#: src/help.c:297
+msgid ""
+"Spell Check Help Text\n"
+"\n"
+" The spell checker checks the spelling of all text in the current file.  "
+"When an unknown word is encountered, it is highlighted and a replacement can "
+"be edited.  It will then prompt to replace every instance of the given "
+"misspelled word in the current file, or, if you have selected text with the "
+"mark, in the selected text.\n"
+"\n"
+" The following function keys are available in Spell Check mode:\n"
+"\n"
+msgstr ""
+"Pomo� za �rkovanje\n"
+"\n"
+" S �rkovalnikom lahko preverimo pravilnost zapisa celotnega besedila v "
+"trenutni datoteki. Kadar �rkovalnik naleti na neznano besedo, jo poudari in "
+"omogo�i urejanje. Po urejanju se pojavi možnost za zamenjavo vsakega "
+"primerka dane napa�no �rkovane besede v trenutni datoteki ali, �e je "
+"besedilo izbrano, v izboru besedila.\n"
+"\n"
+" V na�inu �rkovanja so na voljo naslednje funkcijske tipke:\n"
+"\n"
+
+#: src/help.c:312
+msgid ""
+"Execute Command Help Text\n"
+"\n"
+" This mode allows you to insert the output of a command run by the shell "
+"into the current buffer (or a new buffer in multiple file buffer mode).  If "
+"you need another blank buffer, do not enter any command.\n"
+"\n"
+" The following function keys are available in Execute Command mode:\n"
+"\n"
+msgstr ""
+"Pomo� za izvajanje ukazov\n"
+"\n"
+" Možnost omogo�a vnos izpisa ukaza iz lupine v trenutni medpomnilnik (ali "
+"nov medpomnilnik v na�inu medpomnilnika ve� datotek). Pri uporabi praznega "
+"medpomnilnika, ni treba vnesti ukazov.\n"
+"\n"
+" V na�inu izvajanja ukazov so na voljo naslednje funkcijske tipke:\n"
+"\n"
+
+#: src/help.c:325
+msgid ""
+"Main nano help text\n"
+"\n"
+" The nano editor is designed to emulate the functionality and ease-of-use of "
+"the UW Pico text editor.  There are four main sections of the editor.  The "
+"top line shows the program version, the current filename being edited, and "
+"whether or not the file has been modified.  Next is the main editor window "
+"showing the file being edited.  The status line is the third line from the "
+"bottom and shows important messages.  "
+msgstr ""
+"Splošna pomo� programa nano\n"
+"\n"
+" Urejevalnik nano posnema delovanje in preprostost uporabe urejevalnika "
+"besedil UW Pico. Urejevalnik ima Å¡tiri osrednje dele, na katere je treba "
+"biti pozoren. Zgornja vrstica prikazuje razli�ico programa, trenutno ime "
+"odprte datoteke in, ali je bila datoteka spremenjena ali ne. Naslednji del "
+"je osrednje okno urejevalnika z besedilom odprte datoteke. Vrstica stanja je "
+"tretja vrstica od spodaj navzgor, v kateri so izpisana pomembna sporo�ila."
+
+#: src/help.c:335
+msgid ""
+"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 and can be entered either by using the Control "
+"(Ctrl) key or pressing the Escape (Esc) key twice.  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.  "
+msgstr ""
+"Spodnji dve vrstici prikazujeta najpogosteje uporabljene bližnjice.\n"
+"\n"
+" Zapis za bližnjice je poenoten. Bližnice CTRL-tipka so zapisana s "
+"korektorskim znakom (^) in se jih lahko vnese bodisi z uporabo tipke Control "
+"(Ctrl) bodisi z dvojnim pritiskom ubežne tipke (Esc). Zaporedja Esc-tipka so "
+"zabeležena s simbolom Meta (M-) in se jih lahko vnese s tipkami Esc, Alt ali "
+"Meta, odvisno od nastavitve tipkovnice."
+
+#: src/help.c:344
+msgid ""
+"Also, pressing Esc twice and then typing a three-digit decimal number from "
+"000 to 255 will enter the character with the corresponding value.  The "
+"following keystrokes are available in the main editor window.  Alternative "
+"keys are shown in parentheses:\n"
+"\n"
+msgstr ""
+"Prav tako lahko z dvojnim pritiskom ubežne tipke (Esc), in nato z vnosom "
+"trimestnega decimalnega Å¡tevila od 000 do 255, vnesete znak z ustrezno "
+"vrednostjo. Naslednje poteze tipk so na voljo v osrednjem oknu urejevalnika. "
+"Nadomestne tipke so prikazane v oklepajih:\n"
+"\n"
+
+#: src/help.c:376 src/help.c:448
+msgid "enable/disable"
+msgstr "omogo�i/onemogo�i"
+
+#: src/nano.c:601
+msgid "Key invalid in view mode"
+msgstr "Klju� je neveljaven v na�inu pogleda"
+
+#: src/nano.c:713
+#, c-format
+msgid ""
+"\n"
+"Buffer written to %s\n"
+msgstr ""
+"\n"
+"Medpomnilnik je zapisan v %s\n"
+
+#: src/nano.c:715
+#, c-format
+msgid ""
+"\n"
+"Buffer not written to %s: %s\n"
+msgstr ""
+"\n"
+"Medpomnilnik ni zapisan v %s: %s\n"
+
+#: src/nano.c:718
+#, c-format
+msgid ""
+"\n"
+"Buffer not written: %s\n"
+msgstr ""
+"\n"
+"Medpomnilnik ni zapisan: %s\n"
+
+#: src/nano.c:743
+msgid "Window size is too small for nano...\n"
+msgstr "Velikost okna je premajhna za nano ...\n"
+
+#: src/nano.c:836
+#, c-format
+msgid ""
+"Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
+"\n"
+msgstr ""
+"Uporaba: nano [MOŽNOSTI] [[+VRSTICA,STOLPEC] DATOTEKA] ...\n"
+"\n"
+
+#: src/nano.c:839
+#, c-format
+msgid "Option\t\tGNU long option\t\tMeaning\n"
+msgstr "Možnost\t\tdolga možnost GNU\t\tPomen\n"
+
+#: src/nano.c:841
+#, c-format
+msgid "Option\t\tMeaning\n"
+msgstr "Možnost\t\tPomen\n"
+
+#: src/nano.c:844
+msgid "+LINE,COLUMN"
+msgstr "+VRSTICA,STOLPEC"
+
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
+msgid "Start at line LINE, column COLUMN"
+msgstr "Za�etek v vrstici VRSTICA, stolpcu STOLPEC"
+
+#: src/nano.c:849
+msgid "Enable smart home key"
+msgstr "Omogo�i pametno tipko za Domov"
+
+#: src/nano.c:850
+msgid "Save backups of existing files"
+msgstr "Shrani varnostne kopije obstoje�ih datotek"
+
+#: src/nano.c:851
+msgid "-C <dir>"
+msgstr "-C <mapa>"
+
+#: src/nano.c:851
+msgid "--backupdir=<dir>"
+msgstr "--backupdir=<mapa>"
+
+#: src/nano.c:852
+msgid "Directory for saving unique backup files"
+msgstr "Mapa za shranjevanje edinstvenih varnostnih kopij"
+
+#: src/nano.c:855
+msgid "Use bold instead of reverse video text"
+msgstr "Uporabi krepko namesto obratnega besedila videa"
+
+#: src/nano.c:858
+msgid "Convert typed tabs to spaces"
+msgstr "Pretvori vpisane tabulatorske znake v presledke"
+
+#: src/nano.c:861
+msgid "Enable multiple file buffers"
+msgstr "Omogo�i ve� medpomnilnikov datotek"
+
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Uporabi zaklepne datoteke"
+
+#: src/nano.c:869
+msgid "Log & read search/replace string history"
+msgstr "Beleži in beri zgodovino niza iskanja in zamenjave"
+
+#: src/nano.c:873
+msgid "Don't look at nanorc files"
+msgstr "Ne glej datotek nanorc"
+
+#: src/nano.c:876
+msgid "Fix numeric keypad key confusion problem"
+msgstr "Popravi težavo z zmedo s tipkami števil�nice"
+
+#: src/nano.c:878
+msgid "Don't add newlines to the ends of files"
+msgstr "Ne dodajaj novih vrstic na konec datotek"
+
+#: src/nano.c:881
+msgid "Don't convert files from DOS/Mac format"
+msgstr "Ne pretvarjaj datotek iz oblike DOS/Mac"
+
+#: src/nano.c:883
+msgid "Use one more line for editing"
+msgstr "Uporabi eno ali ve� vrstic za urejanje"
+
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Shrani in preberi mesto kazalke"
+
+#: src/nano.c:889
+msgid "-Q <str>"
+msgstr "-Q <niz>"
+
+#: src/nano.c:889
+msgid "--quotestr=<str>"
+msgstr "--quotestr=<niz>"
+
+#: src/nano.c:890
+msgid "Quoting string"
+msgstr "Niz za navajanje"
+
+#: src/nano.c:892
+msgid "Restricted mode"
+msgstr "Omejen na�in"
+
+#: src/nano.c:895
+msgid "Scroll by line instead of half-screen"
+msgstr "Pomikaj se vrsti�no namesto pol-zaslonsko"
+
+#: src/nano.c:897
+msgid "-T <#cols>"
+msgstr "-T <Å¡t. stolpcev>"
+
+#: src/nano.c:897
+msgid "--tabsize=<#cols>"
+msgstr "--tabsize=<Å¡t. stolpcev>"
+
+#: src/nano.c:898
+msgid "Set width of a tab to #cols columns"
+msgstr "Nastavi Å¡irino tabulatorja na Å¡t. stolpcev stolpcev"
+
+#: src/nano.c:900
+msgid "Do quick statusbar blanking"
+msgstr "Hitro prazni vrstico stanja"
+
+#: src/nano.c:903
+msgid "Print version information and exit"
+msgstr "Prikaži podrobnosti razli�ice in kon�aj"
+
+#: src/nano.c:906
+msgid "Detect word boundaries more accurately"
+msgstr "Zaznaj meje besed natan�neje"
+
+#: src/nano.c:909
+msgid "-Y <str>"
+msgstr "-Y <niz>"
+
+#: src/nano.c:909
+msgid "--syntax=<str>"
+msgstr "--syntax=<niz>"
+
+#: src/nano.c:910
+msgid "Syntax definition to use for coloring"
+msgstr "Uporaba dolo�ila skladnje za barvanje"
+
+#: src/nano.c:912
+msgid "Constantly show cursor position"
+msgstr "Nenehno kaži položaj kazalke"
+
+#: src/nano.c:914
+msgid "Fix Backspace/Delete confusion problem"
+msgstr "Popravi težavo zmede tipk vra�alke/izbriši"
+
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "Pokaži to besedilo pomo�i"
+
+#: src/nano.c:918
+msgid "Automatically indent new lines"
+msgstr "Samodejno zamakni nove vrstice"
+
+#: src/nano.c:919
+msgid "Cut from cursor to end of line"
+msgstr "Izreži od kazalke do konca vrstice"
+
+#: src/nano.c:922
+msgid "Don't follow symbolic links, overwrite"
+msgstr "Ne dovoli simbolnih povezav, ampak prepiši"
+
+#: src/nano.c:924
+msgid "Enable the use of the mouse"
+msgstr "Omogo�i uporabo miške"
+
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
+msgid "-o <dir>"
+msgstr "-o <mapa>"
+
+#: src/nano.c:928
+msgid "--operatingdir=<dir>"
+msgstr "--operatingdir=<mapa>"
+
+#: src/nano.c:929
+msgid "Set operating directory"
+msgstr "Nastavi mapo delovanja"
+
+#: src/nano.c:932
+msgid "Preserve XON (^Q) and XOFF (^S) keys"
+msgstr "Ohrani tipke XON (^Q) in XOFF (^S)"
+
+#: src/nano.c:935
+msgid "Silently ignore startup issues like rc file errors"
+msgstr "Tiho prezri težave za�enjanja kot napake datoteke rc"
+
+#: src/nano.c:938
+msgid "-r <#cols>"
+msgstr "-r <Å¡t. stolpcev>"
+
+#: src/nano.c:938
+msgid "--fill=<#cols>"
+msgstr "--fill=<Å¡t. stolpcev>"
+
+#: src/nano.c:939
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Nastavi to�ko preloma na stolpcu št. stoplca"
+
+#: src/nano.c:942
+msgid "-s <prog>"
+msgstr "-s <prog>"
+
+#: src/nano.c:942
+msgid "--speller=<prog>"
+msgstr "--speller=<prog>"
+
+#: src/nano.c:943
+msgid "Enable alternate speller"
+msgstr "Omogo�i nadomestni �rkovalnik"
+
+#: src/nano.c:946
+msgid "Auto save on exit, don't prompt"
+msgstr "Samodejno shrani ob izhodu in ne pokaži poziva"
+
+#: src/nano.c:947
+msgid "View mode (read-only)"
+msgstr "Na�in pogleda (samo za branje)"
+
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
+msgstr "Ne lomi dolgih vrstic"
+
+#: src/nano.c:951
+msgid "Don't show the two help lines"
+msgstr "Ne pokaži dveh vrstic pomo�i"
+
+#: src/nano.c:952
+msgid "Enable suspension"
+msgstr "Omogo�i stanje pripravljenosti"
+
+#: src/nano.c:954
+msgid "Enable soft line wrapping"
+msgstr "Omogo�i blage prelome vrstic"
+
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano razli�ica %s (kodno prevedena %s, %s)\n"
+
+#: src/nano.c:966
+#, c-format
+msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
+msgstr ""
+" Elektronska pošta: nano@nano-editor.org\tSplet: http://www.nano-editor.org/"
+
+#: src/nano.c:967
+#, c-format
+msgid ""
+"\n"
+" Compiled options:"
+msgstr ""
+"\n"
+" Kodno prevedene možnosti:"
+
+#: src/nano.c:1096
+msgid "Sorry, support for this function has been disabled"
+msgstr "Žal je podpora za to funkcijo onemogo�ena"
+
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
+msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
+msgstr ""
+"Ali naj se spremembe datoteke shranijo (z odgovorom \"Ne\" bodo SPREMEMBE "
+"IZGUBLJENE)? "
+
+#: src/nano.c:1189
+msgid "Couldn't reopen stdin from keyboard, sorry\n"
+msgstr "Na žalost ni bilo mogo�e ponovno odpreti stdin s tipkovnice\n"
+
+#: src/nano.c:1213
+#, c-format
+msgid "Reading from stdin, ^C to abort\n"
+msgstr "Branje iz stdin, ^C za prekinitev\n"
+
+#: src/nano.c:1279
+msgid "Received SIGHUP or SIGTERM\n"
+msgstr "Prejet je bil SIGHUP ali SIGTERM\n"
+
+#: src/nano.c:1301
+#, c-format
+msgid "Use \"fg\" to return to nano.\n"
+msgstr "Za vrnitev v nano uporabite \"fg\".\n"
+
+#: src/nano.c:1481
+msgid "enabled"
+msgstr "omogo�eno"
+
+#: src/nano.c:1481
+msgid "disabled"
+msgstr "onemogo�eno"
+
+#: src/nano.c:1635 src/winio.c:1283
+msgid "Unknown Command"
+msgstr "Neznan ukaz"
+
+#: src/nano.c:1747
+msgid "XON ignored, mumble mumble"
+msgstr "XON je prezrt, mumble mumble"
+
+#: src/nano.c:1752
+msgid "XOFF ignored, mumble mumble"
+msgstr "XOFF je prezrt, mumble mumble"
+
+#: src/nano.c:2310 src/rcfile.c:1325
+#, c-format
+msgid "Requested tab size \"%s\" is invalid"
+msgstr "Zahtevana velikost tabulatorja \"%s\" je neveljavna"
+
+#: src/nano.c:2374 src/rcfile.c:1250
+#, c-format
+msgid "Requested fill size \"%s\" is invalid"
+msgstr "Zahtevana velikost zapolnitve \"%s\" je neveljavna"
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr ""
+
+#. TRANSLATORS: For the next three strings, if possible, specify
+#. * the single-byte shortcuts for both your language and English.
+#. * For example, in French: "OoYy" for "Oui".
+#: src/prompt.c:1055
+msgid "Yy"
+msgstr "DdYy"
+
+#: src/prompt.c:1056
+msgid "Nn"
+msgstr "NnNn"
+
+#: src/prompt.c:1057
+msgid "Aa"
+msgstr "VvAa"
+
+#: src/prompt.c:1071
+msgid "Yes"
+msgstr "Da"
+
+#: src/prompt.c:1076
+msgid "All"
+msgstr "Vse"
+
+#: src/prompt.c:1081
+msgid "No"
+msgstr "Ne"
+
+#: src/rcfile.c:137
+#, c-format
+msgid "Error in %s on line %lu: "
+msgstr "Napaka v %s v vrstici %lu: "
+
+#: src/rcfile.c:196
+#, c-format
+msgid "Argument '%s' has an unterminated \""
+msgstr "Argument '%s' ima neuni�en \""
+
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
+msgid "Regex strings must begin and end with a \" character"
+msgstr "Nizi logi�nega izraza se morajo za�eti in kon�ati z znakom \""
+
+#: src/rcfile.c:249 src/search.c:62
+#, c-format
+msgid "Bad regex \"%s\": %s"
+msgstr "Slab logi�ni izraz \"%s\": %s"
+
+#: src/rcfile.c:269
+msgid "Missing syntax name"
+msgstr "Manjka ime skladnje"
+
+#: src/rcfile.c:340
+msgid "The \"none\" syntax is reserved"
+msgstr "Skladnja \"none\" je pridržana"
+
+#: src/rcfile.c:347
+msgid "The \"default\" syntax must take no extensions"
+msgstr "Skladnja \"default\" ne sme prejeti nobene pripone"
+
+#: src/rcfile.c:433
+msgid "Missing key name"
+msgstr "Manjka ime tipke"
+
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:463
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Tipkovne bližnjice se morajo za�eti s \"^\", \"M\", ali \"F\""
+
+#: src/rcfile.c:472
+#, fuzzy
+msgid "Must specify a function to bind the key to"
+msgstr "Treba je navesti funkcijo, ki se veže na tipko"
+
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
+
+#: src/rcfile.c:489
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Ni mogo�e preslikati imena \"%s\" k funkciji"
+
+#: src/rcfile.c:496
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Ni mogo�e preslikati imena \"%s\" k meniju"
+
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
+
+#: src/rcfile.c:543
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Na žalost je pritisk tipk \"%s\" neveljavna vezava"
+
+#: src/rcfile.c:629
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "Napaka med branjem %s: %s"
+
+#: src/rcfile.c:672
+#, c-format
+msgid ""
+"Color \"%s\" not understood.\n"
+"Valid colors are \"green\", \"red\", \"blue\",\n"
+"\"white\", \"yellow\", \"cyan\", \"magenta\" and\n"
+"\"black\", with the optional prefix \"bright\"\n"
+"for foreground colors."
+msgstr ""
+"Barva \"%s\" ni razumljiva.\n"
+"Veljavne barve so \"green\", \"red\", \"blue\",\n"
+"\"white\", \"yellow\", \"cyan\", \"magenta\" in\n"
+"\"black\", z neobvezno predpono \"bright\"\n"
+"za osprednje barve."
+
+#: src/rcfile.c:694
+msgid "Cannot add a color command without a syntax command"
+msgstr "Ni mogo�e dodati ukaza barve brez ukaza skladnje"
+
+#: src/rcfile.c:699
+msgid "Missing color name"
+msgstr "Manjka ime barve"
+
+#: src/rcfile.c:709 src/rcfile.c:870
+msgid "Missing regex string"
+msgstr "Manjka niz logi�nega izraza"
+
+#: src/rcfile.c:785
+msgid "\"start=\" requires a corresponding \"end=\""
+msgstr "\"start=\" potrebuje ustrezen \"end=\""
+
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Barva ozadja \"%s\" ne more biti svetla"
+
+#: src/rcfile.c:865
+msgid "Cannot add a header regex without a syntax command"
+msgstr "Ni mogo�e dodati logi�nega izraza glave brez ukaza skladnje"
+
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Ni mogo�e dodati logi�nega izraza �arobnega niza brez ukaza skladnje"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Manjka ime �arobnega niza"
+
+#: src/rcfile.c:985
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Ni mogo�e dodati logi�nega izraza glave brez ukaza skladnje"
+
+#: src/rcfile.c:990
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Manjka ime barve"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Ni mogo�e dodati ukaza barve brez ukaza skladnje"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "Usodna napaka: nobenih tipk ni preslikanih za funkcijo \"%s\""
+
+#: src/rcfile.c:1047
+#, fuzzy, c-format
+msgid ""
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
+msgstr ""
+"Poteka kon�anje programa. Za prilagajanje nastavitev nanorc, uporabite ukaz "
+"nano z možnostjo -I.\n"
+
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Ni mogo�e preslikati imena \"%s\" k meniju"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
+#, c-format
+msgid "Command \"%s\" not allowed in included file"
+msgstr "Ukaz \"%s\" ni dovoljen v vklju�eni datoteki"
+
+#: src/rcfile.c:1149 src/rcfile.c:1350
+#, c-format
+msgid "Syntax \"%s\" has no color commands"
+msgstr "Skladnja \"%s\" nima ukazov barv"
+
+#: src/rcfile.c:1171
+#, c-format
+msgid "Command \"%s\" not understood"
+msgstr "Ukaz \"%s\" ni razumljiv"
+
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "Manjka ime barve"
+
+#: src/rcfile.c:1208
+#, c-format
+msgid "Option \"%s\" requires an argument"
+msgstr "Možnost \"%s\" zahteva argument"
+
+#: src/rcfile.c:1226
+msgid "Option is not a valid multibyte string"
+msgstr "Možnost ni veljaven ve�bajtni niz"
+
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
+msgid "Non-blank characters required"
+msgstr "Zahtevani so ne-prazni znaki"
+
+#: src/rcfile.c:1273
+msgid "Two single-column characters required"
+msgstr "Potrebna sta dva enostolp�na znaka"
+
+#: src/rcfile.c:1339
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "Ni mogo�e ponastaviti zastavice \"%s\""
+
+#: src/rcfile.c:1345
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
+msgstr "Neznana zastavica \"%s\""
+
+#: src/rcfile.c:1404
+msgid "I can't find my home directory!  Wah!"
+msgstr "Ni mogo�e najti doma�e mape!"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Za nadaljevanje uporabe programa nano pritisnite vnosno tipko.\n"
+
+#: src/search.c:96
+#, c-format
+msgid "\"%.*s%s\" not found"
+msgstr "\"%.*s%s\" ni mogo�e najti"
+
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Case Sensitive]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Regexp]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Backwards]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
+msgid " (to replace) in selection"
+msgstr " (za zamenjavo) v izbor"
+
+#: src/search.c:199
+msgid " (to replace)"
+msgstr " (za zamenjavo)"
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
+msgid "Replace this instance?"
+msgstr "Ali naj se primerek zamenja?"
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
+msgid "Replace with"
+msgstr "Zamenjaj z"
+
+#: src/search.c:986
+#, c-format
+msgid "Replaced %lu occurrence"
+msgid_plural "Replaced %lu occurrences"
+msgstr[0] "Zamenjanih je %lu pojavitev"
+msgstr[1] "Zamenjana je %lu pojavitev"
+msgstr[2] "Zamenjani sta %lu pojavitvi"
+msgstr[3] "Zamenjane so %lu pojavitve"
+
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
+msgid "Enter line number, column number"
+msgstr "Vnesite Å¡tevilko vrstice, Å¡tevilko stolpca"
+
+#: src/search.c:1054
+msgid "Invalid line or column number"
+msgstr "Neveljavna Å¡tevilka vrstice ali stolpca"
+
+#: src/search.c:1207
+msgid "Not a bracket"
+msgstr "Ni oklepaj"
+
+#: src/search.c:1274
+msgid "No matching bracket"
+msgstr "Ni ujemajo�ega oklepaja"
+
+#: src/text.c:54
+msgid "Mark Set"
+msgstr "Ozna�ba je nastavljena"
+
+#: src/text.c:58
+msgid "Mark Unset"
+msgstr "Ozna�ba je ponastavljena"
+
+#: src/text.c:439
+msgid "Nothing in undo buffer!"
+msgstr "Ni�esar ni v medpomnilniku razveljavitve!"
+
+#: src/text.c:445 src/text.c:590
+#, fuzzy, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Notranja napaka: ni mogo�e primerjati vrstice %d. Shranite svoje delo."
+
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
+msgid "text add"
+msgstr "dodaj besedilo"
+
+#: src/text.c:467 src/text.c:612
+msgid "text delete"
+msgstr "izbriši besedilo"
+
+#: src/text.c:491 src/text.c:641
+msgid "line join"
+msgstr "združi vrstici"
+
+#: src/text.c:505 src/text.c:657
+msgid "text cut"
+msgstr "izreži besedilo"
+
+#: src/text.c:510 src/text.c:661
+msgid "text uncut"
+msgstr "odizreži besedilo"
+
+#: src/text.c:515 src/text.c:623
+msgid "line break"
+msgstr "prekini vrstico"
+
+#: src/text.c:528 src/text.c:672
+msgid "text insert"
+msgstr "vnesi besedilo"
+
+#: src/text.c:549 src/text.c:665
+msgid "text replace"
+msgstr "zamenjaj besedilo"
+
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Notranja napaka: neznana vrsta. Shranite svoje delo."
+
+#: src/text.c:561
+#, c-format
+msgid "Undid action (%s)"
+msgstr "Ponastavljeno dejanje (%s)"
+
+#: src/text.c:580
+msgid "Nothing to re-do!"
+msgstr "Ni�esar ni mogo�e uveljaviti!"
+
+#: src/text.c:584
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr ""
+"Notranja napaka: ni mogo�e nastaviti preklica izreza. Shranite svoje delo."
+
+#: src/text.c:684
+#, c-format
+msgid "Redid action (%s)"
+msgstr "Uveljavljeno dejanje (%s)"
+
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Ni mogo�e ustvariti cevi"
+
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
+msgid "Could not fork"
+msgstr "Ni mogo�e razvejiti"
+
+#: src/text.c:969
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
+msgstr ""
+"Notranja napaka: ni mogo�e nastaviti preklica izreza. Shranite svoje delo."
+
+#: src/text.c:1806
+#, c-format
+msgid "Bad quote string %s: %s"
+msgstr "Slab niz navedka %s: %s"
+
+#: src/text.c:2207
+msgid "Can now UnJustify!"
+msgstr "Zdaj je mogo�e preklicati poravnavo!"
+
+#: src/text.c:2404
+msgid "Edit a replacement"
+msgstr "Uredi zamenjavo"
+
+#: src/text.c:2492
+msgid "Creating misspelled word list, please wait..."
+msgstr "Ustvarjanje napa�no �rkovanega seznama besed, po�akajte ..."
+
+#: src/text.c:2584 src/text.c:3022
+msgid "Could not get size of pipe buffer"
+msgstr "Ni mogo�e pridobiti velikosti medpomnilnika cevi"
+
+#: src/text.c:2635
+msgid "Error invoking \"spell\""
+msgstr "Napaka pri priklicu \"spell\""
+
+#: src/text.c:2638
+msgid "Error invoking \"sort -f\""
+msgstr "Napaka pri priklicu \"sort -f\""
+
+#: src/text.c:2641
+msgid "Error invoking \"uniq\""
+msgstr "Napaka pri priklicu \"uniq\""
+
+#: src/text.c:2696 src/text.c:2907
+msgid "Finished checking spelling"
+msgstr "Kon�ano preverjanje �rkovanja"
+
+#: src/text.c:2759 src/text.c:3340
+#, c-format
+msgid "Error invoking \"%s\""
+msgstr "Napaka pri priklicu \"%s\""
+
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Vklju�i �rkovalnik, �e je na voljo"
+
+#: src/text.c:2902
+#, c-format
+msgid "Spell checking failed: %s"
+msgstr "Preverjanje �rkovanja je spodletelo: %s"
+
+#: src/text.c:2904
+#, c-format
+msgid "Spell checking failed: %s: %s"
+msgstr "Preverjanje �rkovanja je spodletelo: %s: %s"
+
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "Ne dodajaj novih vrstic na konec datotek"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "Pokaži to sporo�ilo"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "Pokaži to sporo�ilo"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
+#, c-format
+msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgstr "%sBesede: %lu  Vrstice: %ld  Znaki: %lu"
+
+#: src/text.c:3439
+msgid "In Selection:  "
+msgstr "V izboru:  "
+
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Natan�ni vnos"
+
+#: src/utils.c:410 src/utils.c:422
+msgid "nano is out of memory!"
+msgstr "Programu nano je zmanjkalo pomnilnika!"
+
+#. TRANSLATORS: This is displayed during the input of a
+#. * six-digit hexadecimal Unicode character code.
+#: src/winio.c:1583
+msgid "Unicode Input"
+msgstr "Vnos Unikod"
+
+#: src/winio.c:2142 src/winio.c:2146
+msgid "Modified"
+msgstr "Spremenjeno"
+
+#: src/winio.c:2143
+msgid "View"
+msgstr "Pogled"
+
+#: src/winio.c:2157
+msgid "DIR:"
+msgstr "MAPA:"
+
+#: src/winio.c:2164
+msgid "File:"
+msgstr "Datoteka:"
+
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Opozorilo: Spreminjati želite datoteko, ki ni zaklenjena. Prosimo, preverite "
+"dovoljenja mape."
+
+#: src/winio.c:3377
+#, c-format
+msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
+msgstr "vrstica %ld/%ld (%d%%), stolpec %lu/%lu (%d%%), znak %lu/%lu (%d%%)"
+
+#: src/winio.c:3507
+msgid "The nano text editor"
+msgstr "Urejevalnik besedil nano"
+
+#: src/winio.c:3508
+msgid "version"
+msgstr "razli�ica"
+
+#: src/winio.c:3509
+msgid "Brought to you by:"
+msgstr "Zaslužni za izid programa:"
+
+#: src/winio.c:3510
+msgid "Special thanks to:"
+msgstr "Posebna zahvala:"
+
+#: src/winio.c:3511
+msgid "The Free Software Foundation"
+msgstr "The Free Software Foundation"
+
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
+msgid "For ncurses:"
+msgstr "Za ncurses:"
+
+#: src/winio.c:3514
+msgid "and anyone else we forgot..."
+msgstr "in vse, ki smo jih pozabili navesti ..."
+
+#: src/winio.c:3515
+msgid "Thank you for using nano!"
+msgstr "Hvala, ker uporabljate nano!"
+
+#~ msgid "Insert File"
+#~ msgstr "Vstavi dat."
+
+#~ msgid "Go to previous screen"
+#~ msgstr "Pojdi na predhodni zaslon"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Najdi drug oklepaj"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Prelomi dolgih vrstic"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Blagi prelomi vrstic"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Dovoli splošno razveljavitev [POSKUSNO]"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(prezrto, za združljivost s programom Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Treba je navesti meni, ki se veže na tipko (ali \"all\")"
+
+#~ msgid "Missing flag"
+#~ msgstr "Manjka zastavica"
+
+#~ msgid "line wrap"
+#~ msgstr "prelomi vrstico"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Notranja napaka: neznana vrsta. Shranite svoje delo"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr ""
+#~ "Notranja napaka: nastavitev uveljavitve je spodletela. Shranite svoje "
+#~ "delo."
+
+#~ msgid "Could not pipe"
+#~ msgstr "Ni mogo�e povezati"
diff --git a/po/sr.gmo b/po/sr.gmo
index c9fd43b..7ebadf5 100644
--- a/po/sr.gmo
+++ b/po/sr.gmo
diff --git a/po/sr.po b/po/sr.po
index 0943f9b..1faa4ca 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,1035 +1,1089 @@
-# Serbian translation of nano
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Serbian translation of nano.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This file is distributed under the same license as the nano package.
 # Danilo Segan <dsegan@gmx.net>, 2003.
-#
+# Миро�лав �иколић <miroslavnikolic@rocketmail.com>, 2013—2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.2.2\n"
+"Project-Id-Version: nano-2.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2003-11-05 22:27+0100\n"
-"Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
-"Language-Team: Serbian <sr@li.org>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2014-09-13 12:15+0200\n"
+"Last-Translator: Миро�лав �иколић <miroslavnikolic@rocketmail.com>\n"
+"Language-Team: Serbian <(nothing)>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :  (n%10>=2 && n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/browser.c:220
-#, fuzzy
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "Иди у директоријум"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Отказано"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
-msgstr "�е могох да одем ван %s у ограниченом режиму"
+msgstr "�е могу да идем ван „%s“ у ограниченом режиму"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
-#, fuzzy, c-format
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
+#, c-format
 msgid "Error reading %s: %s"
-msgstr "Лоша ни�ка за цитирање %s: %s"
+msgstr "Грешка при читању „%s“: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "�е могох да уђем у наддиректоријум"
+msgstr "�е могу да идем директоријум изнад"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
-msgstr ""
+msgstr "(дир)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
-msgstr ""
+msgstr "(главни дир)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Тражи"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr "[разл. �лова по величини]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr "[рег. израз]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr "[уназад]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
-msgstr "Претрага у круг"
+msgstr "Тражи у круг"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Ово је једина појава"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
+msgstr "�ема шаблона текуће претраге"
+
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"�е могу да одредим мој идентет за датотеку закључавања (није у�пело "
+"„getpwuid()“)"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "�е могу да одредим назив домаћина за датотеку закључавања: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Грешка запи�ивања датотеке закључавања „%s“: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Грешка бри�ања датотеке закључавања „%s“: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Грешка отварања датотеке закључавања „%s“: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "Грешка читања датотеке закључавања „%s“: �ема довољно података читања"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
 msgstr ""
 
-#: src/files.c:125
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Грешка пи�ања датотеке закључавања: Директоријум „%s“ не по�тоји"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "�е могох да уметнем датотеку изван %s"
+msgstr "�е могу да уметнем датотеку изван %s"
 
-#: src/files.c:234
-#, fuzzy
+#: src/files.c:467
 msgid "No more open file buffers"
-msgstr "�ема више отворених датотека"
+msgstr "�ема више међумеморије отворених датотека"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
-msgstr "Пребацих �е на %s"
+msgstr "Прешао �ам на %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
-msgstr "�ови бафер"
+msgstr "�ова међумеморија"
 
-#: src/files.c:633
-#, fuzzy, c-format
+#: src/files.c:874
+#, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
-msgstr[0] "Учитах %d ред (претворен из Мекинтош запи�а)"
-msgstr[1] "Учитах %d реда (претворених из Мекинтош запи�а)"
-msgstr[2] "Учитах %d редова (претворених из Мекинтош запи�а)"
+msgstr[0] "Учитах %lu ред (претворен из ДОС и Мекинтош запи�а)"
+msgstr[1] "Учитах %lu реда (претворених из ДОС и Мекинтош запи�а)"
+msgstr[2] "Учитах %lu редова (претворених из ДОС и Мекинтош запи�а)"
 
-#: src/files.c:638
-#, fuzzy, c-format
+#: src/files.c:879
+#, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
 "permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
 "permission)"
-msgstr[0] "Учитах %d ред (претворен из Мекинтош запи�а)"
-msgstr[1] "Учитах %d реда (претворених из Мекинтош запи�а)"
-msgstr[2] "Учитах %d редова (претворених из Мекинтош запи�а)"
+msgstr[0] ""
+"Учитах %lu ред (претворен из ДОС и Мекинтош запи�а — упозорење: нема дозволе "
+"за пи�ање)"
+msgstr[1] ""
+"Учитах %lu реда (претворених из ДОС и Мекинтош запи�а — упозорење: нема "
+"дозволе за пи�ање)"
+msgstr[2] ""
+"Учитах %lu редова (претворених из ДОС и Мекинтош запи�а — упозорење: нема "
+"дозволе за пи�ање)"
 
-#: src/files.c:644
-#, fuzzy, c-format
+#: src/files.c:885
+#, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
-msgstr[0] "Учитах %d ред (претворен из Мекинтош запи�а)"
-msgstr[1] "Учитах %d реда (претворених из Мекинтош запи�а)"
-msgstr[2] "Учитах %d редова (претворених из Мекинтош запи�а)"
+msgstr[0] "Учитах %lu ред (претворен из Мекинтош запи�а)"
+msgstr[1] "Учитах %lu реда (претворених из Мекинтош запи�а)"
+msgstr[2] "Учитах %lu редова (претворених из Мекинтош запи�а)"
 
-#: src/files.c:648
-#, fuzzy, c-format
+#: src/files.c:889
+#, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "Учитах %d ред (претворен из Мекинтош запи�а)"
-msgstr[1] "Учитах %d реда (претворених из Мекинтош запи�а)"
-msgstr[2] "Учитах %d редова (претворених из Мекинтош запи�а)"
+msgstr[0] ""
+"Учитах %lu ред (претворен из Мекинтош запи�а — упозорење: нема дозвола за "
+"пи�ање)"
+msgstr[1] ""
+"Учитах %lu реда (претворених из Мекинтош запи�а — упозорење: нема дозвола за "
+"пи�ање)"
+msgstr[2] ""
+"Учитах %lu редова (претворених из Мекинтош запи�а — упозорење: нема дозвола "
+"за пи�ање)"
 
-#: src/files.c:654
-#, fuzzy, c-format
+#: src/files.c:895
+#, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
-msgstr[0] "Учитах %d ред (претворен из ДОС запи�а)"
-msgstr[1] "Учитах %d реда (претворених из ДОС запи�а)"
-msgstr[2] "Учитах %d редова (претворених из ДОС запи�а)"
+msgstr[0] "Учитах %lu ред (претворен из ДОС запи�а)"
+msgstr[1] "Учитах %lu реда (претворених из ДОС запи�а)"
+msgstr[2] "Учитах %lu редова (претворених из ДОС запи�а)"
 
-#: src/files.c:658
-#, fuzzy, c-format
+#: src/files.c:899
+#, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "Учитах %d ред (претворен из ДОС запи�а)"
-msgstr[1] "Учитах %d реда (претворених из ДОС запи�а)"
-msgstr[2] "Учитах %d редова (претворених из ДОС запи�а)"
+msgstr[0] ""
+"Учитах %lu ред (претворен из ДОС запи�а — упозорење: нема дозвола за пи�ање)"
+msgstr[1] ""
+"Учитах %lu реда (претворених из ДОС запи�а — упозорење: нема дозвола за "
+"пи�ање)"
+msgstr[2] ""
+"Учитах %lu редова (претворених из ДОС запи�а — упозорење: нема дозвола за "
+"пи�ање)"
 
-#: src/files.c:664
-#, fuzzy, c-format
+#: src/files.c:905
+#, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
-msgstr[0] "Учитах %d ред"
-msgstr[1] "Учитах %d реда"
-msgstr[2] "Учитах %d редова"
+msgstr[0] "Учитах %lu ред"
+msgstr[1] "Учитах %lu реда"
+msgstr[2] "Учитах %lu редова"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Учитах %lu редова (упозорење: нема дозвола за пи�ање)"
+msgstr[1] "Учитах %lu редова (упозорење: нема дозвола за пи�ање)"
+msgstr[2] "Учитах %lu редова (упозорење: нема дозвола за пи�ање)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Учитавам датотеку"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "�ова датотека"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
-msgstr "�е нађох „%s“"
+msgstr "�и�ам нашао „%s“"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "„%s“ је директоријум"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
-#, fuzzy, c-format
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
+#, c-format
 msgid "\"%s\" is a device file"
-msgstr "Датотека „%s“ чини датотеку уређаја"
+msgstr "„%s“ је датотека уређаја"
 
-#: src/files.c:817
-#, fuzzy, c-format
+#: src/files.c:1060
+#, c-format
 msgid "Command to execute in new buffer [from %s] "
-msgstr "Датотека коју уметнути у нови бафер [из %s] "
+msgstr "�аредба за извршавање у новој међумеморији [из „%s“] "
 
-#: src/files.c:819
-#, fuzzy, c-format
+#: src/files.c:1062
+#, c-format
 msgid "Command to execute [from %s] "
-msgstr "�аредба за извршавање"
+msgstr "�аредба за извршавање [из „%s“] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
-msgstr "Датотека коју уметнути у нови бафер [из %s] "
+msgstr "Датотека за уно� у нову међумеморију [из „%s“] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
-msgstr "Датотека коју уметнути [из %s] "
+msgstr "Датотека за уно� [из „%s“] "
 
-#: src/files.c:1077
-#, fuzzy
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
-msgstr "�едозвољен та�тер у не-вишебафер�ком режиму"
+msgstr "�едозвољен та�тер у не-вишемеђумемориј�ком режиму"
+
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"�и�ам у�пео да запишем датотеку резерве, да на�тавим �а чувањем? (Одговорите "
+"�а N ако ни�те �игурни)"
 
-#: src/files.c:1486
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "�е могох да упишем изван %s"
+msgstr "�е могу да пишем ван %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
+"�е могу да додам подешавање „--nofollow“ и�пред или иза �имболичке везе"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr ""
+msgstr "Грешка запи�ивања датотеке резерве „%s“: %s"
 
-#: src/files.c:1582 src/nano.c:701
-#, fuzzy
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
-msgstr ""
-"\n"
-"�е упи�ах %s (превише резервних датотека?)\n"
+msgstr "Превише резервних датотека?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
-#, fuzzy, c-format
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
+#, c-format
 msgid "Error writing %s: %s"
-msgstr "Лоша ни�ка за цитирање %s: %s"
+msgstr "Грешка приликом пи�ања „%s“: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr ""
+msgstr "Грешка пи�ања привремене датотеке: %s"
 
-#: src/files.c:1900
-#, fuzzy, c-format
+#: src/files.c:2173
+#, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
-msgstr[0] "Упи�ах %d ред"
-msgstr[1] "Упи�ах %d реда"
-msgstr[2] "Упи�ах %d редова"
+msgstr[0] "Упи�ах %lu ред"
+msgstr[1] "Упи�ах %lu реда"
+msgstr[2] "Упи�ах %lu редова"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
-msgstr "[ДОС запи�]"
+msgstr " [ДОС запи�]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
-msgstr "[Мек запи�]"
+msgstr " [Мек запи�]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
-msgstr "[Резерва]"
+msgstr " [Резерва]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
-msgstr "Додај избор на почетак датотеке"
+msgstr "Додаје избор на почетак датотеке"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "Додај избор на крај датотеке"
+msgstr "Додаје избор на крај датотеке"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
-msgstr "Упиши избор у датотеку"
+msgstr "Упи�ује избор у датотеку"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
-msgstr "У коју датотеку додати"
+msgstr "�азив датотеке којој ће претходити"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
-msgstr "У коју датотеку додати"
+msgstr "�азив датотеке за којом ће �ледити"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
-msgstr "У коју датотеку упи�ати"
+msgstr "�азив датотеке у којој ће упи�ати"
 
-#: src/files.c:2153
-#, fuzzy
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "Датотека по�тоји, да ПРЕС�ИМИМ?"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
-msgstr ""
+msgstr "Да �ачувам датотеку под ДРУГ�ЧИЈИМ ��ЗИВОМ ?"
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
+msgstr "Датотека је измењена од када �те је отворили, да на�тавим �а чувањем ?"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
-msgstr "(више)"
+msgstr "(још)"
 
-#: src/files.c:2694 src/rcfile.c:1220
-#, fuzzy, c-format
+#: src/files.c:2974
+#, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Прити�ните ентер за на�тавак покретања нана\n"
+"Прити�ните Уне�и да на�тавите\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Откажи"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Замени"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"�е могу да направим директоријум „%s“: %s\n"
+"Потребан је за чување/учитавање и�торијата претраге или положаја кур�ора.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Без замене"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"Путања „%s“ није директоријум а мора бити.\n"
+"�ано неће бити у могућно�ти да учита или да �ачува и�торијат претраге или "
+"положаје кур�ора.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Вел. �лова"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Открио �ам �тару датотеку и�торијата наноа (%s) коју �ам покушао да\n"
+"преме�тим на жељено ме�то (%s) али �ам наишао на грешку: %s"
 
-#: src/global.c:421
-#, fuzzy
-msgid "Backwards"
-msgstr "[уназад]"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Открио �ам �тару датотеку и�торијата наноа (%s) коју �ам\n"
+"преме�тио на жељено ме�то (%s)\n"
+"(погледајте нанова ЧПП о овој измени)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Рег. израз"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Изађи"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-#, fuzzy
-msgid "PrevHstory"
-msgstr "И�торијат"
+#: src/global.c:478
+msgid "Close"
+msgstr "Затвори"
 
-#: src/global.c:452
-#, fuzzy
-msgid "NextHstory"
-msgstr "И�торијат"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "�е �еци тек�т"
 
-#: src/global.c:453
-#, fuzzy
-msgid "Go To Text"
-msgstr "Иди у ред"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Одравнај"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
-#, fuzzy
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
-msgstr "Где је"
-
-#: src/global.c:457
-#, fuzzy
-msgid "First File"
-msgstr "Први ред"
-
-#: src/global.c:458
-#, fuzzy
-msgid "Last File"
-msgstr "По�ледњи ред"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "У датотеке"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "ДОС запи�"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Мекинтош запи�"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "�адодај"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Додај на почетак"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Сачини резерву датотеке"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Изврши наредбу"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Иди у директоријум"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Добијте помоћ"
+msgstr "Где је �лдћи"
 
-#: src/global.c:481
-msgid "Exit"
-msgstr "Изађи"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Где је"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Претходна �трана"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Следећа �трана"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Први ред"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Замени"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "По�ледњи ред"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "�а ред"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Су�пендуј"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Претходни ред"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr ""
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Следећи ред"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr ""
+#: src/global.c:497
+msgid "Read File"
+msgstr "Читај датотеку"
 
-#: src/global.c:491
-#, fuzzy
+#: src/global.c:499
 msgid "FullJstify"
-msgstr "Пораванај"
+msgstr "Пуно поравнање"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "О�вежи"
 
-#: src/global.c:495
-#, fuzzy
-msgid "Insert File"
-msgstr "Следећа датотека"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Иди у ред"
-
-#: src/global.c:500
-msgid "Justify the current paragraph"
-msgstr "Поравнај текући па�у�"
-
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:507
+msgid "Justify the current paragraph"
+msgstr "Поравнава текући па�у�"
+
+#: src/global.c:509
 msgid "Cancel the current function"
-msgstr "Откажи текућу операцију"
+msgstr "Отказује текућу операцију"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
-msgstr ""
+msgstr "Приказује тек�т ове помоћи"
 
-#: src/global.c:509
-#, fuzzy
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
-msgstr "Затвори тренутно учитану датотеку/изађи из нана"
+msgstr "Затвара међумеморију тренутне датотеке / излази из нана"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
-msgstr "Изађи из нана"
+msgstr "Излази из нана"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
-msgstr "Упиши текућу датотеку на ди�к"
+msgstr "Упи�ује текућу датотеку на ди�к"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
-msgstr "Уметни другу датотеку у текућу"
+msgstr "Умеће другу датотеку у текућу"
 
-#: src/global.c:519
-#, fuzzy
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "Кори�ти регуларне изразе"
+msgstr "Тражи ни�ку или регуларни израз"
 
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Пребаци �е на претходни екран"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Тражи ни�ку"
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Пребаци �е на �ледећи екран"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "�а �ледећи екран"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "�а претходни екран"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "И�еци текући ред и �ме�ти га у и�ечке"
+msgstr "И�еца текући ред и �мешта га у и�ечке"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "Убаци и�ечак у текући ред"
+msgstr "Убацује и�ечак у текући ред"
 
-#: src/global.c:527
-#, fuzzy
+#: src/global.c:534
 msgid "Display the position of the cursor"
-msgstr "Прикажи положај курзора"
+msgstr "Приказује положај курзора"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
-msgstr "Покрени правопи�ну проверу, ако је до�тупна"
+msgstr "Покреће проверу правопи�а, ако је до�тупна"
 
-#: src/global.c:531
-#, fuzzy
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "Кори�ти регуларне изразе"
+msgstr "Замењује ни�ку или регуларни израз"
 
-#: src/global.c:532
-#, fuzzy
+#: src/global.c:539
 msgid "Go to line and column number"
-msgstr "Иди на одређени ред"
+msgstr "�а ред и број �тупца"
 
-#: src/global.c:534
-#, fuzzy
-msgid "Mark text at the cursor position"
-msgstr "Означи тек�т на текућем положају курзора"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Означава тек�т почевши од положаја курзора"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr ""
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Понавља по�ледњу претрагу"
 
-#: src/global.c:537
-#, fuzzy
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "И�еци текући ред и �ме�ти га у и�ечке"
+msgstr "И�еца текући ред и �мешта га у и�ечке"
 
-#: src/global.c:538
-#, fuzzy
+#: src/global.c:545
 msgid "Indent the current line"
-msgstr "Додај на текућу датотеку"
+msgstr "Увлачи текући ред"
 
-#: src/global.c:539
-#, fuzzy
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "Додај на текућу датотеку"
+msgstr "Поништава увлачење текућег реда"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr ""
+msgstr "Поништава по�ледњу радњу"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "Враћа по�ледњу поништену радњу"
 
-#: src/global.c:543
-#, fuzzy
+#: src/global.c:550
 msgid "Go forward one character"
-msgstr "Иди један знак напред"
+msgstr "Иде један знак унапред"
 
-#: src/global.c:544
-#, fuzzy
+#: src/global.c:551
 msgid "Go back one character"
-msgstr "Иди један знак назад"
+msgstr "Иде један знак уназад"
 
-#: src/global.c:546
-#, fuzzy
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "Иди једну реч унапред"
+msgstr "Иде једну реч унапред"
 
-#: src/global.c:547
-#, fuzzy
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "Иди једну реч уназад"
+msgstr "Иде једну реч уназад"
 
-#: src/global.c:549
-#, fuzzy
+#: src/global.c:556
 msgid "Go to previous line"
-msgstr "Пребаци �е на претходни екран"
+msgstr "�а претходни ред"
 
-#: src/global.c:550
-#, fuzzy
+#: src/global.c:557
 msgid "Go to next line"
-msgstr "Иди један ред и�под"
+msgstr "�а �ледећи ред"
 
-#: src/global.c:551
-#, fuzzy
+#: src/global.c:558
 msgid "Go to beginning of current line"
-msgstr "Иди на почетак текућег реда"
+msgstr "�а почетак текућег реда"
 
-#: src/global.c:552
-#, fuzzy
+#: src/global.c:559
 msgid "Go to end of current line"
-msgstr "Иди на крај текућег реда"
+msgstr "�а крај текућег реда"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr ""
+msgstr "�а почетак па�у�а; затим претходног па�у�а"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr ""
+msgstr "Иде одмах по�ле краја па�у�а; затим �ледећег па�у�а"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "Иди у први ред датотеке"
+msgstr "Иде у први ред датотеке"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "Иди у по�ледњи ред датотеке"
+msgstr "Иде у по�ледњи ред датотеке"
 
-#: src/global.c:564
-#, fuzzy
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "�ема одговарајуће заграде"
+msgstr "�а одговарајућу заграду"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr ""
+msgstr "Помера �е један ред горе без померања кур�ора"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr ""
+msgstr "Помера �е један ред доле без померања кур�ора"
 
-#: src/global.c:572
-#, fuzzy
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
-msgstr "Пребаци �е на претходни екран"
+msgstr "Пребацује �е на међумеморију претходне датотеке"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
-msgstr ""
+msgstr "Пребацује �е на међумеморију �ледеће датотеке"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr ""
+msgstr "Умеће �ледећу до�ловно�т прити�ка та�тера"
 
-#: src/global.c:579
-#, fuzzy
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "Уметни прелом реда на текућем положају"
+msgstr "Умеће табулатор на положај кур�ора"
 
 #: src/global.c:581
-#, fuzzy
 msgid "Insert a newline at the cursor position"
-msgstr "Уметни прелом реда на текућем положају"
+msgstr "Умеће нови ред на положај кур�ора"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
-msgstr "Обриши знак под курзором"
+msgstr "Брише знак под курзором"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
-msgstr "Обриши знак лево од курзора"
+msgstr "Брише знак лево од курзора"
 
-#: src/global.c:588
-#, fuzzy
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Убаци и�ечак у текући ред"
+msgstr "Од�еца од положаја курзора до краја датотеке"
 
-#: src/global.c:591
-#, fuzzy
+#: src/global.c:590
 msgid "Justify the entire file"
-msgstr "Поравнај текући па�у�"
+msgstr "Поравнава читаву датотеку"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
-msgstr ""
+msgstr "Броји речи, редова, и знакова"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
-msgstr "О�вежи (понов и�цртај) текући екран"
+msgstr "О�вежава (поново и�цртава) текући екран"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "Обу�тавља уређивача (ако је обу�тављање укључено)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr ""
+msgstr "Пребацује о�етљиво�т величине �лова у претрази"
 
-#: src/global.c:605
-#, fuzzy
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "Прикажи положај курзора"
+msgstr "Заокреће правац претраге"
 
-#: src/global.c:609
-#, fuzzy
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
-msgstr "Кори�ти регуларне изразе"
+msgstr "Пребацује коришћење регуларних израза"
 
-#: src/global.c:613
-#, fuzzy
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "Уреди ни�ке претходних претрага и замена"
+msgstr "Опозива ни�ку претходне претраге и замене"
 
-#: src/global.c:615
-#, fuzzy
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "Уреди ни�ке претходних претрага и замена"
+msgstr "Опозива ни�ку �ледеће претраге и замене"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
-msgstr "Иди у прегледач датотека"
+msgstr "Иде у прегледач датотека"
 
-#: src/global.c:621
-#, fuzzy
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "Упишите датотеку у ДОС облику"
+msgstr "Пребацује коришћење ДОС запи�а"
 
-#: src/global.c:622
-#, fuzzy
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "Упишите датотеку у Мек облику"
+msgstr "Пребацује коришћење Мекинтош запи�а"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
-msgstr ""
+msgstr "Пребацује додавање након"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr ""
+msgstr "Пребацује додавање пре"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
-msgstr ""
+msgstr "Пребацује �тварање резерве изворне датотеке"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
-msgstr "Изврши �пољну наредбу"
+msgstr "Извршава �пољну наредбу"
 
-#: src/global.c:633
-#, fuzzy
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "Измена убацивања у нови бафер"
+msgstr "Пребацује коришћење нове међумеморије"
 
-#: src/global.c:636
-#, fuzzy
+#: src/global.c:631
 msgid "Exit from the file browser"
-msgstr "Иди у прегледач датотека"
+msgstr "Излази из прегледача датотека"
 
-#: src/global.c:638
-#, fuzzy
+#: src/global.c:632
 msgid "Go to the first file in the list"
-msgstr "Иди у први ред датотеке"
+msgstr "Иде у прву датотеку на �пи�ку"
 
-#: src/global.c:640
-#, fuzzy
+#: src/global.c:633
 msgid "Go to the last file in the list"
-msgstr "Иди у по�ледњи ред датотеке"
+msgstr "Иде у по�ледњу датотеку на �пи�ку"
 
-#: src/global.c:641
-#, fuzzy
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "�а претходну датотеку на �пи�ку"
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "Иди у по�ледњи ред датотеке"
+msgstr "Иде у �ледећу датотеку на �пи�ку"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Иде у директоријум"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Покреће чи�тача, ако је до�тупан"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Иде на претходну поруку чи�тача"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Иде на �ледећу поруку чи�тача"
 
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Иди у први ред датотеке"
+msgid "Invoke formatter, if available"
+msgstr "Покреће чи�тача, ако је до�тупан"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Иди у директоријум"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Добави помоћ"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Затвори"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Откажи"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+msgid "Write Out"
 msgstr "И�пиши"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
-msgid "Justify"
-msgstr "Пораванај"
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Прочитај датотеку"
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "У директорјум"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
+#: src/global.c:719
 msgid "Cut Text"
 msgstr "И�еци тек�т"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Одравнај"
+#: src/global.c:728
+msgid "Justify"
+msgstr "Пораванај"
+
+#: src/global.c:733
+msgid "To Spell"
+msgstr "�а проверу пи�ања"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
+#: src/global.c:738
+msgid "To Linter"
+msgstr "�а чишћење"
+
+#: src/global.c:740
 #, fuzzy
-msgid "UnCut Text"
-msgstr "Убаци тек�т"
+msgid "Formatter"
+msgstr "ДОС запи�"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Вел. �лова"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Рег. израз"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Уназад"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "�е мењај"
+
+#: src/global.c:770
 msgid "Cur Pos"
-msgstr "Пол. курз."
+msgstr "Положај курзора"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "У проверу правопи�а"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Претходна �трана"
 
-#: src/global.c:771
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Следећа �трана"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Први ред"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "По�ледњи ред"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "До заграде"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Означи тек�т"
 
-#: src/global.c:777
-#, fuzzy
+#: src/global.c:800
 msgid "Copy Text"
-msgstr "И�еци тек�т"
+msgstr "Умножи тек�т"
 
-#: src/global.c:780
-#, fuzzy
+#: src/global.c:803
 msgid "Indent Text"
-msgstr "И�еци тек�т"
+msgstr "Увуци тек�т"
 
-#: src/global.c:783
-#, fuzzy
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "Убаци тек�т"
+msgstr "Поништи увлачење"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
-msgstr ""
+msgstr "Опозови"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
-msgstr ""
-
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "�апред"
+msgstr "Поврати"
 
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "�азад"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Следећа реч"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "�апред"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Претходна реч"
 
-#: src/global.c:824
-#, fuzzy
-msgid "Prev Line"
-msgstr "Претходна �трана"
-
-#: src/global.c:827
-#, fuzzy
-msgid "Next Line"
-msgstr "Следећа датотека"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Следећа реч"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Почетак"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Крај"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "�ађи другу заграду"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Почeтaк па�у�а"
 
-#: src/global.c:848
-msgid "Scroll Up"
-msgstr ""
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Крај па�у�а"
 
 #: src/global.c:851
+msgid "Scroll Up"
+msgstr "Помакни горе"
+
+#: src/global.c:853
 msgid "Scroll Down"
-msgstr ""
+msgstr "Помакни доле"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+msgid "Prev File"
 msgstr "Претходна датотека"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Следећа датотека"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr ""
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Вербатим"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Табулатор"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
-msgstr "Уно�"
+msgstr "Уне�и"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Обриши"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
-msgstr "Бри�ање"
+msgstr "Врати про�тор"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
-msgstr ""
+msgstr "И�еци до краја"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
-msgstr ""
+msgstr "Изброј речи"
+
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Обу�тави"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "Прет. и�торијат"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "След. и�торијат"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "�а тек�т"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "ДОС запи�"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Мекинтош запи�"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Додај позади"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Додај напред"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "�аправи резерву"
 
-#: src/global.c:1367
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Изврши наредбу"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "У датотеке"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Прва датотека"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "П�ледња датотека"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Пртх пор чи�тч"
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "След пор чи�тч"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Режим помоћи"
 
-#: src/global.c:1369
-#, fuzzy
+#: src/global.c:1229
 msgid "Constant cursor position display"
-msgstr "Кон�тантан положај курзора"
+msgstr "Сталан приказ положаја курзора"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
-msgstr ""
+msgstr "Кори�ти још један ред за уређивање"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Глатко клизање"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Слабо преламање превише дугих редова"
+
+#: src/global.c:1237
 msgid "Whitespace display"
-msgstr ""
+msgstr "Приказ празнина"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "И�тицање �интак�е у боји"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
-msgstr ""
+msgstr "Паметни та�тер „Почетак“"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Самоувлачење"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
-msgstr "И�еци до краја"
+msgstr "И�ецање до краја"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr ""
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Јако преламање превише дугих редова"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
-msgstr ""
+msgstr "Претварање укуцаних табулатора у размаке"
 
-#: src/global.c:1389
-#, fuzzy
+#: src/global.c:1251
 msgid "Backup files"
-msgstr "Сачини резерву датотеке"
+msgstr "Резервне датотеке"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
-msgstr "Бафери више датотека"
+msgstr "Међумеморије више датотека"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Подршка за миша"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Без претварања из Мекинтош/ДОС запи�а"
 
-#: src/global.c:1397
-#, fuzzy
+#: src/global.c:1259
 msgid "Suspension"
-msgstr "Су�пендуј"
-
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr ""
+msgstr "Обу�тави"
 
 # bug: there's "enter" and "Enter"
-#: src/help.c:236
-#, fuzzy
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1043,18 +1097,15 @@ msgid ""
 msgstr ""
 "Помоћ за наредбу претраге\n"
 "\n"
-" Уне�ите речи или знаке које желите да нађете, и прити�ните Ентер. Уколико "
-"�е тражени тек�т пронађе, на екрану ће �е приказати положај најближег "
-"резултата претраге.\n"
+" Уне�ите речи или знаке које желите да нађете, и прити�ните Уне�и. Уколико "
+"по�тоји тражени тек�т, на екрану ће �е приказати положај најближег резултата "
+"претраге.\n"
 "\n"
 " Претходна ни�ка претраге ће �е приказати у угла�тим заградама након "
-"„Тражи:“. Прити�ком на Ентер уме�то уно�а новог тек�та ће изве�ти претходну "
-"претрагу.\n"
-"\n"
-" �аредни та�тери обављају неки по�ао у режиму претраге:\n"
-"\n"
+"„Тражи:“. Прити�ком на Уне�и без уно�а неког тек�та ће обавити претходну "
+"претрагу."
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1062,8 +1113,13 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
+"�ко �те изабрали тек�т �а означавачем а затим претрагу да замените, �амо "
+"поклапања у изабраном тек�ту ће бити замењена.\n"
+"\n"
+" Следећи та�тери �у до�тупни у режиму претраге:\n"
+"\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1076,15 +1132,14 @@ msgid ""
 msgstr ""
 "Помоћ за одлазак у ред\n"
 "\n"
-" Уне�ите број реда у који желите да одете и прити�ните Ентер. Уколико има "
+" Уне�ите број реда у који желите да идете и прити�ните Уне�и. Уколико има "
 "мање редова тек�та од броја који �те унели, по�тавићу ва� на по�ледњи ред "
 "датотеке.\n"
 "\n"
-" �аредни та�тери обављају неки по�ао у режиму одла�ка у ред:\n"
+" Следећи та�тери �у до�тупни у режиму одла�ка у ред:\n"
 "\n"
 
-#: src/help.c:260
-#, fuzzy
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1098,21 +1153,16 @@ msgid ""
 msgstr ""
 "Помоћ за уметање датотеке\n"
 "\n"
-" Уне�ите име датотеке коју желите да уметнете у текући бафер на текућем "
-"положају курзора.\n"
-"\n"
-" Уколико �те изградили нана �а подршком за вишедатотечне бафере, и укључили "
-"више бафера �а опцијама „-F“ или „--multibuffer“, Мета-F изменом, или nanorc "
-"датотеком, уметање датотеке ће је учитати у одвојеном баферу (кори�тите Мета-"
-"< и > за пребацивање између бафера).\n"
-"\n"
-" Уколико вам треба још један празан бафер, не уно�ите име датотеке, или "
-"укуцајте име непо�тојеће датотеке и прити�ните Ентер.\n"
-"\n"
-" �аредни та�тери обављају неки по�ао у режиму уметања датотеке:\n"
+" Уне�ите назив датотеке коју желите да уметнете у текућу међумеморију на "
+"текућем положају курзора.\n"
 "\n"
+" Уколико �те наноа изградили �а подршком међумеморије за више датотека, и "
+"укључили међумеморије више датотека �а опцијама „-F“ или „--multibuffer“, "
+"Мета-F изменом, или нанорц датотеком, уметање датотеке ће је учитати у "
+"одвојеној међумеморији (кори�тите Мета-< и > за пребацивање између "
+"међумеморија)."
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1120,9 +1170,13 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
+"Уколико вам треба још једна празна међумеморија, немојте унети назив "
+"датотеке, или укуцајте назив непо�тојеће датотеке и прити�ните Уне�и.\n"
+"\n"
+" Следећи та�тери �у до�тупни у режиму уметања датотеке:\n"
+"\n"
 
-#: src/help.c:275
-#, fuzzy
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1139,18 +1193,18 @@ msgid ""
 msgstr ""
 "Помоћ за упи� датотеке\n"
 "\n"
-" Уне�ите име датотеке у коју желите да упишете текући бафер и прити�ните "
-"Ентер да �нимите.\n"
+" Уне�ите назив датотеке у којој желите да �ачувате текућу датотеку и "
+"прити�ните Уне�и да �ачувате датотеку.\n"
 "\n"
-" Уколико �те изабрали тек�т помоћу Ctrl-^, бићете упитани да ли желите да "
-"�ачувате изабрани део у одвојену датотеку. Да умањите шан�е пре�нимавања "
-"по�тојеће датотеке једним њеним делом, име текуће датотеке �е не подразумева "
-"у овом режиму.\n"
+" Уколико �те изабрали тек�т помоћу означавача, бићете упитани да ли желите "
+"да �ачувате �амо изабрани део у за�ебну датотеку. Да умањите шан�е "
+"пре�нимавања по�тојеће датотеке �амо једним њеним делом, назив текуће "
+"датотеке �е не подразумева у овом режиму.\n"
 "\n"
-" �аредни та�тери обављају неки по�ао у режиму упи�а датотеке:\n"
+" Следећи та�тери �у до�тупни у режиму упи�а датотеке:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1166,17 +1220,16 @@ msgstr ""
 "Помоћ за прегледач датотека\n"
 "\n"
 " Прегледач датотека �е кори�ти за визуелно разгледање директоријума за избор "
-"датотеке ради читања или упи�а. Можете кори�тити �трелице или PageUp/Down "
-"та�тере за разгледање датотека, а S или Ентер да изаберете означену датотеку "
-"или да уђете у означени директоријум. Да одете један ниво изнад, изаберите "
-"директоријум �а називом „..“ у врху �пи�ка датотека.\n"
+"датотеке ради читања или упи�а. Можете кори�тити �трелице или та�тере "
+"„Страница горе/доле“ за разгледање датотека, а S или Уне�и да изаберете "
+"означену датотеку или да уђете у означени директоријум. Да одете један ниво "
+"изнад, изаберите директоријум �а називом „..“ на врху �пи�ка датотека.\n"
 "\n"
-" �аредни та�тери обављају неки по�ао у режиму прегледача датотека:\n"
+" Следећи та�тери �у до�тупни у режиму прегледача датотека:\n"
 "\n"
 
 # bug: there's "enter" and "Enter"
-#: src/help.c:302
-#, fuzzy
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1189,27 +1242,26 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"Помоћ за наредбу претраге\n"
+"Помоћ за наредбу претраге прегледача\n"
 "\n"
-" Уне�ите речи или знаке које желите да нађете, и прити�ните Ентер. Уколико "
-"�е тражени тек�т пронађе, на екрану ће �е приказати положај најближег "
-"резултата претраге.\n"
+" Уне�ите речи или знаке које желите да нађете, и прити�ните Уне�и. Уколико "
+"по�тоји тражени тек�т, на екрану ће �е приказати положај најближег резултата "
+"претраге.\n"
 "\n"
 " Претходна ни�ка претраге ће �е приказати у угла�тим заградама након "
-"„Тражи:“. Прити�ком на Ентер уме�то уно�а новог тек�та ће изве�ти претходну "
+"„Тражи:“. Прити�ком на Уне�и без уно�а неког тек�та ће обавити претходну "
 "претрагу.\n"
 "\n"
-" �аредни та�тери обављају неки по�ао у режиму претраге:\n"
-"\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
+" Следећи та�тери �у до�тупни у режиму претраге прегледача:\n"
+"\n"
 
-#: src/help.c:315
-#, fuzzy
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1223,16 +1275,15 @@ msgid ""
 msgstr ""
 "Помоћ за одлазак у директоријум\n"
 "\n"
-" Уне�ите име директоријума у који желите да одете.\n"
+" Уне�ите назив директоријума у који желите да одете.\n"
 "\n"
 " Уколико није и�кључено допуњавање табулатором, можете кори�тити TAB та�тер "
-"да (покушате да) �амодопуните име директоријума.\n"
+"да (покушате да) �амодопуните назив директоријума.\n"
 "\n"
-" �аредни та�тери обављају неки по�ао у режиму одла�ка у директоријум:\n"
+" Следећи та�тери �у до�тупни у режиму одла�ка у директоријум:\n"
 "\n"
 
-#: src/help.c:328
-#, fuzzy
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1252,11 +1303,10 @@ msgstr ""
 "упитани да замените �ваку појаву дате погрешно унете речи у текућој "
 "датотеци.\n"
 "\n"
-" �аредни та�тери обављају неки по�ао у режиму провере правопи�а:\n"
+" Следећи та�тери �у до�тупни у режиму провере правопи�а:\n"
 "\n"
 
-#: src/help.c:343
-#, fuzzy
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1267,16 +1317,17 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-"Помоћ за �пољну наредбу\n"
+"Помоћ за извршавање наредбе\n"
 "\n"
-" Овај мени вам омогућава да уметнете излаз наредбе коју покреће љу�ка у "
-"текући бафер (или у нови бафер у вишебафер�ком режиму).\n"
+" Овај режим вам омогућава да уметнете излаз наредбе коју покреће љу�ка у "
+"текућу међумеморију (или у нову међумеморију у режиму међумеморије више "
+"датотека). �ко вам је потребна још једна празна међумеморија, немојте "
+"уно�ити никакву наредбу.\n"
 "\n"
-" �аредни та�тери обављају неки по�ао у овом режиму:\n"
+" Следећи та�тери �у до�тупни у овом режиму:\n"
 "\n"
 
-#: src/help.c:356
-#, fuzzy
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1287,25 +1338,16 @@ msgid ""
 "showing the file being edited.  The status line is the third line from the "
 "bottom and shows important messages.  "
 msgstr ""
-" Помоћ за нана\n"
+" Главна нанова помоћ\n"
 "\n"
 " Уређивач нано је израђен да опонаша могућно�ти и лакоћу употребе уређивача "
-"Пико �а Универзитета у Вашингтону. По�тоји четири главна одељка уређивача: "
-"горњи ред приказује издање програма, име датотеке која �е управо уређује, и "
-"да ли је датотека измењена или не. Следећи део је главни уређивач који "
-"приказује датотеку која �е уређује. Ред �а �тањем је трећи ред одоздо и "
-"приказује важне поруке. Два доња реда приказују најчешће коришћене пречице у "
-"уређивачу.\n"
-"\n"
-" Запи� пречица је овакав: Пречице уз Control та�тер �у означени помоћу "
-"�имбола капице (^) и уно�е �е уз та�тер Control (Ctrl).  Пречице уз Escape "
-"та�тер �у означене помоћу Мета (М) �имбола и уно�е �е помоћу неког од Esc, "
-"Alt или Meta та�тера у зави�но�ти од подешавања ваше та�татуре. �аредни "
-"та�тери обављају неки по�ао у прозору главног уређивача. Допун�ки та�тери �у "
-"приказани у заградама:\n"
-"\n"
-
-#: src/help.c:366
+"Пико �а Универзитета у Вашингтону. По�тоје четири главна одељка уређивача: "
+"горњи ред приказује издање програма, назив датотеке која �е управо уређује, "
+"и да ли је датотека измењена или не. Следећи део је главни прозор уређивача "
+"који приказује датотеку која �е уређује. Ред �а �тањем је трећи ред одоздо и "
+"приказује важне поруке."
+
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1315,8 +1357,15 @@ msgid ""
 "notated with the Meta (M-) symbol and can be entered using either the Esc, "
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
+" Два доња реда приказују најчешће коришћене пречице у уређивачу.\n"
+"\n"
+" Запи� пречица је овакав: Пречице та�тера Контрол �у означене помоћу �имбола "
+"капице (^) и уно�е �е уз та�тер Контрол (Ctrl) или дво�труким прити�ком на "
+"та�тер Е�кејп (Esc).  Пречице та�тера Е�кејп �у означене Мета (М) �имболом и "
+"уно�е �е помоћу та�тера „Esc“, „Alt“ или „Meta“ у зави�но�ти од подешавања "
+"ваше та�татуре."
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1324,323 +1373,311 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
+"Такође, дво�труким прити�ком на та�тер Е�кејп и укуцавањем троцифреног "
+"децималног броја од 000 до 255 унећете знак �а одговарајућом вредношћу. "
+"Следећи прити�ци та�тера �у до�тупни у главном прозору уређивача. Замен�ки "
+"та�тери �у приказани у загради:\n"
+"\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
-msgstr "укључи/и�кључи"
+msgstr "— укључује/и�кључује"
 
-#: src/nano.c:587
-#, fuzzy
+#: src/nano.c:601
 msgid "Key invalid in view mode"
-msgstr "Та�тер недозвољен у прегледачком режиму"
+msgstr "�еи�праван та�тер у режиму прегледа"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
 "Buffer written to %s\n"
 msgstr ""
 "\n"
-"Бафер упи�ан у %s\n"
+"Међумеморија је упи�ана у %s\n"
 
-#: src/nano.c:697
-#, fuzzy, c-format
+#: src/nano.c:715
+#, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 "\n"
-"Бафер упи�ан у %s\n"
+"Међумеморија није упи�ана у %s:%s\n"
 
-#: src/nano.c:700
-#, fuzzy, c-format
+#: src/nano.c:718
+#, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 "\n"
-"Бафер упи�ан у %s\n"
+"Међумеморија није упи�ана: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Величина прозора је премала за нана...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
+"Употреба: nano [МОГУЋ�ОСТИ] [[+РЕД,СТУБ�Ц] Д�ТОТЕК�]...\n"
+"\n"
 
-#: src/nano.c:819
-#, fuzzy, c-format
+#: src/nano.c:839
+#, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr "Опција\t\tДуга опција\t\tЗначење\n"
+msgstr "Опција\t\tГнуова дуга опција\tЗначење\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Опција\t\tЗначење\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Прикажи ову поруку"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
-msgstr ""
+msgstr "+РЕД,СТУБ�Ц"
 
-#: src/nano.c:826
-#, fuzzy
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
-msgstr "Почни у реду број РЕД"
+msgstr "Почиње у реду РЕД, �тупцу СТУБ�Ц"
 
-#: src/nano.c:828
-#, fuzzy
+#: src/nano.c:849
 msgid "Enable smart home key"
-msgstr "Укључи миша"
+msgstr "Укључује паметни та�тер „Почетак“"
 
-#: src/nano.c:829
-#, fuzzy
+#: src/nano.c:850
 msgid "Save backups of existing files"
-msgstr "�аправи резерву по�тојећих датотека при �нимању"
+msgstr "Чува резерве по�тојећих датотека"
 
-#: src/nano.c:830
-#, fuzzy
+#: src/nano.c:851
 msgid "-C <dir>"
-msgstr "-o [дир]"
+msgstr "-C [дир]"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
-msgstr ""
+msgstr "--backupdir=[дир]"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
-msgstr ""
+msgstr "Директоријум за чување једин�твених датотека резерве"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
-msgstr ""
+msgstr "Кори�ти подебљање уме�то обрнутог видео тек�та"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
-msgstr ""
+msgstr "Претвара укуцане табулаторе у размаке"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
-msgstr "Омогући бафере �а више датотека"
+msgstr "Укључује међумеморије више датотека"
+
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Кори�ти (вим-�тила) датотеке закључавања"
 
-#: src/nano.c:845
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "Дневник и читање претходних претрага/замена"
+msgstr "Бележи и чита и�торијат претраге/замене ни�ке"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
-msgstr "�е гледај у датотеке nanorc"
+msgstr "�е тражи у нанорц датотекама"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
-msgstr ""
+msgstr "Поправља проблеме та�тера нумеричке та�татуре"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
-msgstr ""
+msgstr "�е додаје нове редове на крајеве датотека"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
-msgstr "�е претварај датотеке из ДОС/Мекинтош облика"
+msgstr "�е претвара датотеке из ДОС/Мекинтош запи�а"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
-msgstr ""
+msgstr "Кори�ти још један ред за уређивање"
 
-#: src/nano.c:860
-#, fuzzy
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Бележи и чита ме�то положаја курзора"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q [ни�ка]"
 
-#: src/nano.c:860
-#, fuzzy
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=[ни�ка]"
 
-#: src/nano.c:861
-#, fuzzy
+#: src/nano.c:890
 msgid "Quoting string"
-msgstr "�и�ка за цитирање, подразумевано „> “"
+msgstr "�и�ка за цитирање"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
-msgstr ""
+msgstr "Ограничени режим"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "Премиче по ред уме�то пола екрана"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:897
 msgid "-T <#cols>"
-msgstr "-r [#колона]"
+msgstr "-T [#�тупци]"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=[број]"
+msgstr "--tabsize=[#�тупци]"
 
-#: src/nano.c:869
-#, fuzzy
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
-msgstr "По�тавља ширину табулатора на број"
+msgstr "По�тавља ширину табулатора на „#�тупци“ �тубаца"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
-msgstr ""
+msgstr "Обавља брзо чишћење траке �тања"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
-msgstr "И�пиши податке о издању и изађи"
+msgstr "И�пи�ује податке о издању и излази"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
-msgstr ""
+msgstr "Тачније открива границе речи"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y [ни�ка]"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "--syntax=<str>"
-msgstr "--syntax [ни�ка]"
+msgstr "--syntax=[ни�ка]"
 
-#: src/nano.c:881
-#, fuzzy
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
-msgstr "Која дефиниција �интак�е �е кори�ти"
+msgstr "Одредница �интак�е за обојавање"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
-msgstr "Стално приказуј положај курзора"
+msgstr "�епрекидно приказује положај курзора"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
-msgstr ""
+msgstr "Поправља проблеме та�тера Поврати про�тор/Обриши"
+
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Приказује овај тек�т помоћи"
 
-#: src/nano.c:888
+#: src/nano.c:918
 msgid "Automatically indent new lines"
-msgstr "Само увуци нове редове"
+msgstr "Само�тално увлачи нове редове"
 
-#: src/nano.c:889
-#, fuzzy
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "�ека ^K и�еца од курзора до краја реда"
+msgstr "И�еца од курзора до краја реда"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
-msgstr "�е прати �имболичке везе, пре�ними их"
+msgstr "�е прати �имболичке везе, пре�нимава их"
 
-#: src/nano.c:894
-#, fuzzy
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
-msgstr "Укључи миша"
+msgstr "Укључује коришћење миша"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "�е чита датотеку (�амо је пише)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o [дир]"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=[дир]"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "По�тавља радни директоријум"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
-msgstr "Та�тери за очување XON-а (^Q) и XOFF-а (^S)"
+msgstr "Очувава та�тере XON (^Q) и XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "�ечујно занемарује проблеме покретања као што �у грешке рц датотеке"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:938
 msgid "-r <#cols>"
-msgstr "-r [#колона]"
+msgstr "-r [#�тубац]"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:938
 msgid "--fill=<#cols>"
-msgstr "--fill=[#колона]"
+msgstr "--fill=[#�тубац]"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr ""
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "По�тавља тачку јаког прелома на �тупцу бр. �тубац"
 
-#: src/nano.c:909
-#, fuzzy
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s [програм]"
 
-#: src/nano.c:909
-#, fuzzy
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=[програм]"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
-msgstr "Омогући неку другу проверу правопи�а"
+msgstr "Укључује замен�ку проверу правопи�а"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "Сам упиши при излазу, не питај"
-
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
+msgstr "Сам чува при излазу, не пита"
 
-#: src/nano.c:918
-#, fuzzy
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Режим прегледа (�амо за читање)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "�е преламај дуге редове"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "�е прелама јако дуге редове"
 
-#: src/nano.c:922
-#, fuzzy
+#: src/nano.c:951
 msgid "Don't show the two help lines"
-msgstr "�е приказуј прозор за помоћ"
+msgstr "�е приказује два реда помоћи"
 
-#: src/nano.c:923
-#, fuzzy
+#: src/nano.c:952
 msgid "Enable suspension"
-msgstr "Укључи �у�пензију"
+msgstr "Укључује обу�таву"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr ""
-
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(занемарен, ради �агла�но�ти �а Пиком)"
+msgstr "Укључује меко преламање редова"
 
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr "Г�У нано издање %s (изграђено %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
+msgstr " Гнуов нано издање %s (изграђено %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
-msgstr "Е-пошта: nano@nano-editor.org\tВеб: http://www.nano-editor.org/"
+msgstr " Ел. пошта: nano@nano-editor.org\tВеб: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1649,159 +1686,178 @@ msgstr ""
 "\n"
 " Уграђене опције:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "�ажало�т, подршка за ову функцију је и�кључена"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "�ема назива датотеке"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr ""
-"Сачувати измењени бафер (ОДГОВ�Р�ЊЕМ С� „�е“ ЋЕТЕ Б�ЦИТИ СВЕ ИЗМЕ�Е) ? "
+msgstr "Да �ачувам измењену међумеморију (ОДГОВОР „�е“ ЋЕ ОДБ�ЦИТИ ИЗМЕ�Е) ? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "�е могу поново да отворим �тандардни улаз �а та�татуре, извините\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Читам �а �тандардног улаза, ^C да прекинете\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Примих SIGHUP или SIGTERM\n"
 
-#: src/nano.c:1204
-#, fuzzy, c-format
+#: src/nano.c:1301
+#, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Кори�тите „fg“ да �е вратите у нана"
+msgstr "Кори�тите „fg“ да �е вратите у нано.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "укључено"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "и�кључено"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
-msgstr ""
+msgstr "�епозната наредба"
 
-#: src/nano.c:1674
-#, fuzzy
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
-msgstr "XON занемарен, трт-мрт."
+msgstr "XON је занемарен, јао мени"
 
-#: src/nano.c:1679
-#, fuzzy
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
-msgstr "XOFF занемарен, трт-мрт."
+msgstr "XOFF је занемарен, јао мени"
 
-#: src/nano.c:2209 src/rcfile.c:1100
-#, fuzzy, c-format
+#: src/nano.c:2310 src/rcfile.c:1325
+#, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "тражена величина табулатора %d је неи�правна"
+msgstr "Тражена величина табулатора %s је неи�правна"
 
-#: src/nano.c:2268 src/rcfile.c:1025
-#, fuzzy, c-format
+#: src/nano.c:2374 src/rcfile.c:1250
+#, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "тражена величина попуне %d је неи�правна"
+msgstr "Тражена величина попуне %s је неи�правна"
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Укуцајте „%s -h“ за �пи�ак до�тупних опција.\n"
 
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
-msgstr "YyДдDd"
+msgstr "ДдDdYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "�нNn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
-msgstr "Aa�а"
+msgstr "�а�а"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Да"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Све"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "�е"
 
-#: src/rcfile.c:130
-#, fuzzy, c-format
+#: src/rcfile.c:137
+#, c-format
 msgid "Error in %s on line %lu: "
-msgstr "Грешка у %s у %d. реду: "
+msgstr "Грешка у %s у %lu. реду: "
 
-#: src/rcfile.c:185
-#, fuzzy, c-format
+#: src/rcfile.c:196
+#, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "аргумент %s �адржи недовршен \""
+msgstr "�ргумент „%s“ �адржи недовршени знак \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
-#, fuzzy
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
-msgstr "ни�ке регуларних израза морају почети и завршити �е знаком \"\n"
+msgstr "�и�ке регуларних израза морају почети и завршити �е знаком \""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "Лош регуларни израз „%s“: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
-msgstr "�едо�таје име �интак�е"
+msgstr "�едо�таје назив �интак�е"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
-msgstr ""
+msgstr "Синтак�а „none“ је резерви�ана"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
-msgstr ""
+msgstr "Синтак�а „default“ не �ме да �адржи проширења"
 
-#: src/rcfile.c:386 src/rcfile.c:483
-#, fuzzy
+#: src/rcfile.c:433
 msgid "Missing key name"
-msgstr "�едо�таје име �интак�е"
+msgstr "�едо�таје назив та�тера"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "�азив та�тера је прекратак"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr ""
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "�азив та�тера мора почети �а ^, M, или F"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr ""
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "Морате наве�ти функцију за коју �везати та�тер"
 
-#: src/rcfile.c:426
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "�е могох да отворим %s ради упи�а: %s"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr "Морате наве�ти изборник (или „all“) у коме �везати/развезати та�тер"
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "�е могох да покренем „%s“"
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "�е могу да мапирам назив „%s“ ка функцији"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:496
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "�е могу да мапирам назив „%s“ ка изборнику"
 
-#: src/rcfile.c:625
-#, fuzzy, c-format
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Функција „%s“ не по�тоји у изборнику „%s“"
+
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Извините, ни�ка та�тера „%s“ не може бити поново �везана"
+
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Грешка ширења „%s“: %s"
+
+#: src/rcfile.c:672
+#, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
 "Valid colors are \"green\", \"red\", \"blue\",\n"
@@ -1809,589 +1865,528 @@ msgid ""
 "\"black\", with the optional prefix \"bright\"\n"
 "for foreground colors."
 msgstr ""
-"�е разумех боју %s.\n"
+"�и�ам разумео боју „%s“.\n"
 "Дозвољене боје �у „green“ (зелена), „red“ (црвена), „blue“ (плава), \n"
-"„white“ (бела), „yellow“ (жута), „cyan“ (цијан), „magenta“ (магента) и\n"
-"„black“ (црна), �а необавезним предметком „bright“ (�ветло).\n"
+"„white“ (бела), „yellow“ (жута), „cyan“ (плавича�та), „magenta“ (љубича�та) "
+"и\n"
+"„black“ (црна), �а необавезним предметком „bright“ (�ветло)\n"
+"за боје позадине."
 
-#: src/rcfile.c:647
-#, fuzzy
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
-msgstr "�е могох да додам упуте за боју без �интак�ног реда"
+msgstr "�е могу да додам наредбу боје без наредбе �интак�е"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
-msgstr "�едо�таје име боје"
+msgstr "�едо�таје назив боје"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr ""
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
-msgstr ""
+msgstr "�едо�таје ни�ка регуларног израза"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "„start=“ захтева и одговарајући „end=“"
 
-#: src/rcfile.c:804
-#, fuzzy
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Боја позадине „%s“ не може бити �ветла"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
-msgstr "�е могох да додам упуте за боју без �интак�ног реда"
+msgstr "�е могу да додам регуларни израз заглавља без наредбе �интак�е"
+
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "�е могу да додам регуларни израз чаробне ни�ке без наредбе �интак�е"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "�едо�таје назив чаробне ни�ке"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "�е могу да додам чи�тача без наредбе �интак�е"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "�едо�таје наредба чи�тача"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "�е могу да додам чи�тача без наредбе �интак�е"
+
+#: src/rcfile.c:1015
+#, fuzzy
+msgid "Missing formatter command"
+msgstr "�едо�таје наредба чи�тача"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr ""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "Кобна грешка: нема мапираних та�тера за функцију „%s“.  Излазим.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
+"�ко је потребно, кори�тите нано �а опцијом „-I“ да дотерате ваша подешавања "
+"нанорц-а\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "�е могу да нађем �интак�у „%s“ за ширење"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr ""
+msgstr "�аредба „%s“ није дозвољена у укљученој датотеци"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr ""
+msgstr "Синтак�а „%s“ нема наредбе боје"
 
-#: src/rcfile.c:966
-#, fuzzy, c-format
+#: src/rcfile.c:1171
+#, c-format
 msgid "Command \"%s\" not understood"
-msgstr "не разумех наредбу %s"
+msgstr "�и�ам разумео наредбу „%s“"
 
-#: src/rcfile.c:972
-#, fuzzy
-msgid "Missing flag"
-msgstr "�едо�таје име боје"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "�едо�таје опција"
 
-#: src/rcfile.c:994
-#, fuzzy, c-format
+#: src/rcfile.c:1208
+#, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "опција „%s“ захтева аргумент"
+msgstr "Опција „%s“ захтева аргумент"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
-msgstr ""
+msgstr "Опција није и�правна вишебитна ни�ка"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
-msgstr ""
+msgstr "Потребни �у не-празни знаци"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
-msgstr ""
+msgstr "Потребна �у два знака једног-�тупца"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr ""
+msgid "Cannot unset option \"%s\""
+msgstr "�е могу да ра�поде�им опцију „%s“"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr ""
+msgid "Unknown option \"%s\""
+msgstr "�епозната опција „%s“"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
-msgstr "�е могох да нађем мој лични директоријум! Бре!"
+msgstr "Ја не могу да нађем мој лични директоријум! Бре, брате!"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Прити�ните Уне�и да на�тавите покретање наноа\n"
 
 #: src/search.c:96
-#, fuzzy, c-format
+#, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "�е нађох „%s“"
+msgstr "�и�ам нашао „%.*s%s“"
 
-#: src/search.c:205
-#, fuzzy
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [разл. величину �лова]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [рег. израз]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [уназад]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
-msgstr " (за замену)"
+msgstr " (за замену) у избору"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (за замену)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Да заменим ову појаву?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Замени �а"
 
-#: src/search.c:1004
-#, fuzzy, c-format
+#: src/search.c:986
+#, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
-msgstr[0] "Замених %d појаву"
-msgstr[1] "Замених %d појаве"
-msgstr[2] "Замених %d појава"
+msgstr[0] "Замених %lu појаву"
+msgstr[1] "Замених %lu појаве"
+msgstr[2] "Замених %lu појава"
 
-#: src/search.c:1034
-#, fuzzy
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
-msgstr "Уне�ите број реда"
+msgstr "Уне�ите број реда, број �тупца"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
-msgstr ""
+msgstr "�еи�праван број реда или �тупца"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "�ије заграда"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "�ема одговарајуће заграде"
 
 # 48x48/emblems/emblem-marketing.icon.in.h:1
 #: src/text.c:54
 msgid "Mark Set"
-msgstr "Ознака по�тављена"
+msgstr "По�тављена ознака"
 
 #: src/text.c:58
-#, fuzzy
 msgid "Mark Unset"
-msgstr "Ознака ОДпо�тављена"
+msgstr "Поништена ознака"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "�ема ничега у међумеморији поништавања!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
+"Унутрашња грешка: не могу да поклопим %d. ред.  Молим �ачувајте ваш рад."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
-msgstr ""
+msgstr "додавање тек�та"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
-msgstr "Следећа датотека"
+msgstr "бри�ање тек�та"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr ""
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
-msgstr ""
+msgstr "�пој реда"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
-msgstr ""
+msgstr "и�ецање тек�та"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr ""
+msgstr "поништавање и�ецања тек�та"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr ""
+msgstr "крај реда"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
-msgstr "Следећа датотека"
+msgstr "уметање тек�та"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
-msgstr " (за замену)"
+msgstr "замена тек�та"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr ""
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Унутрашња грешка: непозната вр�та.  Молим �ачувајте ваш рад."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Радња поништавања обављеног (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "�ичега за поновно обављање!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
+"Унутрашња грешка: не могу да по�тавим повраћај.  Молим �ачувајте ваш рад."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Радња поновног обављања (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "�е могу да направим цев"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "�е могу да направим �појку"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
-msgstr "�е могу да покренем"
+msgstr "�е могу да ра�цепим"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
+"Унутрашња грешка: не могу да по�тавим поништавање од�ецања.  Молим �ачувајте "
+"ваш рад."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Лоша ни�ка за цитирање %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Сада могу да „одравнам“!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Измените замену"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "�е могох да направим цевку"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "Образујем �пи�ак погрешно унетих речи, �ачекајте..."
+msgstr "Правим �пи�ак погрешно унетих речи, �ачекајте..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
-msgstr "�е могох да �азнам величину бафера за цевку"
+msgstr "�е могу да добавим величину међумеморије �појке"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Грешка при покретању „spell“-а"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Грешка при покретању „sort -f“-а"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Грешка при покретању „uniq“-а"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
-msgstr "Завршена провера правопи�а"
+msgstr "Завршио �ам проверу правопи�а"
 
-#: src/text.c:2815
-#, fuzzy, c-format
+#: src/text.c:2759 src/text.c:3340
+#, c-format
 msgid "Error invoking \"%s\""
-msgstr "Грешка при покретању „spell“-а"
+msgstr "Грешка при покретању „%s“-а"
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Призивам проверу правопи�а, �ачекајте мало"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
-msgstr "�еу�пешна провера правопи�а: %s"
+msgstr "Провера правопи�а није у�пела: %s"
 
-#: src/text.c:2962
-#, fuzzy, c-format
+#: src/text.c:2904
+#, c-format
 msgid "Spell checking failed: %s: %s"
-msgstr "�еу�пешна провера правопи�а: %s"
+msgstr "Провера правопи�а није у�пела: %s: %s"
+
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Чи�тач није одређен за ову вр�ту датотеке!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Да �ачувам измењену међумеморију пре чишћења?"
 
-#: src/text.c:3030
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Призивам чи�тача, �ачекајте мало"
+
+#: src/text.c:3125
 #, c-format
-msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Добих 0 обрадивих редова од наредбе: %s"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+"Ова порука је за неотворену датотеку „%s“, да је отворим у новој "
+"међумеморији?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "�а по�ледњу поруку"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "�а прву поруку"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
 msgstr ""
 
-#: src/text.c:3031
+#: src/text.c:3280
 #, fuzzy
+msgid "Invoking formatter, please wait"
+msgstr "Призивам чи�тача, �ачекајте мало"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
+#, c-format
+msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgstr "%sРечи: %lu  Редова: %ld  Знакова: %lu"
+
+#: src/text.c:3439
 msgid "In Selection:  "
-msgstr "Додај избор на крај датотеке"
+msgstr "У избору:"
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Улаз до�ловно�ти"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
-msgstr "нану је поне�тало меморије!"
+msgstr "наноу је поне�тало меморије!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
-msgstr ""
+msgstr "Улаз Уникода"
 
-#: src/winio.c:2149 src/winio.c:2153
-#, fuzzy
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
-msgstr " Измењено "
+msgstr "Измењено "
 
-#: src/winio.c:2150
-#, fuzzy
+#: src/winio.c:2143
 msgid "View"
-msgstr " Преглед "
+msgstr "Преглед "
 
-#: src/winio.c:2164
-#, fuzzy
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "ДИР: "
 
-#: src/winio.c:2171
-#, fuzzy
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Датотека:"
 
-#: src/winio.c:3360
-#, fuzzy, c-format
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Упозорење: Мењам датотеку која није закључана, да проверим дозволе "
+"директоријума?"
+
+#: src/winio.c:3377
+#, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
-msgstr "ред %ld/%ld (%d%%), �тубац %lu/%lu (%d%%), знак %lu/%ld (%d%%)"
+msgstr "ред %ld/%ld (%d%%), �тубац %lu/%lu (%d%%), знак %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Уређивач тек�та нано"
 
-#: src/winio.c:3493
-#, fuzzy
+#: src/winio.c:3508
 msgid "version"
 msgstr "издање "
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
-msgstr "Омогућили �у вам:"
+msgstr "Припремили:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
-msgstr "По�ебну захвално�т дугујемо:"
+msgstr "По�ебно �е захваљујемо:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
-msgstr "Задужбина за Слободни Софтвер"
+msgstr "Задужбини �лободног �офтвера"
+
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
 
-#: src/winio.c:3497
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "За ен-кур�и�:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
-msgstr "и �ви о�тали које �мо пропу�тили..."
+msgstr "и �вима о�талима које �мо пропу�тили..."
 
-#: src/winio.c:3499
-#, fuzzy
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
-msgstr "Хвала што кори�тите нана!\n"
-
-#~ msgid "File to insert into new buffer [from ./] "
-#~ msgstr "Датотека коју уметнути у нови бафер [из ./]"
-
-#~ msgid "File to insert [from ./] "
-#~ msgstr "Датотека коју уметнути [из ./]"
-
-#~ msgid "Could not read %s for backup: %s"
-#~ msgstr "�е могох да прочитам %s ради прављења резерве: %s"
-
-#~ msgid "Couldn't write backup: %s"
-#~ msgstr "�е могох да упишем резерву: %s"
-
-#~ msgid "Could not set permissions %o on backup %s: %s"
-#~ msgstr "�е могох да по�тавим овлашћења %o за резерву %s: %s"
-
-#~ msgid "Could not set owner %d/group %d on backup %s: %s"
-#~ msgstr "�е могох да по�тавим вла�ника %d и групу %d за резерву %s: %s"
-
-#~ msgid "Could not set access/modification time on backup %s: %s"
-#~ msgstr "�е могох да по�тавим време при�тупа и измене за резерву %s: %s"
-
-#~ msgid "Could not open file for writing: %s"
-#~ msgstr "�е могох да отворим датотеку ради упи�а: %s"
+msgstr "Хвала вам што кори�тите нано!"
 
-#~ msgid "Could not close %s: %s"
-#~ msgstr "�е могох да затворим %s: %s"
-
-#~ msgid "Could not reopen %s: %s"
-#~ msgstr "�е могох да поново отворим %s: %s"
-
-#~ msgid "Could not open %s for prepend: %s"
-#~ msgstr "�е могох да отворим %s ради додавања на почетак: %s"
-
-#~ msgid "Could not set permissions %o on %s: %s"
-#~ msgstr "�е могох да по�тавим овлашћења %o за %s: %s"
-
-#~ msgid "Can't open \"%s\": %s"
-#~ msgstr "�е могох да отворим „%s“ : %s"
-
-#~ msgid "Goto Cancelled"
-#~ msgstr "Улазак отказан"
-
-#~ msgid "Unable to open ~/.nano_history file, %s"
-#~ msgstr "�е могох да отворим датотеку ~/.nano_history, %s"
-
-#~ msgid "Unable to write ~/.nano_history file, %s"
-#~ msgstr "�е могох да упишем датотеку ~/.nano_history, %s"
-
-#~ msgid "Writing file in DOS format"
-#~ msgstr "Упи�ујем датотеку у ДОС запи�у"
-
-#~ msgid "Writing file in Mac format"
-#~ msgstr "Упи�ујем датотеку у Мекинтош запи�у"
-
-#~ msgid "Backing up file"
-#~ msgstr "Правим резервни примерак"
-
-#~ msgid "Auto wrap"
-#~ msgstr "Самопрелом"
-
-#~ msgid "Invoke the help menu"
-#~ msgstr "Покрени мени за помоћ"
-
-#~ msgid "Unjustify after a justify"
-#~ msgstr "Одравнај по�ле поравнавања"
-
-#~ msgid "Replace text within the editor"
-#~ msgstr "Замени тек�т из уређивача"
-
-#~ msgid "Search for text within the editor"
-#~ msgstr "Тражи тек�т у уређивачу"
-
-#~ msgid "Move up one line"
-#~ msgstr "Иди један ред изнад"
-
-#~ msgid "Insert a tab character"
-#~ msgstr "Уметни табулатор"
-
-#~ msgid "Make the current search or replace case (in)sensitive"
-#~ msgstr "�ека текућа претрага или замена не разликује велика и мала �лова."
-
-#~ msgid "Prepend to the current file"
-#~ msgstr "Додај на почетак текуће датотеке"
-
-#~ msgid "Search backwards"
-#~ msgstr "Тражи уназад"
-
-#~ msgid "Write file out in DOS format"
-#~ msgstr "И�пиши датотеку у ДОС запи�у"
-
-#~ msgid "Write file out in Mac format"
-#~ msgstr "И�пиши датотеку у Мекинтош запи�у"
-
-#~ msgid "Back up original file when saving"
-#~ msgstr "�аправи резервни примерак изворне датотеке при �нимању"
-
-#~ msgid "Find other bracket"
-#~ msgstr "�ађи другу заграду"
-
-#~ msgid "Open previously loaded file"
-#~ msgstr "Отвори претходно коришћену датотеку"
-
-#~ msgid "Open next loaded file"
-#~ msgstr "Отвори �ледеће учитану датотеку"
-
-#~ msgid "Up"
-#~ msgstr "Горе"
-
-#~ msgid "Down"
-#~ msgstr "Доле"
-
-#~ msgid "Direction"
-#~ msgstr "Смер"
-
-#~ msgid "Space"
-#~ msgstr "Про�тор"
-
-#~ msgid ""
-#~ "Usage: nano [+LINE] [GNU long option] [option] [file]\n"
-#~ "\n"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
 #~ msgstr ""
-#~ "Употреба: nano [+РЕД] [Дуге Гнуове опције] [опција] [датотека]\n"
-#~ "\n"
+#~ "Унутрашња грешка: не могу да поклопим %ld. ред.  Молим �ачувајте ваш рад."
 
-#~ msgid ""
-#~ "Usage: nano [+LINE] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Употреба: nano [+РЕД] [опција] [датотека]\n"
-#~ "\n"
-
-#~ msgid "+LINE"
-#~ msgstr "+РЕД"
-
-#~ msgid "Use alternate keypad routines"
-#~ msgstr "Кори�ти неке друге функције за нумеричку та�татуру"
+#~ msgid "line wrap"
+#~ msgstr "прелом реда"
 
-#~ msgid "Do regular expression searches"
-#~ msgstr "Изводи претраге по регуларним изразима"
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Дозвољава уопштено поништавање [ПРОБ�О]"
 
-#~ msgid "-T [num]"
-#~ msgstr "-T [број]"
+#~ msgid "Insert File"
+#~ msgstr "Умеће датотеку"
 
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "По�тави и�пуњавање колона (прелом реда) на #колона"
+#~ msgid "Go to previous screen"
+#~ msgstr "Иде на претходни екран"
 
-#~ msgid "Could not create a temporary filename: %s"
-#~ msgstr "�е могох да направим привремену датотеку: %s"
-
-#~ msgid "Spell checking failed: unable to write temp file!"
-#~ msgstr ""
-#~ "�еу�пешна провера правопи�а: не могох да пишем у привремену датотеку!"
+#~ msgid "Find Other Bracket"
+#~ msgstr "�ађи другу заграду"
 
-#~ msgid "Cannot resize top win"
-#~ msgstr "�е могох да изменим величину горњег прозора"
+#~ msgid "Long line wrapping"
+#~ msgstr "Преламање дугог реда"
 
-#~ msgid "Cannot move top win"
-#~ msgstr "�е могох да преме�тим горњи прозор"
+#~ msgid "Soft line wrapping"
+#~ msgstr "Меко преламање реда"
 
-#~ msgid "Cannot resize edit win"
-#~ msgstr "�е могох да изменим величину прозора за уно�"
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(занемарен, ради �агла�но�ти �а Пиком)"
 
-#~ msgid "Cannot move edit win"
-#~ msgstr "�е могох да преме�тим прозор за уно�"
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "Морате наве�ти изборник за који �везати та�тер (или „all“)"
 
-#~ msgid "Cannot resize bottom win"
-#~ msgstr "�е могох да изменим величину доњег прозора"
+#~ msgid "Missing flag"
+#~ msgstr "�едо�таје обележје"
 
-#~ msgid "Cannot move bottom win"
-#~ msgstr "�е могох да преме�тим доњи прозор"
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Унутрашња грешка: непозната вр�та.  Молим �ачувајте ваш рад!!!"
 
-#~ msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
 #~ msgstr ""
-#~ "Примећена грешка �а NumLock-ом. �умеричка та�татура неће радити када је "
-#~ "он и�кључен"
-
-#~ msgid "Tab size is too small for nano...\n"
-#~ msgstr "Величина табулатора премала за нана...\n"
-
-#~ msgid "Errors found in .nanorc file"
-#~ msgstr "�ађох грешке у датотеци .nanorc"
-
-#~ msgid "Unable to open ~/.nanorc file, %s"
-#~ msgstr "�е могох да отворим датотеку ~/.nanorc, %s"
-
-#~ msgid "\"%s...\" not found"
-#~ msgstr "�е нађох „%s...“"
-
-#~ msgid "Invalid regex \"%s\""
-#~ msgstr "�еи�праван регуларни израз „%s“"
-
-#~ msgid "Search Cancelled"
-#~ msgstr "Претрага отказана"
-
-#~ msgid "Replace Cancelled"
-#~ msgstr "Замена отказана"
-
-#~ msgid "Replace failed: unknown subexpression!"
-#~ msgstr "�е у�пех да заменим: непознат подизраз!"
-
-#~ msgid "Aborted"
-#~ msgstr "Обу�тављен"
-
-#~ msgid "Come on, be reasonable"
-#~ msgstr "'ајде, буди разуман"
-
-#~ msgid "  File: ..."
-#~ msgstr "  Датотека: ..."
-
-#~ msgid "   DIR: ..."
-#~ msgstr "   ДИР: ..."
+#~ "Унутрашња грешка: �ије у�пело по�тављање понављања.  Молим �ачувајте ваш "
+#~ "рад!!!"
 
-#~ msgid "Refusing 0 length regex match"
-#~ msgstr "Одбијам поклапање �а регуларним изразом дужине 0"
+#~ msgid "Could not pipe"
+#~ msgstr "�е могу да направим �појку"
diff --git a/po/sv.gmo b/po/sv.gmo
index ee0057b..24260bd 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index ffe6db7..f0e133d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,985 +1,1076 @@
 # Swedish messages for nano.
-# Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
-# Daniel Nylander <po@danielnylander.se>, 2006.
+# Copyright © 2014 Free Software Foundation, Inc.
+# This file is distributed under the same license as the nano package.
 # Christian Rose <menthos@menthos.com>, 2001, 2002, 2003, 2004.
+# Daniel Nylander <po@danielnylander.se>, 2006.
+# Josef Andersson <josef.andersson@fripost.org>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.9.99pre0\n"
+"Project-Id-Version: nano 2.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2006-08-24 20:53+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2014-12-25 00:11+0100\n"
+"Last-Translator: Josef Andersson <josef.andersson@fripost.org>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
-msgstr "Gå till katalog"
+msgstr "GÃ¥ till katalog"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
-msgstr "Kan inte gå utanför %s i begränsat läge"
+msgstr "Kan inte gå utanför %s i begränsat läge"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
-msgstr "Fel vid inläsning av %s: %s"
+msgstr "Fel vid inläsning av %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "Kan inte gå upp en katalog"
+msgstr "Kan inte gå upp en katalog"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(kat)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
-msgstr "(föräldkat)"
+msgstr "(föräldkat)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
-msgstr "Sök"
+msgstr "Sök"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Skiftlägeskänslig]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Reguljärt uttryck]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Baklänges]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
-msgstr "Sökningen började om från början"
+msgstr "Sökningen började om från början"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
-msgstr "Detta är enda förekomsten"
+msgstr "Detta är enda förekomsten"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
-msgstr "Inget aktuellt sökmönster"
+msgstr "Inget aktuellt sökmönster"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"Kunde inte bestämma min identitet för låsfilen (getpwuid() misslyckades)"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Kunde inte bestämma värdnamn för låsfilen: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Fel vid skrivning av låsfilen %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Fel vid borttagning av låsfilen %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Fel vid inläsning av låsfilen %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "Fel vid läsning av låsfilen %s: För lite data lästes"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Fel vid skrivning av låsfil: Katalogen �%s� finns inte"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "Kan inte infoga fil från utanför %s"
+msgstr "Kan inte infoga fil från utanför %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
-msgstr "Inga fler öppna filbuffertar"
+msgstr "Inga fler öppna filbuffertar"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
-msgstr "Växlade till %s"
+msgstr "Växlade till %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Ny buffert"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
-msgstr[0] "Läste %lu rad (konverterad från DOS- och Mac-format)"
-msgstr[1] "Läste %lu rader (konverterade från DOS- och Mac-format)"
+msgstr[0] "Läste %lu rad (konverterad från DOS- och Mac-format)"
+msgstr[1] "Läste %lu rader (konverterade från DOS- och Mac-format)"
 
-#: src/files.c:638
-#, fuzzy, c-format
+#: src/files.c:879
+#, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
 "permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
 "permission)"
-msgstr[0] "Läste %lu rad (konverterad från DOS- och Mac-format)"
-msgstr[1] "Läste %lu rader (konverterade från DOS- och Mac-format)"
+msgstr[0] ""
+"Läste %lu rad (konverterad från DOS- och Mac-format - Varning: Inga "
+"skrivrättigheter)"
+msgstr[1] ""
+"Läste %lu rader (konverterade från DOS- och Mac-format - Varning: Inga "
+"skrivrättigheter)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
-msgstr[0] "Läste %lu rad (konverterad från Mac-format)"
-msgstr[1] "Läste %lu rader (konverterade från Mac-format)"
+msgstr[0] "Läste %lu rad (konverterad från Mac-format)"
+msgstr[1] "Läste %lu rader (konverterade från Mac-format)"
 
-#: src/files.c:648
-#, fuzzy, c-format
+#: src/files.c:889
+#, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "Läste %lu rad (konverterad från Mac-format)"
-msgstr[1] "Läste %lu rader (konverterade från Mac-format)"
+msgstr[0] ""
+"Läste %lu rad (konverterad från Mac-format - Varning: Inga skrivrättigheter)"
+msgstr[1] ""
+"Läste %lu rader (konverterade från Mac-format - Varning: Inga "
+"skrivrättigheter)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
-msgstr[0] "Läste %lu rad (konverterad från DOS-format)"
-msgstr[1] "Läste %lu rader (konverterade från DOS-format)"
+msgstr[0] "Läste %lu rad (konverterad från DOS-format)"
+msgstr[1] "Läste %lu rader (konverterade från DOS-format)"
 
-#: src/files.c:658
-#, fuzzy, c-format
+#: src/files.c:899
+#, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "Läste %lu rad (konverterad från DOS-format)"
-msgstr[1] "Läste %lu rader (konverterade från DOS-format)"
+msgstr[0] ""
+"Läste %lu rad (konverterad från DOS-format - Varning: Inga skrivrättigheter)"
+msgstr[1] ""
+"Läste %lu rader (konverterade från DOS-format - Varning: Inga "
+"skrivrättigheter)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
-msgstr[0] "Läste %lu rad"
-msgstr[1] "Läste %lu rader"
+msgstr[0] "Läste %lu rad"
+msgstr[1] "Läste %lu rader"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Läste %lu rad (Varning: Inga skrivrättigheter)"
+msgstr[1] "Läste %lu rader (Varning: Inga skrivrättigheter)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
-msgstr "Läser filen"
+msgstr "Läser filen"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Ny fil"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" kunde inte hittas"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
-msgstr "\"%s\" är en katalog"
+msgstr "\"%s\" är en katalog"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
-msgstr "\"%s\" är en enhetsfil"
+msgstr "\"%s\" är en enhetsfil"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
-msgstr "Kommando att köra i ny buffert [från %s] "
+msgstr "Kommando att köra i ny buffert [från %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
-msgstr "Kommando att köra [från %s] "
+msgstr "Kommando att köra [från %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
-msgstr "Fil att infoga i ny buffert [från %s] "
+msgstr "Fil att infoga i ny buffert [från %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
-msgstr "Fil att infoga [från %s] "
+msgstr "Fil att infoga [från %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
-msgstr "Tangenten ogiltig i icke-flerbuffertläget"
+msgstr "Tangenten ogiltig i icke-flerbuffertläget"
+
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"Misslyckades med skrivning av säkerhetskopian, fortsätt spara? (N om osäker) "
 
-#: src/files.c:1486
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "Kan inte skriva utanför %s"
+msgstr "Kan inte skriva utanför %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
-"Kan inte infoga före eller lägga till efter i en symbolisk länk då --"
-"nofollow är angivet"
+"Kan inte infoga före eller lägga till efter i en symbolisk länk då --"
+"nofollow är angivet"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
-#, fuzzy, c-format
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
+#, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "Fel vid skrivning av temporär fil: %s"
+msgstr "Fel vid skrivning av säkerhetskopian %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
-msgstr "För många säkerhetskopierade filer?"
+msgstr "För många säkerhetskopierade filer?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "Fel vid skrivning av %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr "Fel vid skrivning av temporär fil: %s"
+msgstr "Fel vid skrivning av temporär fil: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "Skrev %lu rad"
 msgstr[1] "Skrev %lu rader"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS-format]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac-format]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
-msgstr " [Säkerhetskopia]"
+msgstr " [Säkerhetskopia]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Infoga markering till fil"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "Lägg till markering till fil"
+msgstr "Lägg till markering till fil"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Skriv markering till fil"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Filnamn att infoga i"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
-msgstr "Filnamn att lägga till i"
+msgstr "Filnamn att lägga till i"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Filnamn att skriva"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
-msgstr "Filen existerar, SKRIVA ÖVER? "
+msgstr "Filen existerar, SKRIVA ÖVER? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "Spara filen med ANNAT NAMN? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
+msgstr "Filen har ändrats sedan du öppnade den, fortsätt spara? "
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(mer)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Tryck Enter för att fortsätta starta nano.\n"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Avbryt"
+"Tryck Retur för att fortsätta\n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "Ersätt"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Kunde inte skapa katalogen %s: %s\n"
+"Den krävs för skrivning/inläsning av sökhistorik eller markörpos.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Ingen ersättning"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"Sökvägen %s är inte en katalog som den måste vara.\n"
+"Nano kommer inte att kunna läsa in eller spara sökhistorik eller markörpos.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Skiftkänsl"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Upptäckte en gammal historikfil för nano (%s) som jag försökte flytta\n"
+"till (%s) men något gick fel: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Bakåt"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Upptäckte en gammal historikfil för nano (%s) som jag flyttade\n"
+"till (%s)\n"
+"(se nanos FAQ för mer om denna ändring)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Reguljärt uttr"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Avsluta"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "FöregHisto"
+#: src/global.c:478
+msgid "Close"
+msgstr "Stäng"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "NästaHisto"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Ã…ngra klipp ut text"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Gå till text"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Ojustera"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
-msgstr "VarFinnsNäst"
-
-#: src/global.c:457
-msgid "First File"
-msgstr "Första filen"
+msgstr "VarFinnsNäst"
 
-#: src/global.c:458
-msgid "Last File"
-msgstr "Sista filen"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Till filer"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS-format"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac-format"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Lägg till"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Infoga"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Säkerhetskopiera fil"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Kör kommando"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Gå till katalog"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Få hjälp"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Avsluta"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Var finns"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Föreg sid"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Nästa sid"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "Första raden"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Ersätt"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Sista raden"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "GÃ¥ till rad"
 
-#: src/global.c:487
-#, fuzzy
-msgid "Suspend"
-msgstr "Suspendering"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Föreg rad"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "Börj på par"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Nästa rad"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Slut på par"
+#: src/global.c:497
+msgid "Read File"
+msgstr "Läs fil"
 
-# Osäker
-#: src/global.c:491
+# Osäker
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Fulljstera"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Uppdatera"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Infoga fil"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Gå till rad"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Justera det aktuella stycket"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Avbryt den aktuella funktionen"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
-msgstr "Visa denna hjälptext"
+msgstr "Visa denna hjälptext"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
-msgstr "Stäng aktuell filbuffert / Avsluta nano"
+msgstr "Stäng aktuell filbuffert / Avsluta nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Avsluta nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Skriv den aktuella filen till disk"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Infoga ytterligare en fil i den nuvarande"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "Sök efter en sträng eller ett reguljärt uttryck"
+msgstr "Sök efter en sträng eller ett reguljärt uttryck"
 
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Flytta till föregående skärm"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Sök efter en sträng"
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Flytta till nästa skärm"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "Gå en hel skärm upp"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "Gå en hel skärm ned"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "Klipper ut den aktuella raden och lagrar den i urklippsbufferten"
+msgstr "Klipp ut den aktuella raden och lagra den i urklippsbufferten"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "Klistra in från urklippsbufferten i aktuell rad"
+msgstr "Klistra in från urklippsbufferten i aktuell rad"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
-msgstr "Visa markörens position"
+msgstr "Visa markörens position"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
-msgstr "Starta stavningskontrollen, om tillgänglig"
+msgstr "Starta stavningskontrollen, om tillgänglig"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "Ersätt en sträng eller ett reguljärt uttryck"
+msgstr "Ersätt en sträng eller ett reguljärt uttryck"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
-msgstr "Gå till rad- och kolumnnummer"
+msgstr "GÃ¥ till rad- och kolumnnummer"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "Markera text vid markörpositionen"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Markera text med början vid markörpositionen"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr "Upprepa senaste sökning"
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Upprepa senaste sökning"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Kopiera den aktuella raden och lagrar den i urklippsbufferten"
+msgstr "Kopiera den aktuella raden och lagra den i urklippsbufferten"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Dra in aktuell rad"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "Ångra indragning av aktuell rad"
+msgstr "Ã…ngra indragning av aktuell rad"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr ""
+msgstr "Ångra senaste åtgärden"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "Gör om den senaste ångraåtgärden"
 
-#: src/global.c:543
-#, fuzzy
+#: src/global.c:550
 msgid "Go forward one character"
-msgstr "Flytta framåt ett tecken"
+msgstr "Gå framåt ett tecken"
 
-#: src/global.c:544
-#, fuzzy
+#: src/global.c:551
 msgid "Go back one character"
-msgstr "Flytta bakåt ett tecken"
+msgstr "Gå bakåt ett tecken"
 
-#: src/global.c:546
-#, fuzzy
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "Gå framåt ett ord"
+msgstr "Gå framåt ett ord"
 
-#: src/global.c:547
-#, fuzzy
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "Flytta ett ord bakåt"
+msgstr "Gå bakåt ett ord"
 
-#: src/global.c:549
-#, fuzzy
+#: src/global.c:556
 msgid "Go to previous line"
-msgstr "Flytta till föregående rad"
+msgstr "Gå till föregående rad"
 
-#: src/global.c:550
-#, fuzzy
+#: src/global.c:557
 msgid "Go to next line"
-msgstr "Flytta till nästa rad"
+msgstr "Gå till nästa rad"
 
-#: src/global.c:551
-#, fuzzy
+#: src/global.c:558
 msgid "Go to beginning of current line"
-msgstr "Flytta till början på aktuell rad"
+msgstr "Gå till början på aktuell rad"
 
-#: src/global.c:552
-#, fuzzy
+#: src/global.c:559
 msgid "Go to end of current line"
-msgstr "Flytta till slutet på aktuell rad"
+msgstr "Gå till slutet på aktuell rad"
 
-#: src/global.c:555
-#, fuzzy
+# Biten efter ; är konstig
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "Gå till början på det aktuella stycket"
+msgstr "Gå till början på det aktuella stycket; sedan för föregående stycke"
 
-#: src/global.c:557
-#, fuzzy
+# Biten efter ; är konstig
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "Gå till slutet på det aktuella stycket"
+msgstr "Gå till slutet på det aktuella stycket; sedan för nästa stycke"
 
-#: src/global.c:560
-#, fuzzy
+#: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "Gå till filens första rad"
+msgstr "Gå till filens första rad"
 
-#: src/global.c:562
-#, fuzzy
+#: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "Gå till filens sista rad"
+msgstr "GÃ¥ till filens sista rad"
 
-#: src/global.c:564
-#, fuzzy
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "Gå till matchande klammer"
+msgstr "GÃ¥ till den matchande klammern"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr "Rulla upp en rad utan att rulla markören"
+msgstr "Rulla upp en rad utan att rulla markören"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr "Rulla ned en rad utan att rulla markören"
+msgstr "Rulla ned en rad utan att rulla markören"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
-msgstr "Växla till föregående filbuffert"
+msgstr "Växla till föregående filbuffert"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
-msgstr "Växla till nästa filbuffert"
+msgstr "Växla till nästa filbuffert"
 
-# Osäker
-#: src/global.c:577
+# Osäker
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr "Infoga nästa tecken ordagrant"
+msgstr "Infoga nästa tecken ordagrant"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "Infoga ett tabulatortecken vid markörpositionen"
+msgstr "Infoga ett tabulatortecken vid markörpositionen"
 
 #: src/global.c:581
 msgid "Insert a newline at the cursor position"
-msgstr "Infoga en vagnretur vid markörpositionen"
+msgstr "Infoga ny rad-tecken vid markörpositionen"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
-msgstr "Ta bort tecknet under markören"
+msgstr "Ta bort tecknet under markören"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
-msgstr "Ta bort tecknet till vänster om markören"
+msgstr "Ta bort tecknet till vänster om markören"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "Klipp ut från markörens position till slutet av filen"
+msgstr "Klipp ut från markörens position till slutet av filen"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Justera hela filen"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
-msgstr "Räkna antalet ord, rader och tecken"
+msgstr "Räkna antalet ord, rader och tecken"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
-msgstr "Uppdatera (rita om) den aktuella skärmen"
+msgstr "Uppdatera (rita om) den aktuella skärmen"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "Försätt redigeraren i vänteläge (om vänteläge är aktiverat)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr "Växla skiftlägeskänslig sökning"
+msgstr "Växla skiftlägeskänslig sökning"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "Vänd riktning för sökningen"
+msgstr "Vänd riktning för sökningen"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
-msgstr "Växla användning av reguljära uttryck"
+msgstr "Växla användningen av reguljära uttryck"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "Återkalla den föregående sök/ersätt-strängen"
+msgstr "Återkalla den föregående sök/ersätt-strängen"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "Återkalla nästa sök/ersätt-sträng"
+msgstr "Återkalla nästa sök/ersätt-sträng"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
-msgstr "Gå till filbläddrare"
+msgstr "Gå till filbläddrare"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "Växla användning av DOS-format"
+msgstr "Växla användning av DOS-format"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "Växla användning av Mac-format"
+msgstr "Växla användning av Mac-format"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
-msgstr "Växla inmatning efter"
+msgstr "Växla inmatning efter"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr "Växla inmatning före"
+msgstr "Växla inmatning före"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
-msgstr "Växla säkerhetskopiering av originalfilen"
+msgstr "Växla säkerhetskopiering av originalfilen"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
-msgstr "Kör externt kommando"
+msgstr "Kör externt kommando"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "Växla användning av en ny buffert"
+msgstr "Växla användning av en ny buffert"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
-msgstr "Avsluta från filbläddraren"
+msgstr "Avsluta från filbläddraren"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
-msgstr "Gå till första filen i listan"
+msgstr "Gå till första filen i listan"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
-msgstr "Gå till sista filen i listan"
+msgstr "GÃ¥ till sista filen i listan"
 
-#: src/global.c:641
-#, fuzzy
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "Gå till föregående fil i listan"
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "Gå till sista filen i listan"
+msgstr "Gå till nästa fil i listan"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "GÃ¥ till katalog"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Starta felkontrollen, om tillgänglig"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "Gå till föregående felkontrmedd"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Gå till nästa felkontrmedd"
 
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Gå till första filen i listan"
+msgid "Invoke formatter, if available"
+msgstr "Starta felkontrollen, om tillgänglig"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Gå till katalog"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Få hjälp"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Stäng"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: src/global.c:678
+msgid "Write Out"
+msgstr "Skriv ut"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
-msgstr "Spara"
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "GÃ¥ till katalog"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Klipp ut"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:728
 msgid "Justify"
 msgstr "Justera"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Läs fil"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Stavkontr."
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Klipp ut"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Till felkontrollsverktyg"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Ojustera"
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS-format"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Skiftkänsl"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Reguljärt uttr"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Ångra kopi"
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Bakåt"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Ingen ersättning"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "Akt. pos"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Stavkontr."
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Föreg sid"
 
-#: src/global.c:771
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Nästa sid"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Första raden"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Sista raden"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "Till klammer"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Markera text"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "Kopiera text"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "Dra in text"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "Ångra indragning av text"
+msgstr "Ã…ngra indragning av text"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
-msgstr ""
+msgstr "Ã…ngra"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
-msgstr ""
-
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Framåt"
+msgstr "Gör om"
 
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
-msgstr "Bakåt"
+msgstr "Bakåt"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Nästa ord"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Framåt"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
-msgstr "Föreg ord"
+msgstr "Föreg ord"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Föreg rad"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Nästa rad"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Nästa ord"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Hem"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Slut"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Hitta andra klammern"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Börj på sty"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Slut på sty"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "Rulla upp"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "Rulla ned"
 
-#: src/global.c:856
-msgid "Previous File"
-msgstr "Föregående fil"
-
 #: src/global.c:858
+msgid "Prev File"
+msgstr "Föregående fil"
+
+#: src/global.c:860
 msgid "Next File"
-msgstr "Nästa fil"
+msgstr "Nästa fil"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Ordagrann inmatning"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Ordagrann"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tabb"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Retur"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Backsteg"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "KlippTillSlut"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "Antal ord"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Vänteläge"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "FöregHisto"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "NästaHisto"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "GÃ¥ till text"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS-format"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac-format"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Lägg till"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Infoga"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Säkerhetskopiera fil"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Kör kommando"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Till filer"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Första filen"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Sista filen"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Föreg felkontrolsmed"
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "Nästa felkontrollsmed"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
-msgstr "Hjälpläge"
+msgstr "Hjälpläge"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
-msgstr "Konstant visning av markörposition"
+msgstr "Konstant visning av markörposition"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
-msgstr "Användning av ytterligare en rad för redigering"
+msgstr "Användning av ytterligare en rad för redigering"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Mjuk rullning"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Mjuk radbrytning av långa rader"
+
+#: src/global.c:1237
 msgid "Whitespace display"
-msgstr "Visning av mellanrum"
+msgstr "Visning av blanktecken"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
-msgstr "Färgmarkering av syntax"
+msgstr "Färgmarkering av syntax"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Smart hemtangent"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Automatisk indragning"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Klipp ut till slutet"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Radbryt långa rader"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Fast radbrytning av långa rader"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Konvertering av inmatade tabulatorer till blanksteg"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
-msgstr "Säkerhetskopiera filer"
+msgstr "Säkerhetskopiera filer"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Flera filbuffertar"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
-msgstr "Musstöd"
+msgstr "Musstöd"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
-msgstr "Ingen konvertering från DOS/Mac-format"
+msgstr "Ingen konvertering från DOS/Mac-format"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
-msgstr "Suspendering"
-
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "Radbryt långa rader"
+msgstr "Vänteläge"
 
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -991,17 +1082,17 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"Hjälptext för sökkommando\n"
+"Hjälptext för sökkommando\n"
 "\n"
-" Ange de ord eller tecken som du vill söka efter och tryck sedan Retur. Om "
-"det finns en träff för det du angav kommer skärmen att uppdateras till att "
-"visa den närmaste träffen för söksträngen.\n"
+" Ange de ord eller tecken som du vill söka efter och tryck sedan Retur. Om "
+"det finns en träff för det du angav kommer skärmen att uppdateras till att "
+"visa den närmaste träffen för söksträngen.\n"
 "\n"
-" Den föregående söksträngen kommer att visas inom klamrar efter sökprompten. "
-"Att trycka Retur utan att ange någon text kommer att genomföra den tidigare "
-"sökningen.  "
+" Den föregående söksträngen kommer att visas inom klamrar efter sökprompten. "
+"Att trycka Retur utan att ange någon text kommer att utföra den tidigare "
+"sökningen.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1009,13 +1100,13 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
-"Om du har markerat text med markören och sedan sökt och ersatt, kommer "
-"endast träffar i den markerade texten att ersättas.\n"
+"Om du har markerat text med markören och sedan sökt och ersatt, kommer "
+"endast träffar i den markerade texten att ersättas.\n"
 "\n"
-" Följande funktionstangenter finns tillgängliga i sökläget:\n"
+" Följande funktionstangenter finns tillgängliga i sökläget:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1026,16 +1117,16 @@ msgid ""
 " The following function keys are available in Go To Line mode:\n"
 "\n"
 msgstr ""
-"Hjälptext för Gå till rad\n"
+"Hjälptext för gå till rad\n"
 "\n"
-" Ange det radnummer du vill gå till och tryck Retur. Om det finns färre "
-"textrader än det tal du angav kommer du att tas till den sista raden i "
+" Ange det radnummer du vill gå till och tryck Retur. Om det finns färre "
+"textrader än det tal du angav kommer du att tas till den sista raden i "
 "filen.\n"
 "\n"
-" Följande funktionstangenter är tillgängliga i Gå till rad-läge:\n"
+" Följande funktionstangenter är tillgängliga i gå till rad-läge:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1047,18 +1138,18 @@ msgid ""
 "Meta-F toggle, or a nanorc file, inserting a file will cause it to be loaded "
 "into a separate buffer (use Meta-< and > to switch between file buffers).  "
 msgstr ""
-"Hjälptext för infoga fil\n"
+"Hjälptext för infoga fil\n"
 "\n"
-" Ange namnet på den fil som ska sättas in i den aktuella filbufferten på den "
-"aktuella platsen för markören.\n"
+" Ange namnet på den fil som ska sättas in i den aktuella filbufferten på den "
+"aktuella platsen för markören.\n"
 "\n"
-" Om du har kompilerat nano med stöd för flera samtidiga filbuffertar och "
+" Om du har kompilerat nano med stöd för flera samtidiga filbuffertar och "
 "aktiverar flera buffertar med kommandoradsflaggorna -F eller --multibuffer, "
-"kombinationen Meta-F eller en nanorc-fil, kommer att infoga en fil göra så "
-"att den läses in i en separat buffert (använd Meta-< och > för att växla "
+"kombinationen Meta-F eller en nanorc-fil, kommer att infoga en fil göra så "
+"att den läses in i en separat buffert (använd Meta-< och > för att växla "
 "mellan filbuffertar). "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1066,13 +1157,13 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
-"Om du behöver ytterligare en tom buffert, ange inget filnamn, eller ange ett "
+"Om du behöver ytterligare en tom buffert, ange inget filnamn, eller ange ett "
 "ickeexisterande filnamn vid prompten och tryck Retur.\n"
 "\n"
-" Följande funktionstangenter är tillgängliga i infoga fil-läge:\n"
+" Följande funktionstangenter är tillgängliga i infoga fil-läge:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1087,20 +1178,20 @@ msgid ""
 " The following function keys are available in Write File mode:\n"
 "\n"
 msgstr ""
-"Hjälptext för skriv fil\n"
+"Hjälptext för skriv fil\n"
 "\n"
-" Ange det namn som du vill spara aktuell fil som och tryck Retur för att "
+" Ange det namn som du vill spara aktuell fil som och tryck Retur för att "
 "spara filen.\n"
 "\n"
-" Om du har markerat text med markören kommer du få frågan om att endast "
-"spara markeringen till en separat fil. För att minska risken att den "
-"aktuella filen skrivs över med endast en del av den är inte det aktuella "
-"filnamnet standardalternativet i detta läge.\n"
+" Om du har markerat text med markören kommer du få frågan om att endast "
+"spara markeringen till en separat fil. För att minska risken att den "
+"aktuella filen skrivs över med endast en del av den är inte det aktuella "
+"filnamnet standardalternativet i detta läge.\n"
 "\n"
-" Följande funktionstangenter är tillgängliga i filskrivningsläge:\n"
+" Följande funktionstangenter är tillgängliga i skriv fil-läge:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1113,18 +1204,18 @@ msgid ""
 " The following function keys are available in the file browser:\n"
 "\n"
 msgstr ""
-"Hjälptext för filbläddrare\n"
+"Hjälptext för filbläddrare\n"
 "\n"
-" Filbläddraren används för att visuellt bläddra i katalogstrukturen för att "
-"välja en fil för läsning eller skrivning. Du kan använda piltangenterna "
-"eller PageUp/PageDown för att bläddra bland filerna, och S eller Retur för "
-"att välja den markerade filen eller gå in i den markerade katalogen. För att "
-"gå upp en nivå väljer du katalogen kallad \"..\" överst i fillistan.\n"
+" Filbläddraren används för att visuellt bläddra i katalogstrukturen för att "
+"välja en fil för läsning eller skrivning. Du kan använda piltangenterna "
+"eller PageUp/PageDown för att bläddra bland filerna, och S eller Retur för "
+"att välja den markerade filen eller gå in i den markerade katalogen. För att "
+"gå upp en nivå väljer du katalogen kallad \"..\" överst i fillistan.\n"
 "\n"
-" Följande funktionstangenter är tillgängliga i filbläddraren:\n"
+" Följande funktionstangenter är tillgängliga i filbläddraren:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1137,26 +1228,26 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"Hjälptext för sökkommando\n"
+"Hjälptext för sökkommando\n"
 "\n"
-" Ange de ord eller tecken som du vill söka efter och tryck sedan Retur. Om "
-"det finns en träff för det du angav kommer skärmen att uppdateras till att "
-"visa den närmaste träffen för söksträngen.\n"
+" Ange de ord eller tecken som du vill söka efter och tryck sedan Retur. Om "
+"det finns en träff för det du angav kommer skärmen att uppdateras till att "
+"visa den närmaste träffen för söksträngen.\n"
 "\n"
-" Den föregående söksträngen kommer att visas inom klamrar efter sökprompten. "
-"Att trycka Retur utan att ange någon text kommer att genomföra den tidigare "
-"sökningen.\n"
+" Den föregående söksträngen kommer att visas inom klamrar efter sökprompten. "
+"Att trycka Retur utan att ange någon text kommer att genomföra den tidigare "
+"sökningen.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
-" Följande funktionstangenter är tillgängliga i sökläget:\n"
+" Följande funktionstangenter är tillgängliga i sökläget:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1168,19 +1259,19 @@ msgid ""
 " The following function keys are available in Browser Go To Directory mode:\n"
 "\n"
 msgstr ""
-"Hjälptext för gå till katalog i bläddraren\n"
+"Hjälptext för gå till katalog i bläddraren\n"
 "\n"
-" Ange namnet på den katalog som du vill gå till.\n"
+" Ange namnet på den katalog som du vill gå till.\n"
 "\n"
-" Om tabulatorkomplettering inte har inaktiverats kan du använda "
-"tabulatortangenten för att (försöka att) automatiskt komplettera "
+" Om tabulatorkomplettering inte har inaktiverats kan du använda "
+"tabulatortangenten för att (försöka att) automatiskt komplettera "
 "katalognamnet.\n"
 "\n"
-" Följande funktionstangenter är tillgängliga i bläddrarens gå till katalog-"
-"läge:\n"
+" Följande funktionstangenter är tillgängliga i bläddrarens gå till katalog-"
+"läge:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1193,19 +1284,18 @@ msgid ""
 " The following function keys are available in Spell Check mode:\n"
 "\n"
 msgstr ""
-"Hjälptext för stavningskontrollen\n"
+"Hjälptext för stavningskontrollen\n"
 "\n"
 " Stavningskontrollen kontrollerar stavningen av all text i den aktuella "
-"filen. När ett okänt ord hittas, markeras det och en ersättning kan "
-"redigeras. Den kommer sedan att för varenda förekomst av det angivna "
-"felstavade ordet i den aktuella filen, fråga om det ska ersättas, eller, om "
-"du har markerat text med markören, i den markerade texten.\n"
+"filen. När ett okänt ord hittas, markeras det och en ersättning kan "
+"redigeras. Den kommer sedan att för varenda förekomst av det angivna "
+"felstavade ordet i den aktuella filen fråga om det ska ersättas eller, om du "
+"har markerat text med markören, i den markerade texten.\n"
 "\n"
-" Följande funktionstangenter är tillgängliga i stavningskontrolläget:\n"
+" Följande funktionstangenter är tillgängliga i stavningskontrolläget:\n"
 "\n"
 
-#: src/help.c:343
-#, fuzzy
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1216,16 +1306,16 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-"Hjälptext för externt kommando\n"
+"Hjälptext för att kör kommando\n"
 "\n"
-" Detta läge låter dig infoga utdata från ett kommando som körs av ett skal i "
-"den aktuella bufferten (eller en ny buffert i flerbuffertläge). Om du "
-"behöver ytterligare en tom buffert behöver du inte ange något kommando.\n"
+" Detta läge låter dig infoga utdata från ett kommando som körs av ett skal i "
+"den aktuella bufferten (eller en ny buffert i flerbuffertläge). Om du "
+"behöver ytterligare en tom buffert behöver du inte ange något kommando.\n"
 "\n"
-" Följande tangenter är tillgängliga i det externa kommandoläget:\n"
+" Följande funktionstangenter är tillgängliga i läget kör kommando:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1236,16 +1326,16 @@ msgid ""
 "showing the file being edited.  The status line is the third line from the "
 "bottom and shows important messages.  "
 msgstr ""
-"Hjälptext för nano\n"
+"Hjälptext för nano\n"
 "\n"
-" Textredigeraren nano är skapad för att emulera funktionaliteten och "
-"lättanvändheten hos textredigeraren UW Pico. Det finns fyra huvuddelar i "
-"redigeraren: Översta raden visar programmets versionsnummer, namnet på filen "
-"som redigeras och om filen har ändrats. Efter detta finns huvudfönstret som "
-"visar filen som redigeras. Statusraden är tredje raden från nederkanten och "
+" Textredigeraren nano är skapad för att emulera funktionaliteten och "
+"lättanvändheten hos textredigeraren UW Pico. Det finns fyra huvuddelar i "
+"redigeraren: Översta raden visar programmets versionsnummer, namnet på filen "
+"som redigeras och om filen har ändrats. Efter detta finns huvudfönstret som "
+"visar filen som redigeras. Statusraden är tredje raden från nederkanten och "
 "visar viktiga meddelanden.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1255,16 +1345,16 @@ msgid ""
 "notated with the Meta (M-) symbol and can be entered using either the Esc, "
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
-"De nedersta två raderna visar de vanligaste kortkommandona som används i "
+"De nedersta två raderna visar de vanligaste kortkommandona som används i "
 "textredigeraren.\n"
 "\n"
-" Notationen för kortkommandon är som följer: Sekvenser med Control-tangent "
+" Notationen för kortkommandon är som följer: Sekvenser med Control-tangent "
 "skrivs med ett taktecken (^) och trycks tillsammans med antingen Control-"
-"tangenten (Ctrl) eller genom att trycka Escape-tangenten två gånger. Escape-"
-"sekvenser skrivs med metatecknet (M) och och anges antingen med Esc-, Alt- "
-"eller Meta-tangenten beroende på dina tangentbordsinställningar.  "
+"tangenten (Ctrl) eller genom att trycka Escape-tangenten två gånger. Escape-"
+"sekvenser skrivs med metatecknet (M) och anges antingen med Esc-, Alt- eller "
+"Meta-tangenten beroende på dina tangentbordsinställningar.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1272,21 +1362,21 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
-"Dessutom kan du genom att trycka på Escape två gånger och sedan ange ett "
-"tresiffrigt tal från 000 till 255 ange det tecken som har motsvarande ASCII-"
-"kod. Följande tangentkombinationer är tillgängliga i redigerarens "
-"huvudfönster. Alternativa tangenter visas inom parentes:\n"
+"Dessutom kan du genom att trycka på Escape två gånger och sedan ange ett "
+"tresiffrigt tal från 000 till 255 ange det tecken som har motsvarande ASCII-"
+"kod. Följande tangentkombinationer är tillgängliga i redigerarens "
+"huvudfönster. Alternativa tangenter visas inom parentes:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "aktivera/inaktivera"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
-msgstr "Tangenten ogiltig i visningsläget"
+msgstr "Tangenten ogiltig i visningsläget"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1295,7 +1385,7 @@ msgstr ""
 "\n"
 "Bufferten skrevs till %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1304,7 +1394,7 @@ msgstr ""
 "\n"
 "Bufferten skrevs inte till %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1313,265 +1403,270 @@ msgstr ""
 "\n"
 "Bufferten skrevs inte: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
-msgstr "Fönsterstorleken är för liten för Nano...\n"
+msgstr "Fönsterstorleken är för liten för Nano…\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
-"Användning: nano [FLAGGOR] [[+RAD,KOLUMN] FIL]...\n"
+"Användning: nano [FLAGGOR] [[+RAD,KOLUMN] FIL]…\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr "Flagga\t\tLång GNU flagga\t\tBetydelse\n"
+msgstr "Flagga\t\tLÃ¥ng GNU-flagga\t\tBetydelse\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Flagga\t\tBetydelse\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Visa detta meddelande"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+RAD,KOLUMN"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "Starta vid radnummer RAD, kolumn KOLUMN"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Aktivera smart hemtangent"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
-msgstr "Spara säkerhetskopior av befintliga filer"
+msgstr "Spara säkerhetskopior av befintliga filer"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <kat>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<kat>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
-msgstr "Katalog för att spara unika säkerhetskopior"
+msgstr "Katalog för att spara unika säkerhetskopior"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
-msgstr "Använd fet stil istället för omvänd videotext"
+msgstr "Använd fet stil istället för omvänd videotext"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
-msgstr "Convertera angivna tabulatorer till blanksteg"
+msgstr "Konvertera angivna tabulatorer till blanksteg"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
-msgstr "Använd flera filbuffertar"
+msgstr "Använd flera filbuffertar"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Använd låsfiler (i vim-stil)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "Logga och läs stränghistorik för sök/ersätt"
+msgstr "Logga och läs stränghistorik för sök/ersätt"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "Titta inte i nanorc-filer"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
-msgstr "Ta hand om förvirringsproblemet med numeriska tangentbordet"
+msgstr "Ta hand om förvirringsproblemet med numeriska tangentbordet"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
-msgstr "Lägg inte till nya rader på slutet av filer"
+msgstr "Lägg inte till nya rader på slutet av filer"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
-msgstr "Konvertera inte filer från DOS/Mac-format"
+msgstr "Konvertera inte filer från DOS/Mac-format"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
-msgstr "Använd en rad till för redigering"
+msgstr "Använd en rad till för redigering"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Logga & läs plats för markörposition"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <str>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<str>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
-msgstr "Citatsträng"
+msgstr "Citatsträng"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
-msgstr "Begränsat läge"
+msgstr "Begränsat läge"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "Rulla efter rad istället för halvskärm"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <kolumner>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<kolumner>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
-msgstr "Ställ in bredden på ett tabbsteg till antal kolumner"
+msgstr "Ställ in bredden på ett tabbsteg till antal kolumner"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
-msgstr "Gör en snabb rensning av statusraden"
+msgstr "Gör en snabb rensning av statusraden"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Skriv ut versionsinformation och avsluta"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
-msgstr "Identifiera ordgränsen mer noggrant"
+msgstr "Identifiera ordgränsen mer noggrant"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <str>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<str>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
-msgstr "Syntaxdefinition att använda för färger"
+msgstr "Syntaxdefinition att använda för färger"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
-msgstr "Visa markörposition hela tiden"
+msgstr "Visa markörposition hela tiden"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
-msgstr "Fixa förvirringsproblemet med Backspace/Delete"
+msgstr "Fixa förvirringsproblemet med Backsteg/Delete"
+
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Visa denna hjälptext"
 
-#: src/nano.c:888
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Dra automatiskt in nya rader"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "Klipp ut från markören till slutet på raden"
+msgstr "Klipp ut från markören till slutet på raden"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
-msgstr "Följ inte symboliska länkar, skriv över"
+msgstr "Följ inte symboliska länkar, skriv över"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
-msgstr "Aktivera användning av musen"
+msgstr "Aktivera användning av musen"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Läs inte filen (skriv den bara)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <kat>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<kat>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
-msgstr "Ställ in arbetskatalog"
+msgstr "Ställ in arbetskatalog"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "Bevara XON (^Q)- och XOFF (^S)-tangenter"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "Ignorera tyst startproblem som rc-filfel"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <kolumner>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<kolumner>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "Ställ in brytpunkt vid kolumnen \"kolumner\""
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "Ställ in fast radbryt-punkt vid kolumnen #cols"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <prog>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<prog>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
-msgstr "Använd alternativ stavningskontroll"
+msgstr "Använd alternativ stavningskontroll"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "Spara automatiskt vid avslut, fråga inte"
-
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
+msgstr "Spara automatiskt vid avslut, fråga inte"
 
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
-msgstr "Visningsläge (skrivskyddat)"
+msgstr "Visningsläge (skrivskyddat)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "Radbryt inte långa rader"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "Använd inte fast radbryt för långa rader"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
-msgstr "Visa inte de två hjälpraderna"
+msgstr "Visa inte de två hjälpraderna"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
-msgstr "Använd suspendering"
+msgstr "Använd vänteläge"
 
-#: src/nano.c:924
-#, fuzzy
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "Radbryt långa rader"
+msgstr "Aktivera mjuk radbrytning"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(ignorerad för kompatibilitet med Pico)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano version %s (kompilerad %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " E-post: nano@nano-editor.org\tHemsida: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1580,155 +1675,178 @@ msgstr ""
 "\n"
 " Kompileringsflaggor:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
-msgstr "Tyvärr, stöd för denna funktion har inaktiverats"
+msgstr "Tyvärr, stöd för denna funktion har inaktiverats"
+
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Inget filnamn"
 
-#: src/nano.c:1044
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
-"Spara ändrad buffert (ATT SVARA \"Nej\" KOMMER ATT FÖRSTÖRA ÄNDRINGAR)? "
+"Spara ändrad buffert (ATT SVARA \"Nej\" KOMMER ATT FÖRSTÖRA ÄNDRINGAR)? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "Kunde inte återöppna stdin från tangentbordet\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Läser från stdin, ^C för att avbryta\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Mottog SIGHUP eller SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Använd \"fg\" för att återvända till nano.\n"
+msgstr "Använd \"fg\" för att återvända till nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "aktiverad"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "inaktiverad"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
-msgstr "Okänt kommando"
+msgstr "Okänt kommando"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON ignorerades, mummel mummel"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF ignorerades, mummel mummel"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "Begärd tabulatorstorlek \"%s\" är ogiltig"
+msgstr "Begärd tabulatorstorlek \"%s\" är ogiltig"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "Begärd fyllningsstorlek \"%s\" är ogiltig"
+msgstr "Begärd fyllningsstorlek \"%s\" är ogiltig"
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Skriv �%s -h� för en lista över tillgängliga flaggor.\n"
 
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "JjYy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Ja"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Alla"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Nej"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
-msgstr "Fel i %s på rad %lu: "
+msgstr "Fel i %s på rad %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "Argumentet \"%s\" har ett oavslutat \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
-msgstr "Strängar med reguljära uttryck måste börja och sluta med ett \"-tecken"
+msgstr "Strängar med reguljära uttryck måste börja och sluta med ett \"-tecken"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "Felaktigt reguljärt uttryck \"%s\": %s"
+msgstr "Felaktigt reguljärt uttryck \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Syntaxnamn saknas"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
-msgstr "Syntaxen \"none\" är reserverad"
+msgstr "Syntaxen \"none\" är reserverad"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
-msgstr "Syntaxen \"default\" får inte ta utökningar"
+msgstr "Syntaxen \"default\" får inte ta utökningar"
 
-#: src/rcfile.c:386 src/rcfile.c:483
-#, fuzzy
+#: src/rcfile.c:433
 msgid "Missing key name"
-msgstr "Syntaxnamn saknas"
+msgstr "Saknar tangentnamn"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Tangentnamnet är för kort"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr ""
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Tangentnamnet måste börja med �^�, �M� eller �F�"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr ""
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "MÃ¥ste ange en funktion att binda tangenten till"
 
-#: src/rcfile.c:426
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Kunde inte öppna %s för skrivning: %s"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr "Måste ange en meny (eller \"all\") för att ändra bindning för tangent"
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Kunde inte starta \"%s\""
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Kan inte mappa namnet �%s� till en funktion"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:496
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Kan inte mappa namnet �%s� till en meny"
+
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Funktionen �%s�  existerar inte i meny �%s�"
+
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Tangentnedtryckningen �%s� kan inte bindas om"
+
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Fel vid utökning av %s: %s"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1737,141 +1855,202 @@ msgid ""
 "\"black\", with the optional prefix \"bright\"\n"
 "for foreground colors."
 msgstr ""
-"Förstår inte färgen \"%s\".\n"
-"Giltiga färger är \"green\" (grönt), \"red\" (rött),\n"
-"\"blue\" (blått), \"white\" (vitt), \"yellow\" (gult),\n"
+"Förstår inte färgen \"%s\".\n"
+"Giltiga färger är \"green\" (grönt), \"red\" (rött),\n"
+"\"blue\" (blått), \"white\" (vitt), \"yellow\" (gult),\n"
 "\"cyan\", \"magenta\" och \"black\" (svart), med\n"
-"valfria prefixet \"bright\" (ljus) för förgrundsfärger."
+"valfria prefixet \"bright\" (ljus) för förgrundsfärger."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
-msgstr "Kan inte lägga till ett färgkommando utan ett syntaxkommando"
+msgstr "Kan inte lägga till ett färgkommando utan ett syntaxkommando"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
-msgstr "Färgnamn saknas"
+msgstr "Färgnamn saknas"
 
-#: src/rcfile.c:672
+#: src/rcfile.c:709 src/rcfile.c:870
+msgid "Missing regex string"
+msgstr "Saknar sträng för reguljärt uttryck"
+
+#: src/rcfile.c:785
+msgid "\"start=\" requires a corresponding \"end=\""
+msgstr "\"start=\" kräver ett motsvarande \"end=\""
+
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
-msgstr "Bakgrundsfärgen \"%s\" kan inte vara ljus"
+msgstr "Bakgrundsfärgen \"%s\" kan inte vara ljus"
 
-#: src/rcfile.c:690 src/rcfile.c:809
-msgid "Missing regex string"
-msgstr "Saknar reguljär uttryckssträng"
+#: src/rcfile.c:865
+msgid "Cannot add a header regex without a syntax command"
+msgstr ""
+"Kan inte lägga till ett reguljärt uttryck för huvud utan ett syntaxkommando"
 
-#: src/rcfile.c:762
-msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\"start=\" kräver ett motsvarande \"end=\""
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+"Kan inte lägga till ett reguljärt uttryck för magisk sträng utan ett "
+"syntaxkommando"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Saknar namn på magisk sträng"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "Kan inte lägga till en felkontroll utan ett syntaxkommando"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Saknar kommando för felkontroll"
+
+#: src/rcfile.c:1010
 #, fuzzy
-msgid "Cannot add a header regex without a syntax command"
-msgstr "Kan inte lägga till ett färgkommando utan ett syntaxkommando"
+msgid "Cannot add formatter without a syntax command"
+msgstr "Kan inte lägga till en felkontroll utan ett syntaxkommando"
+
+#: src/rcfile.c:1015
+#, fuzzy
+msgid "Missing formatter command"
+msgstr "Saknar kommando för felkontroll"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
+"Allvarligt fel: Inga tangenter mappade för funktionen \"%s\". Avslutar.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
+"Om det behövs, använd nano med flaggan -I för att justera dina nanorc-"
+"inställningar.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Kunde inte hitta syntax %s att utöka"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr "Kommandot \"%s\" tillåts inte i inkluderad fil"
+msgstr "Kommandot \"%s\" tillåts inte i inkluderad fil"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr "Syntax \"%s\" har inga färgkommandon"
+msgstr "Syntax \"%s\" har inga färgkommandon"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "Förstår inte kommandot \"%s\""
+msgstr "Förstår inte kommandot \"%s\""
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Flagga saknas"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Saknad flagga"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "Flaggan \"%s\" kräver ett argument"
+msgstr "Flaggan \"%s\" kräver ett argument"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
-msgstr "Flagga är inte en giltig flerbytesträng"
+msgstr "Flagga är inte en giltig flerbytesträng"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
-msgstr "Icke-blanktecken krävs"
+msgstr "Icke-blanktecken krävs"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
-msgstr "Två enkel-kolumntecken krävs"
+msgstr "Två enkel-kolumntecken krävs"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
+msgid "Cannot unset option \"%s\""
 msgstr "Kan inte bort flaggan \"%s\""
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "Okänd flagga \"%s\""
+msgid "Unknown option \"%s\""
+msgstr "Okänd flagga \"%s\""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Jag kan inte hitta min hemkatalog! Buhu!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Tryck Retur för att fortsätta starta nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%.*s%s\" kunde inte hittas"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Skiftlägeskänslig]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Reguljärt uttryck]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Baklänges]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
-msgstr " (att ersätta) i markering"
+msgstr " (att ersätta) i markering"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
-msgstr " (att ersätta)"
+msgstr " (att ersätta)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
-msgstr "Ersätta denna förekomst?"
+msgstr "Ersätta denna förekomst?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
-msgstr "Ersätt med"
+msgstr "Ersätt med"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
-msgstr[0] "Ersatte %lu förekomst"
-msgstr[1] "Ersatte %lu förekomster"
+msgstr[0] "Ersatte %lu förekomst"
+msgstr[1] "Ersatte %lu förekomster"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Ange radnummer, kolumnnummer"
 
-#: src/search.c:1061
-#, fuzzy
+#: src/search.c:1054
 msgid "Invalid line or column number"
-msgstr "Ange radnummer, kolumnnummer"
+msgstr "Ogiltigt rad- eller kolumnnummer"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Inte en klammer"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Ingen matchande klammer"
 
@@ -1883,247 +2062,326 @@ msgstr "Markering satt"
 msgid "Mark Unset"
 msgstr "Markera borttagen"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "Inget i ångra-bufferten!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
-msgstr ""
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Internt fel: Kan inte matcha raden %d. Spara ditt arbete."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
-msgstr ""
+msgstr "lägg till text"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
-msgstr "Nästa fil"
-
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "Radbryt långa rader"
+msgstr "textborttagning"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
-msgstr ""
+msgstr "lägg ihop rad"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
-msgstr ""
+msgstr "klipp ut text"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr ""
+msgstr "Ã¥ngra klipp ut text"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr ""
+msgstr "radbryt"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
-msgstr "Nästa rad"
+msgstr "textinmatning"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
-msgstr " (att ersätta)"
+msgstr "textersättning"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr ""
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Internt fel: Okänd typ. Spara ditt arbete."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Ångrade åtgärd (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "Inget att göra om!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr ""
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "Internt fel: Kan inte göra om. Spara ditt arbete."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Gjorde om åtgärd (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Kunde inte använda rör"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Kunde inte skapa rör"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Kunde inte grena"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
+msgstr "Internt fel: Kan ångra klipp ut. Spara ditt arbete."
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
-msgstr "Felaktig citeringssträng %s: %s"
+msgstr "Felaktig citeringssträng %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Kan ojustera nu!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
-msgstr "Redigera en ersättning"
-
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Kunde inte skapa rör"
+msgstr "Redigera en ersättning"
 
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "Skapar lista över felstavade ord, var vänlig vänta..."
+msgstr "Skapar lista över felstavade ord, var vänlig vänta…"
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
-msgstr "Kunde inte få tag i rörbuffertens storlek"
+msgstr "Kunde inte få tag i rörbuffertens storlek"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "Fel vid start av \"spell\""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "Fel vid start av \"sort -f\""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "Fel vid start av \"uniq\""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
-msgstr "Stavningskontrollen slutfördes"
+msgstr "Stavningskontrollen slutfördes"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "Fel vid start av \"%s\""
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Starta stavningskontrollen"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Stavningskontrollen misslyckades: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Stavningskontrollen misslyckades: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Ingen felkontroll definierad för denna typ av fil!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Spara ändrad buffert före felkontroll?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Startar felkontroll, vänta."
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Fick 0 tolkningsbara rader från kommando: %s"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr "Meddelandet är för oöppnade filen %s, öppna den i en ny buffer?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Vid sista meddelandet"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Vid första meddelandet"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+#, fuzzy
+msgid "Invoking formatter, please wait"
+msgstr "Startar felkontroll, vänta."
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sOrd: %lu  Rader: %ld  Tecken: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "I markering:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Ordagrann inmatning"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
-msgstr "nano har slut på minne!"
+msgstr "nano har slut på minne!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Unicode-inmatning"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
-msgstr "Ändrad"
+msgstr "Ändrad"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "Visa"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "KAT:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Fil:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr "Varning: Ändring av olåst fil, kontrollera katalogrättigheter?"
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "rad %ld/%ld (%d%%), kolumn %lu/%lu (%d%%), tecken %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Textredigeraren nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "version"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Presenteras av:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Ytterligare tack till:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
-msgstr "För ncurses:"
+msgstr "För ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
-msgstr "och alla andra som vi har glömt..."
+msgstr "och alla andra som vi har glömt…"
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
-msgstr "Tack för att du använder nano!"
+msgstr "Tack för att du använder nano!"
+
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr "Internt fel: Kan inte matcha rad %ld. Spara ditt arbete."
+
+#~ msgid "line wrap"
+#~ msgstr "radbryt"
+
+#~ msgid "Move to the previous screen"
+#~ msgstr "Flytta till föregående skärm"
+
+#~ msgid "Move to the next screen"
+#~ msgstr "Flytta till nästa skärm"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Hitta andra klammern"
+
+#~ msgid "Insert File"
+#~ msgstr "Infoga fil"
 
 #~ msgid "Space"
 #~ msgstr "Blanksteg"
 
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(ignorerad för kompatibilitet med Pico)"
+
+#~ msgid "Missing flag"
+#~ msgstr "Flagga saknas"
+
 #~ msgid "Come on, be reasonable"
-#~ msgstr "Kom igen, var nu förståndig"
+#~ msgstr "Kom igen, var nu förståndig"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Kunde inte använda rör"
 
 #~ msgid "Prepending to %s failed: %s"
 #~ msgstr "Infogning till %s misslyckades: %s"
 
 #~ msgid "Invoke the help menu"
-#~ msgstr "Starta hjälpmenyn"
+#~ msgstr "Starta hjälpmenyn"
 
 #~ msgid "Search for text within the editor"
-#~ msgstr "Sök efter text inuti textredigeraren"
+#~ msgstr "Sök efter text inuti textredigeraren"
 
 #~ msgid "Replace text within the editor"
-#~ msgstr "Ersätt text inuti textredigeraren"
+#~ msgstr "Ersätt text inuti textredigeraren"
 
 #~ msgid "Find matching bracket"
 #~ msgstr "Hitta matchande klammer"
 
 #~ msgid "Make the current search/replace case (in)sensitive"
-#~ msgstr "Gör den aktuella sökningen/ersättningen skiftläges(o)känslig"
+#~ msgstr "Gör den aktuella sökningen/ersättningen skiftläges(o)känslig"
 
 #~ msgid "Make the current search/replace go backwards"
-#~ msgstr "Gör så att den aktuella sökningen/ersättningen går baklänges"
+#~ msgstr "Gör så att den aktuella sökningen/ersättningen går baklänges"
 
 #~ msgid "Write file out in DOS format"
 #~ msgstr "Skriv fil i DOS-format"
@@ -2135,7 +2393,7 @@ msgstr "Tack för att du använder nano!"
 #~ msgstr "Infoga i den aktuella filen"
 
 #~ msgid "Back up original file when saving"
-#~ msgstr "Säkerhetskopiera ursprunglig fil vid sparande"
+#~ msgstr "Säkerhetskopiera ursprunglig fil vid sparande"
 
 #~ msgid "Insert into new buffer"
 #~ msgstr "Infoga i ny buffert"
@@ -2144,11 +2402,11 @@ msgstr "Tack för att du använder nano!"
 #~ "Usage: nano [+LINE,COLUMN] [GNU long option] [option] [file]\n"
 #~ "\n"
 #~ msgstr ""
-#~ "Användning: nano [+RAD,KOLUMN]] [lång GNU-flagga] [flagga] [fil]\n"
+#~ "Användning: nano [+RAD,KOLUMN]] [lång GNU-flagga] [flagga] [fil]\n"
 #~ "\n"
 
 #~ msgid "Use more space for editing"
-#~ msgstr "Använd mer utrymme för redigering"
+#~ msgstr "Använd mer utrymme för redigering"
 
 #~ msgid "Set fill cols to (wrap lines at) #cols"
 #~ msgstr "Bryt rader efter antal tecken"
@@ -2156,11 +2414,8 @@ msgstr "Tack för att du använder nano!"
 #~ msgid "Duplicate syntax name %s"
 #~ msgstr "Kopia av syntaxnamn %s"
 
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "Kunde inte skapa temporär fil: %s"
-
 #~ msgid "Refusing zero-length regex match"
-#~ msgstr "Vägrar matchning av reguljärt uttryck med noll-längd"
+#~ msgstr "Vägrar matchning av reguljärt uttryck med noll-längd"
 
 #~ msgid "Wrote %u line"
 #~ msgid_plural "Wrote %u lines"
@@ -2168,14 +2423,14 @@ msgstr "Tack för att du använder nano!"
 #~ msgstr[1] "Skrev %u rader"
 
 #~ msgid "Can't open \"%s\": %s"
-#~ msgstr "Kan inte öppna \"%s\": %s"
+#~ msgstr "Kan inte öppna \"%s\": %s"
 
 #~ msgid ""
 #~ "\n"
 #~ "Press Return to continue starting nano\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Tryck Retur för att fortsätta starta nano\n"
+#~ "Tryck Retur för att fortsätta starta nano\n"
 
 #~ msgid "Direction"
 #~ msgstr "Riktning"
@@ -2188,7 +2443,7 @@ msgstr "Tack för att du använder nano!"
 #~ "Buffer not written to %s (too many backup files?)\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Bufferten skrevs inte till %s (för många säkerhetskopior?)\n"
+#~ "Bufferten skrevs inte till %s (för många säkerhetskopior?)\n"
 
 #~ msgid "Up"
 #~ msgstr "Upp"
@@ -2197,22 +2452,25 @@ msgstr "Tack för att du använder nano!"
 #~ msgstr "+RAD"
 
 #~ msgid "Do regular expression searches"
-#~ msgstr "Sök med reguljärt uttryck"
+#~ msgstr "Sök med reguljärt uttryck"
 
 #~ msgid "Verbatim input"
 #~ msgstr "Ordagrann inmatning"
 
+#~ msgid "Could not invoke \"%s\""
+#~ msgstr "Kunde inte starta \"%s\""
+
 #~ msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%ld (%d%%)"
 #~ msgstr "rad %ld/%ld (%d%%), kolumn %lu/%lu (%d%%), tecken %lu/%ld (%d%%)"
 
 #~ msgid "File exists, OVERWRITE ?"
-#~ msgstr "Filen existerar, SKRIVA ÖVER?"
+#~ msgstr "Filen existerar, SKRIVA ÖVER?"
 
 #~ msgid "File exists, OVERWRITE?"
-#~ msgstr "Filen existerar, SKRIVA ÖVER?"
+#~ msgstr "Filen existerar, SKRIVA ÖVER?"
 
 #~ msgid "File exists, OVERWRITE? "
-#~ msgstr "Filen existerar, SKRIVA ÖVER? "
+#~ msgstr "Filen existerar, SKRIVA ÖVER? "
 
 #~ msgid "Save file under DIFFERENT NAME? "
 #~ msgstr "Spara filen med ANNAT NAMN? "
@@ -2224,7 +2482,7 @@ msgstr "Tack för att du använder nano!"
 #~ msgstr "Justera"
 
 #~ msgid "Backup file"
-#~ msgstr "Säkerhetskopiera fil"
+#~ msgstr "Säkerhetskopiera fil"
 
 #~ msgid "%s not found"
 #~ msgstr "%s kunde inte hittas"
@@ -2233,16 +2491,16 @@ msgstr "Tack för att du använder nano!"
 #~ msgstr "add_to_cutbuffer() anropades med inptr->data = %s\n"
 
 #~ msgid "Blew away cutbuffer =)\n"
-#~ msgstr "Sprängde urklippsbufferten =)\n"
+#~ msgstr "Sprängde urklippsbufferten =)\n"
 
 #~ msgid "File to insert into new buffer [from ./] "
-#~ msgstr "Fil att infoga i ny buffert [från ./] "
+#~ msgstr "Fil att infoga i ny buffert [från ./] "
 
 #~ msgid "File to insert [from ./] "
-#~ msgstr "Fil att infoga [från ./] "
+#~ msgstr "Fil att infoga [från ./] "
 
 #~ msgid "filename is %s\n"
-#~ msgstr "filnamnet är %s\n"
+#~ msgstr "filnamnet är %s\n"
 
 #~ msgid "%s: free'd a node, YAY!\n"
 #~ msgstr "%s: frigjorde en nod, JIPPI!\n"
@@ -2251,46 +2509,46 @@ msgstr "Tack för att du använder nano!"
 #~ msgstr "%s: frigjorde sista noden.\n"
 
 #~ msgid "Could not read %s for backup: %s"
-#~ msgstr "Kunde inte öppna %s för säkerhetskopiering: %s"
+#~ msgstr "Kunde inte öppna %s för säkerhetskopiering: %s"
 
 #~ msgid "Couldn't write backup: %s"
-#~ msgstr "Kunde inte skriva säkerhetskopia: %s"
+#~ msgstr "Kunde inte skriva säkerhetskopia: %s"
 
 #~ msgid "Backing up %s to %s\n"
-#~ msgstr "Säkerhetskopierar %s till %s\n"
+#~ msgstr "Säkerhetskopierar %s till %s\n"
 
 #~ msgid "Could not set permissions %o on backup %s: %s"
-#~ msgstr "Kunde inte sätta rättigheterna %o på säkerhetskopian %s: %s"
+#~ msgstr "Kunde inte sätta rättigheterna %o på säkerhetskopian %s: %s"
 
 #~ msgid "Could not set owner %d/group %d on backup %s: %s"
-#~ msgstr "Kunde inte sätta ägare %d/grupp %d på säkerhetskopian %s: %s"
+#~ msgstr "Kunde inte sätta ägare %d/grupp %d på säkerhetskopian %s: %s"
 
 #~ msgid "Could not set access/modification time on backup %s: %s"
-#~ msgstr "Kunde inte sätta åtkomst-/modifieringstid på säkerhetskopian %s: %s"
+#~ msgstr "Kunde inte sätta åtkomst-/modifieringstid på säkerhetskopian %s: %s"
 
 #~ msgid "Could not open file for writing: %s"
-#~ msgstr "Kunde inte öppna filen för skrivning: %s"
+#~ msgstr "Kunde inte öppna filen för skrivning: %s"
 
 #~ msgid "Wrote >%s\n"
 #~ msgstr "Skrev >%s\n"
 
 #~ msgid "Could not close %s: %s"
-#~ msgstr "Kunde inte stänga %s: %s"
+#~ msgstr "Kunde inte stänga %s: %s"
 
 #~ msgid "Could not reopen %s: %s"
-#~ msgstr "Kunde inte återöppna %s: %s"
+#~ msgstr "Kunde inte återöppna %s: %s"
 
-#~ msgid "Could not open %s for prepend: %s"
-#~ msgstr "Kunde inte öppna %s för infogande: %s"
+#~ msgid "Could not open %s for writing: %s"
+#~ msgstr "Kunde inte öppna %s för skrivning: %s"
 
 #~ msgid "Could not set permissions %o on %s: %s"
-#~ msgstr "Kunde inte sätta rättigheterna %o på %s: %s"
+#~ msgstr "Kunde inte sätta rättigheterna %o på %s: %s"
 
 #~ msgid "Goto Cancelled"
-#~ msgstr "Gå till avbrutet"
+#~ msgstr "GÃ¥ till avbrutet"
 
 #~ msgid "Unable to open ~/.nano_history file, %s"
-#~ msgstr "Kan inte öppna filen ~/.nano_history, %s"
+#~ msgstr "Kan inte öppna filen ~/.nano_history, %s"
 
 #~ msgid "Unable to write ~/.nano_history file, %s"
 #~ msgstr "Kan inte skriva filen ~/.nano_history, %s"
@@ -2302,31 +2560,31 @@ msgstr "Tack för att du använder nano!"
 #~ msgstr "Skriver fil i Mac-format"
 
 #~ msgid "Backing up file"
-#~ msgstr "Säkerhetskopierar fil"
+#~ msgstr "Säkerhetskopierar fil"
 
 #~ msgid "Unjustify after a justify"
-#~ msgstr "Återställ en justering"
+#~ msgstr "Återställ en justering"
 
 #~ msgid "Move up one line"
-#~ msgstr "Gå upp en rad"
+#~ msgstr "GÃ¥ upp en rad"
 
 #~ msgid "Move down one line"
-#~ msgstr "Gå ner en rad"
+#~ msgstr "GÃ¥ ner en rad"
 
 #~ msgid "Search backwards"
-#~ msgstr "Sök baklänges"
+#~ msgstr "Sök baklänges"
 
 #~ msgid "Open previously loaded file"
-#~ msgstr "Öppna föregående inlästa fil"
+#~ msgstr "Öppna föregående inlästa fil"
 
 #~ msgid "Open next loaded file"
-#~ msgstr "Öppna nästa inlästa fil"
+#~ msgstr "Öppna nästa inlästa fil"
 
 #~ msgid "Down"
 #~ msgstr "Ner"
 
 #~ msgid "Use alternate keypad routines"
-#~ msgstr "Använd alternativa tangentbordsrutiner"
+#~ msgstr "Använd alternativa tangentbordsrutiner"
 
 #~ msgid "-T [num]"
 #~ msgstr "-T [antal]"
@@ -2338,42 +2596,42 @@ msgstr "Tack för att du använder nano!"
 #~ msgstr "Efter, data = \"%s\"\n"
 
 #~ msgid "Spell checking failed: unable to write temp file!"
-#~ msgstr "Stavningskontroll misslyckades: kan inte skriva till temporärfil!"
+#~ msgstr "Stavningskontroll misslyckades: kan inte skriva till temporärfil!"
 
 #~ msgid "Cannot resize top win"
-#~ msgstr "Kan inte ändra storlek på övre fönstret"
+#~ msgstr "Kan inte ändra storlek på övre fönstret"
 
 #~ msgid "Cannot move top win"
-#~ msgstr "Kan inte flytta övre fönstret"
+#~ msgstr "Kan inte flytta övre fönstret"
 
 #~ msgid "Cannot resize edit win"
-#~ msgstr "Kan inte ändra storlek på redigeringsfönstret"
+#~ msgstr "Kan inte ändra storlek på redigeringsfönstret"
 
 #~ msgid "Cannot move edit win"
-#~ msgstr "Kan inte flytta redigeringsfönstret"
+#~ msgstr "Kan inte flytta redigeringsfönstret"
 
 #~ msgid "Cannot resize bottom win"
-#~ msgstr "Kan inte ändra storlek på nedre fönstret"
+#~ msgstr "Kan inte ändra storlek på nedre fönstret"
 
 #~ msgid "Cannot move bottom win"
-#~ msgstr "Kan inte flytta nedre fönstret"
+#~ msgstr "Kan inte flytta nedre fönstret"
 
 #~ msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
 #~ msgstr ""
-#~ "NumLock-problem upptäcktes. Tangenterna kommer inte att fungera utan "
+#~ "NumLock-problem upptäcktes. Tangenterna kommer inte att fungera utan "
 #~ "NumLock"
 
 #~ msgid "Tab size is too small for nano...\n"
-#~ msgstr "Tabulatorstorleken är för liten för nano...\n"
+#~ msgstr "Tabulatorstorleken är för liten för nano...\n"
 
 #~ msgid "Main: set up windows\n"
-#~ msgstr "Main: konfigurera fönster\n"
+#~ msgstr "Main: konfigurera fönster\n"
 
 #~ msgid "Main: bottom win\n"
-#~ msgstr "Main: nedre fönstret\n"
+#~ msgstr "Main: nedre fönstret\n"
 
 #~ msgid "Main: open file\n"
-#~ msgstr "Main: öppna fil\n"
+#~ msgstr "Main: öppna fil\n"
 
 #~ msgid "AHA!  %c (%d)\n"
 #~ msgstr "AHA! %c (%d)\n"
@@ -2397,7 +2655,7 @@ msgstr "Tack för att du använder nano!"
 #~ msgstr "Jag mottog %c (%d)!\n"
 
 #~ msgid "Adding new syntax after 1st\n"
-#~ msgstr "Lägger till ny syntax efter första\n"
+#~ msgstr "Lägger till ny syntax efter första\n"
 
 #~ msgid "Starting a new syntax type\n"
 #~ msgstr "Startar ny syntaxtyp\n"
diff --git a/po/tr.gmo b/po/tr.gmo
index 7bf49e5..2dc8b86 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index 24ff5db..236650e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,123 +1,148 @@
-# translation of nano-1.2.1.tr.po to Turkish
+# translation of nano to Turkish.
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# A. Murat EREN <meren@comu.edu.tr>, 2003
 #
+# A. Murat EREN <meren@comu.edu.tr>, 2003
 msgid ""
 msgstr ""
 "Project-Id-Version: nano 1.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
 "PO-Revision-Date: 2003-08-17 18:08+0300\n"
 "Last-Translator: A. Murat EREN <meren@comu.edu.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: KBabel 1.0\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 #, fuzzy
 msgid "Go To Directory"
 msgstr "Dizine Git"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "Ä°ptal edildi"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Kısıtlı kipte %s dışına çıkılamıyor"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, fuzzy, c-format
 msgid "Error reading %s: %s"
 msgstr "Hatalı alıntı dizgesi %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "Bir üst dizine geçilemiyor"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr ""
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr ""
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Ara"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Büyük / Küçük Harfe Duyarlı]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Düzenli İfade]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Geriye DoÄŸru]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "Arama Döngülendi"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "Bu tek bulgu"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr ""
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "%o izinleri %s dosyasına uygulanamadı: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "%s'nin %d. satırında hata: "
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "%s'nin %d. satırında hata: "
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "%s'nin %d. satırında hata: "
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Dosya %s dışından eklenemiyor"
 
-#: src/files.c:234
+#: src/files.c:467
 #, fuzzy
 msgid "No more open file buffers"
 msgstr "Başka açık dosya yok"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "%s 'e geçildi"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "Yeni Arabellek"
 
-#: src/files.c:633
+#: src/files.c:874
 #, fuzzy, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "%d satır okundu (Mac biçiminden dönüştürüldü)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -127,13 +152,13 @@ msgid_plural ""
 "permission)"
 msgstr[0] "%d satır okundu (Mac biçiminden dönüştürüldü)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, fuzzy, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "%d satır okundu (Mac biçiminden dönüştürüldü)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -141,13 +166,13 @@ msgid_plural ""
 "Read %lu lines (Converted from Mac format - Warning: No write permission)"
 msgstr[0] "%d satır okundu (Mac biçiminden dönüştürüldü)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, fuzzy, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "%d satır okundu (DOS biçiminden dönüştürüldü)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, fuzzy, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -155,506 +180,454 @@ msgid_plural ""
 "Read %lu lines (Converted from DOS format - Warning: No write permission)"
 msgstr[0] "%d satır okundu (DOS biçiminden dönüştürüldü)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, fuzzy, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "%d satır okundu"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] ""
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "Dosya Okunuyor"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Yeni Dosya"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "\"%s\" bulunamadı"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" bir dizin"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, fuzzy, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" bir aygıt dosyası"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, fuzzy, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Yeni arabelleÄŸe eklenecek dosya [%s 'den]"
 
-#: src/files.c:819
+#: src/files.c:1062
 #, fuzzy, c-format
 msgid "Command to execute [from %s] "
 msgstr "Çalıştırılacak komut"
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Yeni arabelleÄŸe eklenecek dosya [%s 'den]"
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Eklenecek dosya [%s tarafından] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 #, fuzzy
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Anahtar çoklu olmayan arabellek kipinde geçersiz"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "%s dışına yazılamıyor"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr ""
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 #, fuzzy
 msgid "Too many backup files?"
 msgstr ""
 "\n"
 "%s yazılmamış (çok fazla yedek dosyası?)\n"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, fuzzy, c-format
 msgid "Error writing %s: %s"
 msgstr "Hatalı alıntı dizgesi %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr ""
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, fuzzy, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "%d satır yazıldı"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS Biçimi]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac Biçimi]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [Yedek]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Seçimi Dosyanın Başına Ekle"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Seçimi Dosyanın Sonuna Ekle"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "Seçimi Dosyaya Yaz"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Başına Eklenecek Dosya Adı"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Sonuna Eklenecek Dosya Adı"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "Yazılacak Dosya Adı"
 
-#: src/files.c:2153
+#: src/files.c:2427
 #, fuzzy
 msgid "File exists, OVERWRITE ? "
 msgstr "Dosya var, ÃœSTÃœNE YAZILSIN MI?"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr ""
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(daha)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
 "nano'yu başlatmaya devam etmek için Gir tuşuna basınız\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Ä°ptal"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "DeÄŸiÅŸtir"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "DeÄŸiÅŸtirme Yok"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Harf Duyarlı"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
 
-#: src/global.c:421
-#, fuzzy
-msgid "Backwards"
-msgstr " [Geriye DoÄŸru]"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Düzenli İfade"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Çık"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-#, fuzzy
-msgid "PrevHstory"
-msgstr "Geçmiş"
+#: src/global.c:478
+msgid "Close"
+msgstr "Kapat"
 
-#: src/global.c:452
+#: src/global.c:479
 #, fuzzy
-msgid "NextHstory"
-msgstr "Geçmiş"
+msgid "Uncut Text"
+msgstr "Kesmeyi Geri Al"
 
-#: src/global.c:453
+#: src/global.c:481
 #, fuzzy
-msgid "Go To Text"
-msgstr "Satıra Git"
+msgid "Unjustify"
+msgstr "Yaslamayı Geri Al"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 #, fuzzy
 msgid "WhereIs Next"
 msgstr "Ara"
 
-#: src/global.c:457
-#, fuzzy
-msgid "First File"
-msgstr "İlk Satır"
-
-#: src/global.c:458
-#, fuzzy
-msgid "Last File"
-msgstr "Son Satır"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Dosyalara"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS Biçimi"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac Biçimi"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Sonuna Ekle"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Başına Ekle"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Yedek Dosyası"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Komut Çalıştır"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Dizine Git"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Yardım Al"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Çık"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "Ara"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Önceki Sayfa"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Sonraki Sayfa"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "İlk Satır"
+#: src/global.c:493
+msgid "Replace"
+msgstr "DeÄŸiÅŸtir"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Son Satır"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Satıra Git"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "Askıya Al"
+#: src/global.c:495
+#, fuzzy
+msgid "Prev Line"
+msgstr "Önceki Sayfa"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr ""
+#: src/global.c:496
+#, fuzzy
+msgid "Next Line"
+msgstr "Sonraki Dosya"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr ""
+#: src/global.c:497
+msgid "Read File"
+msgstr "Dosya Oku"
 
-#: src/global.c:491
+#: src/global.c:499
 #, fuzzy
 msgid "FullJstify"
 msgstr "Yasla"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Tazele"
 
-#: src/global.c:495
-#, fuzzy
-msgid "Insert File"
-msgstr "Sonraki Dosya"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Satıra Git"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "Şu anki paragrafı yasla"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "Yürürlükteki fonksiyonu iptal et"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr ""
 
-#: src/global.c:509
+#: src/global.c:513
 #, fuzzy
 msgid "Close the current file buffer / Exit from nano"
 msgstr "Yüklenmiş olan dosyayı kapat/nano'dan çık"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "nano'dan çık"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "Yürütülmekte olan dosyayı diske yaz"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "Åžu anki dosyaya baÅŸka bir dosya ekle"
 
-#: src/global.c:519
+#: src/global.c:523
 #, fuzzy
 msgid "Search for a string or a regular expression"
 msgstr "Düzenli ifade kullan"
 
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "Önceki ekrana git"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr ""
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "Sonraki ekrana git"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr ""
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr ""
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "Şu anki satırı kes ve kesim arabelleğinde sakla"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "Şu anki satıra kesim arabelleğini yapıştır"
 
-#: src/global.c:527
+#: src/global.c:534
 #, fuzzy
 msgid "Display the position of the cursor"
 msgstr "İmlecin pozisyonunu göster"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "Yazım denetleyicisini çağır (eğer mümkün ise)"
 
-#: src/global.c:531
+#: src/global.c:538
 #, fuzzy
 msgid "Replace a string or a regular expression"
 msgstr "Düzenli ifade kullan"
 
-#: src/global.c:532
+#: src/global.c:539
 #, fuzzy
 msgid "Go to line and column number"
 msgstr "Satır numarasına git"
 
-#: src/global.c:534
+#: src/global.c:541
 #, fuzzy
-msgid "Mark text at the cursor position"
+msgid "Mark text starting from the cursor position"
 msgstr "İmleç hizasındaki metni işaretle"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+msgid "Repeat the last search"
 msgstr ""
 
-#: src/global.c:537
+#: src/global.c:544
 #, fuzzy
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "Şu anki satırı kes ve kesim arabelleğinde sakla"
 
-#: src/global.c:538
+#: src/global.c:545
 #, fuzzy
 msgid "Indent the current line"
 msgstr "Yürürlükteki dosyanın sonuna ekle"
 
-#: src/global.c:539
+#: src/global.c:546
 #, fuzzy
 msgid "Unindent the current line"
 msgstr "Yürürlükteki dosyanın sonuna ekle"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr ""
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr ""
 
-#: src/global.c:543
+#: src/global.c:550
 #, fuzzy
 msgid "Go forward one character"
 msgstr "Bir karakter ileri git"
 
-#: src/global.c:544
+#: src/global.c:551
 #, fuzzy
 msgid "Go back one character"
 msgstr "Bir karakter geri gel"
 
-#: src/global.c:546
+#: src/global.c:553
 #, fuzzy
 msgid "Go forward one word"
 msgstr "Bir kelime ileri git"
 
-#: src/global.c:547
+#: src/global.c:554
 #, fuzzy
 msgid "Go back one word"
 msgstr "Bir kelime geriye git"
 
-#: src/global.c:549
+#: src/global.c:556
 #, fuzzy
 msgid "Go to previous line"
 msgstr "Önceki ekrana git"
 
-#: src/global.c:550
+#: src/global.c:557
 #, fuzzy
 msgid "Go to next line"
 msgstr "Bir satır aşağı in"
 
-#: src/global.c:551
+#: src/global.c:558
 #, fuzzy
 msgid "Go to beginning of current line"
 msgstr "Şu anki satırın başına git"
 
-#: src/global.c:552
+#: src/global.c:559
 #, fuzzy
 msgid "Go to end of current line"
 msgstr "Şu anki satırın sonuna git"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr ""
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "Dosyanın ilk satırına git"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Dosyanın son satırına git"
 
-#: src/global.c:564
+#: src/global.c:569
 #, fuzzy
 msgid "Go to the matching bracket"
 msgstr "Eşleşen ayraç yok"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr ""
 
-#: src/global.c:572
+#: src/global.c:576
 #, fuzzy
 msgid "Switch to the previous file buffer"
 msgstr "Önceki ekrana git"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr ""
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr ""
 
-#: src/global.c:579
+#: src/global.c:580
 #, fuzzy
 msgid "Insert a tab at the cursor position"
 msgstr "İmlecin olduğu yerden satır başı yap"
@@ -664,353 +637,469 @@ msgstr "İmlecin olduğu yerden satır başı yap"
 msgid "Insert a newline at the cursor position"
 msgstr "İmlecin olduğu yerden satır başı yap"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "İmlecin altındaki karakteri sil"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Ä°mlecin solundaki karakteri sil"
 
-#: src/global.c:588
+#: src/global.c:587
 #, fuzzy
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Şu anki satıra kesim arabelleğini yapıştır"
 
-#: src/global.c:591
+#: src/global.c:590
 #, fuzzy
 msgid "Justify the entire file"
 msgstr "Şu anki paragrafı yasla"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr ""
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "Şu anki ekranı tazele (yeniden çiz)"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr ""
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr ""
 
-#: src/global.c:605
+#: src/global.c:604
 #, fuzzy
 msgid "Reverse the direction of the search"
 msgstr "İmlecin pozisyonunu göster"
 
-#: src/global.c:609
+#: src/global.c:608
 #, fuzzy
 msgid "Toggle the use of regular expressions"
 msgstr "Düzenli ifade kullan"
 
-#: src/global.c:613
+#: src/global.c:612
 #, fuzzy
 msgid "Recall the previous search/replace string"
 msgstr "Önceki arama/değiştirme dizgisini düzenle"
 
-#: src/global.c:615
+#: src/global.c:614
 #, fuzzy
 msgid "Recall the next search/replace string"
 msgstr "Önceki arama/değiştirme dizgisini düzenle"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "Dosya tarayıcısına git"
 
-#: src/global.c:621
+#: src/global.c:620
 #, fuzzy
 msgid "Toggle the use of DOS format"
 msgstr "Dosyayı DOS biçiminde yaz"
 
-#: src/global.c:622
+#: src/global.c:621
 #, fuzzy
 msgid "Toggle the use of Mac format"
 msgstr "Dosyayı Mac biçiminde yaz"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr ""
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr ""
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr ""
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Harici komut çalıştır"
 
-#: src/global.c:633
+#: src/global.c:628
 #, fuzzy
 msgid "Toggle the use of a new buffer"
 msgstr "Yeni arabelleğe girişi aç/kapa"
 
-#: src/global.c:636
+#: src/global.c:631
 #, fuzzy
 msgid "Exit from the file browser"
 msgstr "Dosya tarayıcısına git"
 
-#: src/global.c:638
+#: src/global.c:632
 #, fuzzy
 msgid "Go to the first file in the list"
 msgstr "Dosyanın ilk satırına git"
 
-#: src/global.c:640
+#: src/global.c:633
 #, fuzzy
 msgid "Go to the last file in the list"
 msgstr "Dosyanın son satırına git"
 
-#: src/global.c:641
+#: src/global.c:634
+#, fuzzy
+msgid "Go to the previous file in the list"
+msgstr "Dosyanın ilk satırına git"
+
+#: src/global.c:635
 #, fuzzy
 msgid "Go to the next file in the list"
 msgstr "Dosyanın son satırına git"
 
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "Dizine git"
+
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "Yazım denetleyicisini çağır (eğer mümkün ise)"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "Satır numarasına git"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr ""
+
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "Dosyanın ilk satırına git"
+msgid "Invoke formatter, if available"
+msgstr "Yazım denetleyicisini çağır (eğer mümkün ise)"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "Dizine git"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Yardım Al"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "Kapat"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Ä°ptal"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "Yaz"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Dizine Git"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Metni Kes"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Yasla"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "Dosya Oku"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Denetime"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Metni Kes"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "Satıra Git"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Yaslamayı Geri Al"
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS Biçimi"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Harf Duyarlı"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
+#: src/global.c:750
+msgid "Regexp"
+msgstr "Düzenli İfade"
+
+#: src/global.c:755
 #, fuzzy
-msgid "UnCut Text"
-msgstr "Kesmeyi Geri Al"
+msgid "Backwards"
+msgstr " [Geriye DoÄŸru]"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "DeÄŸiÅŸtirme Yok"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "İmleç Pozisyonu"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Denetime"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Önceki Sayfa"
 
-#: src/global.c:771
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Sonraki Sayfa"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "İlk Satır"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Son Satır"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "Ayraç değil"
+
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "Metni Ä°ÅŸaretle"
 
-#: src/global.c:777
+#: src/global.c:800
 #, fuzzy
 msgid "Copy Text"
 msgstr "Metni Kes"
 
-#: src/global.c:780
+#: src/global.c:803
 #, fuzzy
 msgid "Indent Text"
 msgstr "Metni Kes"
 
-#: src/global.c:783
-#, fuzzy
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "Kesmeyi Geri Al"
+msgstr ""
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr ""
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr ""
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Ä°leri"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Geri"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Sonraki Kelime"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Ä°leri"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Önceki Kelime"
 
-#: src/global.c:824
-#, fuzzy
-msgid "Prev Line"
-msgstr "Önceki Sayfa"
-
-#: src/global.c:827
-#, fuzzy
-msgid "Next Line"
-msgstr "Sonraki Dosya"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Sonraki Kelime"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Ev"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Son"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Diğer Köşeli Ayracı Bul"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr ""
 
-#: src/global.c:848
-msgid "Scroll Up"
+#: src/global.c:846
+msgid "End of Par"
 msgstr ""
 
 #: src/global.c:851
+msgid "Scroll Up"
+msgstr ""
+
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr ""
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "Önceki Dosya"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "Sonraki Dosya"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+msgid "Verbatim"
 msgstr ""
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Sekme (TAB)"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Gir TuÅŸu (Enter)"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "Sil"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "Geri tuÅŸu"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr ""
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr ""
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Askıya Al"
+
+#: src/global.c:910
+#, fuzzy
+msgid "PrevHstory"
+msgstr "Geçmiş"
+
+#: src/global.c:913
+#, fuzzy
+msgid "NextHstory"
+msgstr "Geçmiş"
+
+#: src/global.c:917
+#, fuzzy
+msgid "Go To Text"
+msgstr "Satıra Git"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS Biçimi"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac Biçimi"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Sonuna Ekle"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Başına Ekle"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Yedek Dosyası"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Komut Çalıştır"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Dosyalara"
+
+#: src/global.c:964
+#, fuzzy
+msgid "First File"
+msgstr "İlk Satır"
+
+#: src/global.c:966
+#, fuzzy
+msgid "Last File"
+msgstr "Son Satır"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr ""
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr ""
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Yardım Kipi"
 
-#: src/global.c:1369
+#: src/global.c:1229
 #, fuzzy
 msgid "Constant cursor position display"
 msgstr "Sabit imleç pozisyonu"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr ""
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Yumuşak kaydırma"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "Uzun satırları kaydırma"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr ""
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "Renkli sözdizimi vurgusu"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr ""
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Otomatik hizala"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Sonuna kes"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr ""
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "Uzun satırları kaydırma"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr ""
 
-#: src/global.c:1389
+#: src/global.c:1251
 #, fuzzy
 msgid "Backup files"
 msgstr "Yedek Dosyası"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Dosya arabelleklerini çokla"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Fare DesteÄŸi"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "DOS/Mac biçimi ile ilgili bir şey yok"
 
-#: src/global.c:1397
+#: src/global.c:1259
 #, fuzzy
 msgid "Suspension"
 msgstr "Askıya Al"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr ""
-
-#: src/help.c:236
+#: src/help.c:205
 #, fuzzy
 msgid ""
 "Search Command Help Text\n"
@@ -1037,7 +1126,7 @@ msgstr ""
 " Arama kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1046,7 +1135,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1066,7 +1155,7 @@ msgstr ""
 " Satıra Git kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 #, fuzzy
 msgid ""
 "Insert File Help Text\n"
@@ -1097,7 +1186,7 @@ msgstr ""
 " Dosya Ekle kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1106,7 +1195,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:275
+#: src/help.c:244
 #, fuzzy
 msgid ""
 "Write File Help Text\n"
@@ -1136,7 +1225,7 @@ msgstr ""
 " Dosyayı Yaz kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1161,7 +1250,7 @@ msgstr ""
 " Dosya Tarayıcısı kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 #, fuzzy
 msgid ""
 "Browser Search Command Help Text\n"
@@ -1189,13 +1278,13 @@ msgstr ""
 " Arama kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
 
-#: src/help.c:315
+#: src/help.c:284
 #, fuzzy
 msgid ""
 "Browser Go To Directory Help Text\n"
@@ -1218,7 +1307,7 @@ msgstr ""
 " Tarayıcı Dizine Git kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 #, fuzzy
 msgid ""
 "Spell Check Help Text\n"
@@ -1242,7 +1331,7 @@ msgstr ""
 " Yazım Denetimi kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 #, fuzzy
 msgid ""
 "Execute Command Help Text\n"
@@ -1263,7 +1352,7 @@ msgstr ""
 " Harici Komut kipinde aşağıdaki anahtarlardan yararlanabilirsiniz:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 #, fuzzy
 msgid ""
 "Main nano help text\n"
@@ -1294,7 +1383,7 @@ msgstr ""
 "kullanılabilir.  Alternatif tuşlar parantez içinde gösterilmişlerdir:\n"
 "\n"
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1305,7 +1394,7 @@ msgid ""
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1314,16 +1403,16 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "etkin/etkisiz"
 
-#: src/nano.c:587
+#: src/nano.c:601
 #, fuzzy
 msgid "Key invalid in view mode"
 msgstr "GÖSTER kipi için geçersiz anahtar"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1332,7 +1421,7 @@ msgstr ""
 "\n"
 "Arabellek %s olarak yazıldı\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1341,7 +1430,7 @@ msgstr ""
 "\n"
 "Arabellek %s olarak yazıldı\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1350,287 +1439,292 @@ msgstr ""
 "\n"
 "Arabellek %s olarak yazıldı\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "Pencere boyutu nano için çok küçük...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, fuzzy, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "Seçenek\t\tUzun Seçenek\t\tAnlamı\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Seçenek\t\tAnlamı\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Bu mesajı gösterir"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr ""
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 #, fuzzy
 msgid "Start at line LINE, column COLUMN"
 msgstr "LINE satır numarasından başla"
 
-#: src/nano.c:828
+#: src/nano.c:849
 #, fuzzy
 msgid "Enable smart home key"
 msgstr "Fare etkin"
 
-#: src/nano.c:829
+#: src/nano.c:850
 #, fuzzy
 msgid "Save backups of existing files"
 msgstr "Kaydetme anında varolan dosyaların yedeğini al"
 
-#: src/nano.c:830
-#, fuzzy
+#: src/nano.c:851
 msgid "-C <dir>"
-msgstr "-o [dizin]"
+msgstr ""
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr ""
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr ""
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr ""
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr ""
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Çoklu dosya arabelleği aktif"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Metin arama/değiştirme geçmişini oku ve günlükle."
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "nanorc dosyalarına bakma"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr ""
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr ""
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "Dosyalaro DOS/Mac biçiminden dönüştürme"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:886
 #, fuzzy
+msgid "Log & read location of cursor position"
+msgstr "Sabit imleç pozisyonu"
+
+#: src/nano.c:889
 msgid "-Q <str>"
-msgstr "-Q [metin]"
+msgstr ""
 
-#: src/nano.c:860
+#: src/nano.c:889
 #, fuzzy
 msgid "--quotestr=<str>"
 msgstr "--quotestr=[metin]"
 
-#: src/nano.c:861
+#: src/nano.c:890
 #, fuzzy
 msgid "Quoting string"
 msgstr "Alıntı dizgesi, öntanımlı \"> \""
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr ""
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr ""
 
-#: src/nano.c:868
+#: src/nano.c:897
 #, fuzzy
 msgid "-T <#cols>"
 msgstr "-r [#cols]"
 
-#: src/nano.c:868
+#: src/nano.c:897
 #, fuzzy
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=[sayı]"
 
-#: src/nano.c:869
+#: src/nano.c:898
 #, fuzzy
 msgid "Set width of a tab to #cols columns"
 msgstr "Sekmenin geniÅŸliÄŸini numaraya ayarla"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr ""
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "Sürüm bilgisini yaz ve çık"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr ""
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "-Y <str>"
-msgstr "-Y [metin]"
+msgstr ""
 
-#: src/nano.c:880
+#: src/nano.c:909
 #, fuzzy
 msgid "--syntax=<str>"
 msgstr "--syntax [metin]"
 
-#: src/nano.c:881
+#: src/nano.c:910
 #, fuzzy
 msgid "Syntax definition to use for coloring"
 msgstr "Kullanılacak sözdizim tanımlaması"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "İmleç pozisyonunu daimi göster"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr ""
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "Bu mesajı gösterir"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Yeni satırlarda otomatik paragraf başı yap"
 
-#: src/nano.c:889
+#: src/nano.c:919
 #, fuzzy
 msgid "Cut from cursor to end of line"
 msgstr ""
 "^K komutunun, imleç pozisyonundan satırın sonuna dek kesmesine izin ver"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "Simgesel bağları takip etme, üzerine yaz"
 
-#: src/nano.c:894
+#: src/nano.c:924
 #, fuzzy
 msgid "Enable the use of the mouse"
 msgstr "Fare etkin"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
-msgstr "-o [dizin]"
+msgstr ""
 
-#: src/nano.c:897
+#: src/nano.c:928
 #, fuzzy
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=[dizin]"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "Çalışma dizinini belirle"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "XON (^Q) ve XOFF (^S) tuşlarını sakla"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr ""
 
-#: src/nano.c:905
+#: src/nano.c:938
 #, fuzzy
 msgid "-r <#cols>"
 msgstr "-r [#cols]"
 
-#: src/nano.c:905
+#: src/nano.c:938
 #, fuzzy
 msgid "--fill=<#cols>"
 msgstr "--fill=[#cols]"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
 msgstr ""
 
-#: src/nano.c:909
+#: src/nano.c:942
 #, fuzzy
 msgid "-s <prog>"
 msgstr "-s [prog]"
 
-#: src/nano.c:909
+#: src/nano.c:942
 #, fuzzy
 msgid "--speller=<prog>"
 msgstr "--speller=[prog]"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Alternatif yazım kontrolcüsü etkin"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "Çıkışta sormaksızın otomatik kaydet"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
+#: src/nano.c:947
 #, fuzzy
 msgid "View mode (read-only)"
 msgstr "Göster (sadece okunur) kipi"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "Uzun satırları kaydırma"
 
-#: src/nano.c:922
+#: src/nano.c:951
 #, fuzzy
 msgid "Don't show the two help lines"
 msgstr "Yardım penceresini gösterme"
 
-#: src/nano.c:923
+#: src/nano.c:952
 #, fuzzy
 msgid "Enable suspension"
 msgstr "Askıya almayı etkinleştir"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr ""
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(Pico uyumluluğu için yoksayıldı)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano sürüm numarası: %s (%s, %s tarihinde derlendi)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 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/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1639,159 +1733,183 @@ msgstr ""
 "\n"
 " Derleme seçenekleri:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "Özür dileriz, bu işlev için destek etkisiz kılınmış"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 "Değiştirilmiş arabellek kaydedilsin mi (\"Hayır\" CEVABI TÜM DEĞİŞİKLİKLERİ "
 "YOK EDECEK) ? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr ""
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr ""
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "SIGHUP ya da SIGTERM sinyali alındı\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, fuzzy, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "nano'ya geri dönmek için \"fg\"'yi kullanın"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "etkin"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "etkisiz"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr ""
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 #, fuzzy
 msgid "XON ignored, mumble mumble"
 msgstr "XON yoksayıldı."
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 #, fuzzy
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF yoksayıldı."
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, fuzzy, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "istenen Tab değeri %d geçerli değil"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, fuzzy, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "istenen doldurma değeri %d geçerli değil"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr ""
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Ee"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Hh"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Evet"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Tümü"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Hayır"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, fuzzy, c-format
 msgid "Error in %s on line %lu: "
 msgstr "%s'nin %d. satırında hata: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, fuzzy, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "%s argümanında sonlanmamış \" var"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 #, fuzzy
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Düzenli ifade katarları, \" karakteri ile başlamalı ve bitmeli\n"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "\"%s\" yanlış bir düzenli ifade: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Sözdizim ismi eksik"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr ""
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr ""
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 #, fuzzy
 msgid "Missing key name"
 msgstr "Sözdizim ismi eksik"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr ""
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
 msgstr ""
 
-#: src/rcfile.c:426
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "%s yazmak için açılamadı: %s"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "\"%s\" çağırılamadı"
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr ""
+
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr ""
+
+#: src/rcfile.c:528
+#, c-format
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
 
-#: src/rcfile.c:454
+#: src/rcfile.c:543
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr ""
+
+#: src/rcfile.c:672
 #, fuzzy, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1805,137 +1923,197 @@ msgstr ""
 "\"white\", \"yellow\", \"cyan\", \"magenta\" ve \n"
 "\"black\", seçimli \"bright\" ön eki ile.\n"
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 #, fuzzy
 msgid "Cannot add a color command without a syntax command"
 msgstr "Sözdizimi satırı olmaksızın renk direktifi eklenemez"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Renk ismi eksik"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr ""
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr ""
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\", \"end=\"e ihtiyaç duyar."
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr ""
+
+#: src/rcfile.c:865
 #, fuzzy
 msgid "Cannot add a header regex without a syntax command"
 msgstr "Sözdizimi satırı olmaksızın renk direktifi eklenemez"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:921
+#, fuzzy
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "Sözdizimi satırı olmaksızın renk direktifi eklenemez"
+
+#: src/rcfile.c:926
+#, fuzzy
+msgid "Missing magic string name"
+msgstr "Renk ismi eksik"
+
+#: src/rcfile.c:985
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "Sözdizimi satırı olmaksızın renk direktifi eklenemez"
+
+#: src/rcfile.c:990
+#, fuzzy
+msgid "Missing linter command"
+msgstr "Renk ismi eksik"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "Sözdizimi satırı olmaksızın renk direktifi eklenemez"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr ""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "%s başına ekleme için açılamıyor: %s"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr ""
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr ""
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, fuzzy, c-format
 msgid "Command \"%s\" not understood"
 msgstr "%s komutu anlaşılamadı"
 
-#: src/rcfile.c:972
+#: src/rcfile.c:1186
 #, fuzzy
-msgid "Missing flag"
+msgid "Missing option"
 msgstr "Renk ismi eksik"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, fuzzy, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "%s seçeneği bir bağımsız değişken gerektiriyor"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr ""
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr ""
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr ""
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, fuzzy, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "%d bayrağı boşaltıldı!\n"
+msgid "Cannot unset option \"%s\""
+msgstr "Üst pencere yeniden boyutlandırılamaz"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
+msgid "Unknown option \"%s\""
 msgstr ""
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Ev dizinimi bulamıyorum!"
 
+#: src/rcfile.c:1442
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"nano'yu başlatmaya devam etmek için Gir tuşuna basınız\n"
+
 #: src/search.c:96
 #, fuzzy, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "\"%s\" bulunamadı"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Büyük / Küçük Harfe Duyarlı]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [Düzenli İfade]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Geriye DoÄŸru]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 #, fuzzy
 msgid " (to replace) in selection"
 msgstr " (değiştirmek için)"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (değiştirmek için)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "Bu bulgu deÄŸiÅŸtirilsin mi?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "Ä°le deÄŸiÅŸtir"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, fuzzy, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "%d değiştirme yapıldı"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 #, fuzzy
 msgid "Enter line number, column number"
 msgstr "Satır numarasını girin"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr ""
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Ayraç değil"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Eşleşen ayraç yok"
 
@@ -1948,223 +2126,281 @@ msgstr "Ä°ÅŸaretle"
 msgid "Mark Unset"
 msgstr "İşareti Kaldır"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr ""
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr ""
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 #, fuzzy
 msgid "text delete"
 msgstr "Sonraki Dosya"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr ""
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr ""
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr ""
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr ""
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr ""
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 #, fuzzy
 msgid "text insert"
 msgstr "Sonraki Dosya"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 #, fuzzy
 msgid "text replace"
 msgstr " (değiştirmek için)"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
 msgstr ""
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr ""
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr ""
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr ""
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Boru işlemi gerçekleştirilemedi"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Boru yaratılamadı"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Fork işlemi gerçekleştirilemedi"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "Hatalı alıntı dizgesi %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Şmdi yaslamayı geri alabilirsiniz!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Bir yerdeğiştirmeyi düzenle"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Boru yaratılamadı"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "Yazım hatası içeren kelimeler listeleniyor, lütfen bekleyiniz"
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Boru arabelleğinin boyutu alınamıyor"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "\"spell\" çağırılırken hata"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "\"sort -f\" çağırılırken hata"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "\"uniq\" çağırılırken hata"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Yazım kontrolü bitti"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, fuzzy, c-format
 msgid "Error invoking \"%s\""
 msgstr "\"spell\" çağırılırken hata"
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "Yazım denetleyicisini çağır (eğer mümkün ise)"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Yazım kontrolü başarısız oldu: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, fuzzy, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Yazım kontrolü başarısız oldu: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr ""
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "Bu mesajı gösterir"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "Bu mesajı gösterir"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr ""
 
-#: src/text.c:3031
+#: src/text.c:3439
 #, fuzzy
 msgid "In Selection:  "
 msgstr "Seçimi Dosyanın Sonuna Ekle"
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr ""
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano bellek dışı!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr ""
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 #, fuzzy
 msgid "Modified"
 msgstr " DeÄŸiÅŸtirildi "
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 #, fuzzy
 msgid "View"
 msgstr " Göster "
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 #, fuzzy
 msgid "DIR:"
 msgstr " DÄ°ZÄ°N: "
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 #, fuzzy
 msgid "File:"
 msgstr "Dosya: "
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, fuzzy, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "satır %ld/%ld (%d%%), sütun %lu/%lu (%d%%), karakter %lu/%ld (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "nano metin editörü"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 #, fuzzy
 msgid "version"
 msgstr "sürüm "
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "Size saÄŸlayan: "
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "Özel teşekkürler:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "The Free Software Foundation"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "ncurses için:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "ve unuttuÄŸumuz kiÅŸilere..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 #, fuzzy
 msgid "Thank you for using nano!"
 msgstr "nano kullandığınız için teşekkürler!\n"
@@ -2221,11 +2457,8 @@ msgstr "nano kullandığınız için teşekkürler!\n"
 #~ msgid "Could not reopen %s: %s"
 #~ msgstr "%s tekrar açılamadı: %s"
 
-#~ msgid "Could not open %s for prepend: %s"
-#~ msgstr "%s başına ekleme için açılamıyor: %s"
-
-#~ msgid "Could not set permissions %o on %s: %s"
-#~ msgstr "%o izinleri %s dosyasına uygulanamadı: %s"
+#~ msgid "Could not open %s for writing: %s"
+#~ msgstr "%s yazmak için açılamadı: %s"
 
 #~ msgid "Can't open \"%s\": %s"
 #~ msgstr "\"%s\" açılamıyor: %s"
@@ -2263,6 +2496,9 @@ msgstr "nano kullandığınız için teşekkürler!\n"
 #~ msgid "Search for text within the editor"
 #~ msgstr "Editör içinde metin ara"
 
+#~ msgid "Move to the next screen"
+#~ msgstr "Sonraki ekrana git"
+
 #~ msgid "Move up one line"
 #~ msgstr "Bir satır yukarı çık"
 
@@ -2304,6 +2540,9 @@ msgstr "nano kullandığınız için teşekkürler!\n"
 #~ msgid "Down"
 #~ msgstr "Aşağı"
 
+#~ msgid "Find Other Bracket"
+#~ msgstr "Diğer Köşeli Ayracı Bul"
+
 #~ msgid "Direction"
 #~ msgstr "Yön"
 
@@ -2330,30 +2569,45 @@ msgstr "nano kullandığınız için teşekkürler!\n"
 #~ msgid "Use alternate keypad routines"
 #~ msgstr "Alternatif tuştakımı yordamlarını kullan"
 
+#~ msgid "-Q [str]"
+#~ msgstr "-Q [metin]"
+
 #~ msgid "Do regular expression searches"
 #~ msgstr "Düzenli ifade aramaları gerçekleştir"
 
 #~ msgid "-T [num]"
 #~ msgstr "-T [sayı]"
 
+#~ msgid "-Y [str]"
+#~ msgstr "-Y [metin]"
+
+#~ msgid "-o [dir]"
+#~ msgstr "-o [dizin]"
+
 #~ msgid "Set fill cols to (wrap lines at) #cols"
 #~ msgstr "Satırları #cols hizasından kaydır"
 
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(Pico uyumluluğu için yoksayıldı)"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Boru işlemi gerçekleştirilemedi"
+
 #~ msgid "current->data now = \"%s\"\n"
 #~ msgstr "current->data now = \"%s\"\n"
 
 #~ msgid "After, data = \"%s\"\n"
 #~ msgstr "Sonra, veri = \"%s\"\n"
 
+#~ msgid "Could not invoke \"%s\""
+#~ msgstr "\"%s\" çağırılamadı"
+
 #~ msgid "Could not create a temporary filename: %s"
 #~ msgstr "Geçici bir dosya adı yaratılamadı: %s"
 
 #~ msgid "Spell checking failed: unable to write temp file!"
 #~ msgstr "Yazım kontrolü başarısız oldu: geçici dosyaya yazılamıyor!"
 
-#~ msgid "Cannot resize top win"
-#~ msgstr "Üst pencere yeniden boyutlandırılamaz"
-
 #~ msgid "Cannot move top win"
 #~ msgstr "Ãœst pencere hareket ettirilemez"
 
@@ -2431,6 +2685,9 @@ msgstr "nano kullandığınız için teşekkürler!\n"
 #~ msgid "set flag %d!\n"
 #~ msgstr "%d bayrağı atandı!\n"
 
+#~ msgid "unset flag %d!\n"
+#~ msgstr "%d bayrağı boşaltıldı!\n"
+
 #~ msgid "Errors found in .nanorc file"
 #~ msgstr ".nanorc dosyası içerisinde hatalar bulundu"
 
diff --git a/po/uk.gmo b/po/uk.gmo
index 3f6b730..3febc1d 100644
--- a/po/uk.gmo
+++ b/po/uk.gmo
diff --git a/po/uk.po b/po/uk.po
index 8527b04..2818f7c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,1036 +1,1097 @@
-# l10n file 4 nano, ukrainian language
+# Ukrainian translation for nano.
 # Copyright (C) 2001 Free Software Foundation, Inc.
-# Sergey A. Ribalchenko <fisher@obu.ck.ua>, 2001.
+# This file is distributed under the same license as the nano package.
 #
+# Sergey A. Ribalchenko <fisher@obu.ck.ua>, 2001.
+# Yuri Chornoivan <yurchor@ukr.net>, 2014, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.1.99pre3\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2003-02-17 10:51+0300\n"
-"Last-Translator: Sergey A. Ribalchenko <fisher@obu.ck.ua>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 12:19+0200\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-u\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Lokalize 1.5\n"
 
-#: src/browser.c:220
-#, fuzzy
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
-msgstr "äÏ äÉÒÅËÔÏÒ¦§"
+msgstr "Перейти до каталогу"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
-msgstr "óËÁÓÏ×ÁÎÏ"
+msgstr "Ска�овано"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
-msgstr "îÅ ÍÏÖÕ Ð¦ÔÉ ÐÏÚÁ %s × ÏÂÍÅÖÅÎÏÍÕ ÒÅÖÉͦ"
+msgstr "�е можу піти поза %s в обмеженому режимі"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
-#, fuzzy, c-format
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
+#, c-format
 msgid "Error reading %s: %s"
-msgstr "ðÏÇÁÎÉÊ ÒÑÄÏË ÃÉÔÕ×ÁÎÎÑ %s: %s"
+msgstr "Помилка під ча� �проби читанн� %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "îÅ ÍÏÖÕ ÐÅÒÅͦÓÔÉÔÉ ÄÉÒÅËÔÏÒ¦À"
+msgstr "�е можу перейти на каталог вище"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
-msgstr ""
+msgstr "(кат)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
-msgstr ""
+msgstr "(батьк. кат.)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
-msgstr "ðÏÛÕË"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [òÅÇúÁÌÅÖ]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [æÏÒÍ÷ÉÒ]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [îÁÚÁÄ]"
+msgstr "Пошук"
 
 # message
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
-msgstr "ä¦ÓÔÁÌÉÓÑ Ë¦ÎÃÑ ÆÁÊÌÁ, ÐÏÞÁÌÉ ÓÐÏÞÁÔËÕ"
+msgstr "Ді�тали�� кінц� файла, почали �початку"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
-msgstr "ãÅ ¤ÄÉÎÅ ÓЦ×ÐÁĦÎÎÑ"
+msgstr "Це єдиний збіг"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
+msgstr "�емає поточного зразка дл� пошуку"
+
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr "�е вдало�� визначити профіль дл� файла блокуванн� (помилка getpwuid())"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "�е вдало�� визначити назву вузла дл� файла блокуванн�: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Помилка під ча� �проби запи�ати файл блокуванн� %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Помилка під ча� �проби вилучити файл блокуванн� %s: %s"
+
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Помилка під ча� �проби відкрити файл блокуванн� %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
 msgstr ""
+"Помилка під ча� �проби прочитати дані з файла блокуванн� %s: прочитано "
+"недо�татньо даних"
 
-#: src/files.c:125
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+"Редагуванн� файла %s вже виконуєть�� (%s за допомогою %s, PID %d); "
+"продовжити?"
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr ""
+"Помилка під ча� �проби запи�ати файл блокуванн�: каталогу «%s» не і�нує"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
-msgstr "îÅ ÍÏÖÕ ×ÓÔÁ×ÉÔÉ ÆÁÊÌ ÐÏÚÁ %s"
+msgstr "�е можу в�тавити файл поза %s"
 
-#: src/files.c:234
-#, fuzzy
+#: src/files.c:467
 msgid "No more open file buffers"
-msgstr "â¦ÌØÛ ÎÅÍÁ צÄËÒÉÔÉÈ ÆÁÊ̦×"
+msgstr "Більше немає відкритих файлових буферів"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
-msgstr "ðÅÒÅÍËÎÕÔÏ ÄÏ %s"
+msgstr "Перемкнуто до %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
-msgstr "îÏ×ÉÊ âÕÆÅÒ"
+msgstr "�овий Буфер"
 
-#: src/files.c:633
-#, fuzzy, c-format
+#: src/files.c:874
+#, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
-msgstr[0] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄÏË (ÐÅÒÅÔ×ÏÒÅÎÏ Ú ÆÏÒÍÁÔÕ Mac)"
-msgstr[1] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄËÁ (ÐÅÒÅÔ×ÏÒÅÎÉÈ Ú ÆÏÒÍÁÔÕ Mac)"
-msgstr[2] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄË¦× (ÐÅÒÅÔ×ÏÒÅÎÉÈ Ú ÆÏÒÍÁÔÕ Mac)"
+msgstr[0] "Прочитано %lu р�док (перетворено з формату DOS та Mac)"
+msgstr[1] "Прочитано %lu р�дки (перетворено з формату DOS та Mac)"
+msgstr[2] "Прочитано %lu р�дків (перетворено з формату DOS та Mac)"
 
-#: src/files.c:638
-#, fuzzy, c-format
+#: src/files.c:879
+#, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
 "permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
 "permission)"
-msgstr[0] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄÏË (ÐÅÒÅÔ×ÏÒÅÎÏ Ú ÆÏÒÍÁÔÕ Mac)"
-msgstr[1] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄËÁ (ÐÅÒÅÔ×ÏÒÅÎÉÈ Ú ÆÏÒÍÁÔÕ Mac)"
-msgstr[2] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄË¦× (ÐÅÒÅÔ×ÏÒÅÎÉÈ Ú ÆÏÒÍÁÔÕ Mac)"
+msgstr[0] ""
+"Прочитано %lu р�док (перетворено з формату Mac та DOS; попередженн�: немає "
+"до�тупу на запи�)"
+msgstr[1] ""
+"Прочитано %lu р�дка (перетворено з формату Mac та DOS; попередженн�: немає "
+"до�тупу на запи�)"
+msgstr[2] ""
+"Прочитано %lu р�дків (перетворено з формату Mac та DOS; попередженн�: немає "
+"до�тупу на запи�)"
 
-#: src/files.c:644
-#, fuzzy, c-format
+#: src/files.c:885
+#, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
-msgstr[0] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄÏË (ÐÅÒÅÔ×ÏÒÅÎÏ Ú ÆÏÒÍÁÔÕ Mac)"
-msgstr[1] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄËÁ (ÐÅÒÅÔ×ÏÒÅÎÉÈ Ú ÆÏÒÍÁÔÕ Mac)"
-msgstr[2] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄË¦× (ÐÅÒÅÔ×ÏÒÅÎÉÈ Ú ÆÏÒÍÁÔÕ Mac)"
+msgstr[0] "Прочитано %lu р�док (перетворено з формату Mac)"
+msgstr[1] "Прочитано %lu р�дки (перетворено з формату Mac)"
+msgstr[2] "Прочитано %lu р�дків (перетворено з формату Mac)"
 
-#: src/files.c:648
-#, fuzzy, c-format
+#: src/files.c:889
+#, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄÏË (ÐÅÒÅÔ×ÏÒÅÎÏ Ú ÆÏÒÍÁÔÕ Mac)"
-msgstr[1] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄËÁ (ÐÅÒÅÔ×ÏÒÅÎÉÈ Ú ÆÏÒÍÁÔÕ Mac)"
-msgstr[2] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄË¦× (ÐÅÒÅÔ×ÏÒÅÎÉÈ Ú ÆÏÒÍÁÔÕ Mac)"
+msgstr[0] ""
+"Прочитано %lu р�док (перетворено з формату Mac; попередженн�: немає до�тупу "
+"на запи�)"
+msgstr[1] ""
+"Прочитано %lu р�дка (перетворено з формату Mac; попередженн�: немає до�тупу "
+"на запи�)"
+msgstr[2] ""
+"Прочитано %lu р�дків (перетворено з формату Mac; попередженн�: немає до�тупу "
+"на запи�)"
 
-#: src/files.c:654
-#, fuzzy, c-format
+#: src/files.c:895
+#, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
-msgstr[0] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄÏË (ÐÅÒÅÔ×ÏÒÅÎÏ Ú ÆÏÒÍÁÔÕ DOS)"
-msgstr[1] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄËÁ (ÐÅÒÅÔ×ÏÒÅÎÉÈ Ú ÆÏÒÍÁÔÕ DOS)"
-msgstr[2] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄË¦× (ÐÅÒÅÔ×ÏÒÅÎÉÈ Ú ÆÏÒÍÁÔÕ DOS)"
+msgstr[0] "Прочитано %lu р�док (перетворено з формату DOS)"
+msgstr[1] "Прочитано %lu р�дки (перетворено з формату DOS)"
+msgstr[2] "Прочитано %lu р�дків (перетворено з формату DOS)"
 
-#: src/files.c:658
-#, fuzzy, c-format
+#: src/files.c:899
+#, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄÏË (ÐÅÒÅÔ×ÏÒÅÎÏ Ú ÆÏÒÍÁÔÕ DOS)"
-msgstr[1] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄËÁ (ÐÅÒÅÔ×ÏÒÅÎÉÈ Ú ÆÏÒÍÁÔÕ DOS)"
-msgstr[2] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄË¦× (ÐÅÒÅÔ×ÏÒÅÎÉÈ Ú ÆÏÒÍÁÔÕ DOS)"
+msgstr[0] ""
+"Прочитано %lu р�док (перетворено з формату DOS; попередженн�: немає до�тупу "
+"на запи�)"
+msgstr[1] ""
+"Прочитано %lu р�дка (перетворено з формату DOS; попередженн�: немає до�тупу "
+"на запи�)"
+msgstr[2] ""
+"Прочитано %lu р�дків (перетворено з формату DOS; попередженн�: немає до�тупу "
+"на запи�)"
 
-#: src/files.c:664
-#, fuzzy, c-format
+#: src/files.c:905
+#, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
-msgstr[0] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄÏË"
-msgstr[1] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄËÁ"
-msgstr[2] "ðÒÏÞÉÔÁÎÏ %d ÒÑÄ˦×"
+msgstr[0] "Прочитано %lu р�док"
+msgstr[1] "Прочитано %lu р�дки"
+msgstr[2] "Прочитано %lu р�дків"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Прочитано %lu р�док (попередженн�: немає до�тупу на запи�)"
+msgstr[1] "Прочитані %lu р�дки (попередженн�: немає до�тупу на запи�)"
+msgstr[2] "Прочитано %lu р�дків (попередженн�: немає до�тупу на запи�)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
-msgstr "þÉÔÁ¤ÍÏ ÆÁÊÌ.."
+msgstr "Читаємо файл.."
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
-msgstr "îÏ×ÉÊ ÆÁÊÌ"
+msgstr "�овий файл"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
-msgstr "\"%s\" ÎÅ ÚÎÁÊÄÅÎÏ"
+msgstr "\"%s\" не знайдено"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
-msgstr "æÁÊÌ \"%s\" ¤ ÄÉÒÅËÔÏÒ¦¤À"
+msgstr "«%s» є каталогом"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
-#, fuzzy, c-format
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
+#, c-format
 msgid "\"%s\" is a device file"
-msgstr "æÁÊÌ \"%s\" ¤ ÆÁÊÌÏÍ ÐÒÉÓÔÒÏÀ"
+msgstr "«%s» є файлом при�трою"
 
-#: src/files.c:817
-#, fuzzy, c-format
+#: src/files.c:1060
+#, c-format
 msgid "Command to execute in new buffer [from %s] "
-msgstr "æÁÊÌ ÄÏ ×ÓÔÁ×ËÉ (× ÎÏ×ÉÊ ÂÕÆÅÒ) [×¦Ä %s] "
+msgstr "Команда, �ку �лід виконати у новому буфері [з %s] "
 
-#: src/files.c:819
-#, fuzzy, c-format
+#: src/files.c:1062
+#, c-format
 msgid "Command to execute [from %s] "
-msgstr "ëÏÍÁÎÄÁ ÄÏ ×ÉËÏÎÁÎÎÑ "
+msgstr "Команда, �ку �лід виконати [з %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
-msgstr "æÁÊÌ ÄÏ ×ÓÔÁ×ËÉ (× ÎÏ×ÉÊ ÂÕÆÅÒ) [×¦Ä %s] "
+msgstr "Файл до в�тавки (в новий буфер) [від %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
-msgstr "æÁÊÌ ÄÏ ×ÓÔÁ×ËÉ [×¦Ä %s] "
+msgstr "Файл до в�тавки [від %s] "
 
-#: src/files.c:1077
-#, fuzzy
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
-msgstr "îÅצÒÎÁ ËÎÏÐËÁ × ÎÅ-ÍÕÌØÔÉÂÕÆÅÒÎÏÍÕ ÒÅÖÉͦ"
+msgstr "Клавіша недій�на у не мультибуферному режимі"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"�е вдало�� запи�ати дані до файла резервної копії, продовжити �пробу "
+"зберегти дані? (�ати�ніть N, �кщо не певні) "
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
-msgstr "îÅ ÍÏÖÕ ÚÁÐÉÓÁÔÉ ÐÏÚÁ %s"
+msgstr "�е можу запи�ати поза %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
+"�е можна допи�увати на початку або наприкінці �имволічного по�иланн�, �кщо "
+"в�тановлено --nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
-msgstr ""
+msgstr "Помилка під ча� �проби запи�ати до файла резервної копії %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
-#, fuzzy
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
-msgstr ""
-"\n"
-"%s ÎÅ ÚÁÐÉÓÁÎÏ (ÎÁÄÔÏ ÂÁÇÁÔÏ ÒÅÚÅÒ×ÎÉÈ ÆÁÊ̦×?)\n"
+msgstr "Забагато файлів резервних копій?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
-#, fuzzy, c-format
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
+#, c-format
 msgid "Error writing %s: %s"
-msgstr "ðÏÇÁÎÉÊ ÒÑÄÏË ÃÉÔÕ×ÁÎÎÑ %s: %s"
+msgstr "Помилка під ча� �проби запи�ати %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr ""
+msgstr "Помилка під ча� �проби запи�ати до тимча�ового файла: %s"
 
-#: src/files.c:1900
-#, fuzzy, c-format
+#: src/files.c:2173
+#, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
-msgstr[0] "úÁÐÉÓÁÎÏ %d ÒÑÄÏË"
-msgstr[1] "úÁÐÉÓÁÎÏ %d ÒÑÄËÁ"
-msgstr[2] "úÁÐÉÓÁÎÏ %d ÒÑÄ˦×"
+msgstr[0] "Запи�ано %lu р�док"
+msgstr[1] "Запи�ано %lu р�дки"
+msgstr[2] "Запи�ано %lu р�дків"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
-msgstr " [ÆÏÒÍÁÔ DOS]"
+msgstr " [формат DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
-msgstr " [ÆÏÒÍÁÔ Mac]"
+msgstr " [формат Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
-msgstr " [òÅÚÅÒ×]"
+msgstr " [Резерв]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
-msgstr "äÏÄÁÔÉ ÷ÉĦÌÅÎÅ ÄÏ ÆÁÊÌÕ (× ÐÏÞÁÔÏË ÆÁÊÌÁ)"
+msgstr "Допи�ати позначене до файла на початку"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "äÏÄÁÔÉ ÷ÉĦÌÅÎÅ ÄÏ ÆÁÊÌÕ"
+msgstr "Допи�ати позначене до файла наприкінці"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
-msgstr "úÁÐÉÓÁÔÉ ÷ÉĦÌÅÎÅ ÄÏ ÆÁÊÌÕ"
+msgstr "Запи�ати позначене до файла"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
-msgstr "¶Í'Ñ ÆÁÊÌÕ ÄÌÑ ÄÏÄÁ×ÁÎÎÑ"
+msgstr "�азва файла дл� допи�уванн�"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
-msgstr "¶Í'Ñ ÆÁÊÌÕ ÄÌÑ ÄÏÄÁ×ÁÎÎÑ"
+msgstr "�азва файла дл� допи�уванн�"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
-msgstr "¶Í'Ñ ÆÁÊÌÕ ÄÏ ÚÁÐÉÓÕ"
+msgstr "�азва файла дл� запи�уванн�"
 
-#: src/files.c:2153
-#, fuzzy
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
-msgstr "æÁÊÌ ¦ÓÎÕ¤, ðåòåðéóáôé ?"
+msgstr "Файл і�нує, ПЕРЕЗ�ПИС�ТИ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
-msgstr ""
+msgstr "Зберегти файл з іншою назвою? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr ""
+"З ча�у, коли було відкрито файл, до нього було вне�ено зміни. Продовжити "
+"�проби зберегти дані? "
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
-msgstr "(ÄÁ̦)"
+msgstr "(далі)"
 
-#: src/files.c:2694 src/rcfile.c:1220
-#, fuzzy, c-format
+#: src/files.c:2974
+#, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"îÁÖͦÔØ Enter ÝÏ ÐÒÏÄÏ×ÖÉÔÉ ÚÁ×ÁÎÔÁÖÅÎÎÑ nano\n"
-
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "óËÁÓÕ×ÁÔÉ"
+"�ати�ніть Enter, щоб продовжити\n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "úÁͦÎÁ"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"�е вдало�� �творити каталог %s: %s\n"
+"Цей каталог потрібен дл� зберіганн� та завантаженн� журналу пошуку або даних "
+"щодо позиції кур�ора.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "îÅ úÁͦÝÁÔÉ"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"�дре�а %s не є адре�ою каталогу, хоча має нею бути.\n"
+"Nano не зможе завантажувати або зберігати дані щодо журналу пошуку та "
+"позицій кур�ора.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "òÅÇúÁÌÅÖ"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Ви�влено за�тарілий файл журналу (%s). Виконано �пробу перене�ти\n"
+"його до бажаного мі�ц� (%s), втім, �тала�� помилка: %s"
 
-#: src/global.c:421
-#, fuzzy
-msgid "Backwards"
-msgstr " [îÁÚÁÄ]"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Ви�влено за�тарілий файл журналу nano (%s), �кий перене�ено до\n"
+"відповідного мі�ц� (%s)\n"
+"(див. «Поширені питанн�» щодо nano, щоб дізнати�� більше про цю зміну)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "æÏÒÍ÷ÉÒ"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Вихід"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-#, fuzzy
-msgid "PrevHstory"
-msgstr "¶ÓÔÏÒ¦Ñ"
+#: src/global.c:478
+msgid "Close"
+msgstr "Закрити"
 
-#: src/global.c:452
-#, fuzzy
-msgid "NextHstory"
-msgstr "¶ÓÔÏÒ¦Ñ"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Ска�Виріз"
 
-#: src/global.c:453
-#, fuzzy
-msgid "Go To Text"
-msgstr "äÏ òÑÄËÁ"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "Ска�Вирівн"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
-#, fuzzy
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
-msgstr "ðÏÛÕË"
+msgstr "Знайти далі"
 
-#: src/global.c:457
-#, fuzzy
-msgid "First File"
-msgstr "ðÅÒÛÉÊ òÑÄÏË"
-
-#: src/global.c:458
-#, fuzzy
-msgid "Last File"
-msgstr "ïÓÔÁÎÎ¦Ê òÑÄÏË"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "äÏ æÁÊ̦×"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "ÆÏÒÍÁÔ DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "ÆÏÒÍÁÔ Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "äÏÄÁÔÉ"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "äÏÄÁÔÉ(0)"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "úÒÏÂÉÔÉ ÒÅÚÅÒ×ÎÕ ËÏЦÀ"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "÷ÉËÏÎÁÔÉ ËÏÍÁÎÄÕ"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "äÏ äÉÒÅËÔÏÒ¦§"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "äÏÐÏÍÏÇÁ"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "÷ÉȦÄ"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
-msgstr "ðÏÛÕË"
+msgstr "Пошук"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "ðÏÐ.óÔÏÒ."
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "îÁÓÔ.óÔÏÒ."
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "ðÅÒÛÉÊ òÑÄÏË"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Заміна"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "ïÓÔÁÎÎ¦Ê òÑÄÏË"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "До Р�дка"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "ðÒÉÚÕÐÉÎËÁ -"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "ПопР�док"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr ""
+#: src/global.c:496
+msgid "Next Line"
+msgstr "�а�тР�док"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr ""
+#: src/global.c:497
+msgid "Read File"
+msgstr "Чит. файл"
 
-#: src/global.c:491
-#, fuzzy
+#: src/global.c:499
 msgid "FullJstify"
-msgstr "÷ÉÒ¦×ÎÀ×ÁÎÎÑ"
+msgstr "Вирівн�ти"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
-msgstr "ðÅÒÅÍÁÌÀ×ÁÔÉ"
-
-#: src/global.c:495
-#, fuzzy
-msgid "Insert File"
-msgstr "îÁÓÔÕÐÎÉÊ ÆÁÊÌ"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "äÏ òÑÄËÁ"
-
-#: src/global.c:500
-msgid "Justify the current paragraph"
-msgstr "÷ÉÒ¦×ÎÑÔÉ ÐÏÔÏÞÎÉÊ ÁÂÚÁÃ"
+msgstr "Перемалювати"
 
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:507
+msgid "Justify the current paragraph"
+msgstr "Вирівн�ти поточний абзац"
+
+#: src/global.c:509
 msgid "Cancel the current function"
-msgstr "óËÁÓÕ×ÁÔÉ ÐÏÔÏÞÎÕ ÆÕÎËæÀ"
+msgstr "Ска�увати поточну функцію"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
-msgstr ""
+msgstr "Показати цю довідку"
 
-#: src/global.c:509
-#, fuzzy
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
-msgstr "úÁËÒÉÔÉ ÚÁ×ÁÎÔÁÖÅÎÉÊ ÚÁÒÁÚ ÆÁÊÌ/÷ÉÊÔÉ ¦Ú nano"
+msgstr "Закрити буфер поточного файла  / Вийти з nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
-msgstr "÷ÉÈ¦Ä Ú nano"
+msgstr "Вихід з nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
-msgstr "úÁÐÉÓÁÔÉ ÐÏÔÏÞÎÉÊ ÆÁÊÌ ÎÁ ÄÉÓË"
+msgstr "Запи�ати поточний файл на ди�к"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
-msgstr "÷ÓÔÁ×ÉÔÉ ¦ÎÛÉÊ ÆÁÊÌ ÄÏ ÐÏÔÏÞÎÏÇÏ"
+msgstr "В�тавити інший файл до поточного"
 
-#: src/global.c:519
-#, fuzzy
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "æÏÒÍÁÌØΦ ×ÉÒÁÚÉ (regexp)"
+msgstr "Шукати р�док або формальний вираз"
 
-#: src/global.c:520
-#, fuzzy
-msgid "Go to previous screen"
-msgstr "ðÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØÏÇÏ ÅËÒÁÎÕ"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Шукати р�док"
 
-#: src/global.c:521
-#, fuzzy
-msgid "Go to next screen"
-msgstr "ðÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎÏÇÏ ÅËÒÁÎÕ"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "�а один екран вгору"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "�а один екран вниз"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "÷ÉÒ¦ÚÁÔÉ ÐÏÔÏÞÎÉÊ ÒÑÄÏË ÔÁ ÐÏͦÓÔÉÔÉ ÊÏÇÏ ÄÏ \"ËÉÛÅΦ\""
+msgstr "Вирізати поточний р�док та помі�тити його до \"кишені\""
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "óËÁÓÕ×ÁÔÉ ×ÉÒ¦ÚÁÎÎÑ ÔÁ ×ÓÔÁ×ÉÔÉ ÚͦÓÔ \"ËÉÛÅΦ\" ÄÏ ÐÏÔÏÞÎÏÇÏ ÒÑÄËÁ"
+msgstr "Ска�увати вирізанн� та в�тавити змі�т \"кишені\" до поточного р�дка"
 
-#: src/global.c:527
-#, fuzzy
+#: src/global.c:534
 msgid "Display the position of the cursor"
-msgstr "ðÏËÁÚÁÔÉ ÐÏÚÉæÀ ËÕÒÓÏÒÁ"
+msgstr "Показати розташуванн� кур�ора"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
-msgstr "÷ÉËÌÉËÁÔÉ ÐÒÏÇÒÁÍÕ ÐÏÛÕËÕ ÄÒÕËÁÒÓØËÉÈ ÐÏÍÉÌÏË (ÑËÝÏ ¤)"
+msgstr "Викликати програму пошуку друкар�ьких помилок (�кщо є)"
 
-#: src/global.c:531
-#, fuzzy
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "æÏÒÍÁÌØΦ ×ÉÒÁÚÉ (regexp)"
+msgstr "Замінити р�док або формальний вираз"
 
-#: src/global.c:532
-#, fuzzy
+#: src/global.c:539
 msgid "Go to line and column number"
-msgstr "ðÅÒÅÊÔÉ ÄÏ ×ËÁÚÁÎÏÇÏ ÒÑÄËÁ"
+msgstr "Йти до р�дка та номеру �товпчика"
 
-#: src/global.c:534
-#, fuzzy
-msgid "Mark text at the cursor position"
-msgstr "ðÏͦÔÉÔÉ ÔÅËÓÔ Ð¦Ä ÐÏÔÏÞÎÏÀ ÐÏÚÉæ¤À ËÕÒÓÏÒÁ"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "Позначити тек�т, починаючи з поточної позиції кур�ора"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr ""
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Повторити о�танній пошук"
 
-#: src/global.c:537
-#, fuzzy
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "÷ÉÒ¦ÚÁÔÉ ÐÏÔÏÞÎÉÊ ÒÑÄÏË ÔÁ ÐÏͦÓÔÉÔÉ ÊÏÇÏ ÄÏ \"ËÉÛÅΦ\""
+msgstr "Скопіювати поточний р�док та зберегти його до \"кишені\""
 
-#: src/global.c:538
-#, fuzzy
+#: src/global.c:545
 msgid "Indent the current line"
-msgstr "äÏÄÁÔÉ ÄÏ ÐÏÔÏÞÎÏÇÏ ÆÁÊÌÕ"
+msgstr "Додати від�туп у поточному р�дку"
 
-#: src/global.c:539
-#, fuzzy
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "äÏÄÁÔÉ ÄÏ ÐÏÔÏÞÎÏÇÏ ÆÁÊÌÕ"
+msgstr "Вилучити від�туп дл� поточного р�дка"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr ""
+msgstr "Ска�увати о�танню дію"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "Відновити о�танню �ка�овану дію"
 
-#: src/global.c:543
-#, fuzzy
+#: src/global.c:550
 msgid "Go forward one character"
-msgstr "÷ÐÅÒÅÄ ÎÁ ÏÄÎÕ Ì¦ÔÅÒÕ"
+msgstr "Вперед на один �имвол"
 
-#: src/global.c:544
-#, fuzzy
+#: src/global.c:551
 msgid "Go back one character"
-msgstr "îÁÚÁÄ ÎÁ ÏÄÎÕ Ì¦ÔÅÒÕ"
+msgstr "�азад на один �имвол"
 
-#: src/global.c:546
-#, fuzzy
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "÷ÐÅÒÅÄ ÎÁ ÏÄÎÅ ÓÌÏ×Ï"
+msgstr "Вперед на одне �лово"
 
-#: src/global.c:547
-#, fuzzy
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "îÁÚÁÄ ÎÁ ÏÄÎÅ ÓÌÏ×Ï"
+msgstr "�азад на одне �лово"
 
-#: src/global.c:549
-#, fuzzy
+#: src/global.c:556
 msgid "Go to previous line"
-msgstr "ðÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØÏÇÏ ÅËÒÁÎÕ"
+msgstr "Повернути�� до попереднього р�дка"
 
-#: src/global.c:550
-#, fuzzy
+#: src/global.c:557
 msgid "Go to next line"
-msgstr "ðÅÒÅͦÓÔÉÔÉÓÑ ÎÁ ÒÑÄÏË ÎÉÖÞÅ"
+msgstr "Перейти до на�тупного р�дка"
 
-#: src/global.c:551
-#, fuzzy
+#: src/global.c:558
 msgid "Go to beginning of current line"
-msgstr "ðÅÒÅͦÓÔÉÔÉÓÑ ÄÏ ÐÏÞÁÔËÕ ÐÏÔÏÞÎÏÇÏ ÒÑÄËÁ"
+msgstr "Перейти до початку р�дка"
 
-#: src/global.c:552
-#, fuzzy
+#: src/global.c:559
 msgid "Go to end of current line"
-msgstr "ðÅÒÅͦÓÔÉÔÉÓÑ ÎÁ ˦ÎÅÃØ ÐÏÔÏÞÎÏÇÏ ÒÑÄËÁ"
+msgstr "Перейти до кінц� р�дка"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr ""
+msgstr "�а початок поточного абзацу; потім на�тупного абзацу"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr ""
+msgstr "У кінець поточного абзацу; потім на�тупного абзацу"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
-msgstr "ðÅÒÅͦÓÔÉÔÉÓÑ ÄÏ ÐÅÒÛÏÇÏ ÒÑÄËÁ ÆÁÊÌÕ"
+msgstr "Перейти до першого р�дка файла"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
-msgstr "ðÅÒÅͦÓÔÉÔÉÓÑ ÄÏ ÏÓÔÁÎÎØÏÇÏ ÒÑÄËÁ ÆÁÊÌÕ"
+msgstr "Перейти до о�таннього р�дка файла"
 
-#: src/global.c:564
-#, fuzzy
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "îÅÍÁ צÄÐÏצÄÎϧ ÄÕÖËÉ"
+msgstr "Перейти до відповідної дужки"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
-msgstr ""
+msgstr "Гортати на один р�док вгору без переміщенн� кур�ора"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
-msgstr ""
+msgstr "Гортати на один р�док вниз без переміщенн� кур�ора"
 
-#: src/global.c:572
-#, fuzzy
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
-msgstr "ðÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØÏÇÏ ÅËÒÁÎÕ"
+msgstr "Перемкнути�� на попередній файловий буфер"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
-msgstr ""
+msgstr "Перемкнути�� на на�тупний файловий буфер"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr ""
+msgstr "В�тавити на�тупну комбінацію клавіш �к є"
 
-#: src/global.c:579
-#, fuzzy
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
-msgstr "÷ÓÔÁ×ÉÔÉ ÓÉÍ×ÏÌ CR (ÐÏ×ÅÒÎÅÎÎÑ ÇÏ̦×ËÉ) × ÐÏÚ. ËÕÒÓÏÒÁ"
+msgstr "В�тавити знак табул�ції в мі�це розташуванн� кур�ора"
 
 #: src/global.c:581
-#, fuzzy
 msgid "Insert a newline at the cursor position"
-msgstr "÷ÓÔÁ×ÉÔÉ ÓÉÍ×ÏÌ CR (ÐÏ×ÅÒÎÅÎÎÑ ÇÏ̦×ËÉ) × ÐÏÚ. ËÕÒÓÏÒÁ"
+msgstr "В�тавити новий р�док у мі�ці розташуванн� кур�ора"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
-msgstr "÷ÉÄÁÌÉÔÉ Ì¦ÔÅÒÕ Ð¦Ä ËÕÒÓÏÒÏÍ"
+msgstr "Видалити літеру під кур�ором"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
-msgstr "÷ÉÄÁÌÉÔÉ Ì¦ÔÅÒÕ Ú̦×Á ×¦Ä ËÕÒÓÏÒÁ"
+msgstr "Видалити літеру зліва від кур�ора"
 
-#: src/global.c:588
-#, fuzzy
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
-msgstr "óËÁÓÕ×ÁÔÉ ×ÉÒ¦ÚÁÎÎÑ ÔÁ ×ÓÔÁ×ÉÔÉ ÚͦÓÔ \"ËÉÛÅΦ\" ÄÏ ÐÏÔÏÞÎÏÇÏ ÒÑÄËÁ"
+msgstr "Вирізати від позиції кур�ора до кінц� файла"
 
-#: src/global.c:591
-#, fuzzy
+#: src/global.c:590
 msgid "Justify the entire file"
-msgstr "÷ÉÒ¦×ÎÑÔÉ ÐÏÔÏÞÎÉÊ ÁÂÚÁÃ"
+msgstr "Вирівн�ти цілий файл"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
-msgstr ""
+msgstr "Підрахувати кількі�ть �лів, р�дків та �имволів"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
-msgstr "ðÅÒÅÍÁÌÀ×ÁÔÉ ÐÏÔÏÞÎÉÊ ÅËÒÁÎ"
+msgstr "Перемалювати поточний екран"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "Призупинити редактор (�кщо увімкнено)"
 
-#: src/global.c:603
-#, fuzzy
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr "òÅÇÉÓÔÒÏÚÁÌÅÖÎÉÊ ÐÏÛÕË"
+msgstr "Увімкнути/вимкнути чутливі�ть пошуку до регі�тру"
 
-#: src/global.c:605
-#, fuzzy
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "ðÏËÁÚÁÔÉ ÐÏÚÉæÀ ËÕÒÓÏÒÁ"
+msgstr "Змінити напр�мок пошуку на протилежний"
 
-#: src/global.c:609
-#, fuzzy
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
-msgstr "æÏÒÍÁÌØΦ ×ÉÒÁÚÉ (regexp)"
+msgstr "Увімкнути/вимкнути викори�танн� формальних виразів"
 
-#: src/global.c:613
-#, fuzzy
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "òÅÄÁÇÕ×ÁÔÉ ÐÏÐÅÒÅÄÎ¦Ê ÒÑÄÏË ÐÏÛÕËÕ/ÚÁͦÎÉ"
+msgstr "Згадати попередній р�док пошуку/заміни"
 
-#: src/global.c:615
-#, fuzzy
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "òÅÄÁÇÕ×ÁÔÉ ÐÏÐÅÒÅÄÎ¦Ê ÒÑÄÏË ÐÏÛÕËÕ/ÚÁͦÎÉ"
+msgstr "Згадати на�тупний р�док пошуку/заміни"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
-msgstr "äÏ ÐÅÒÅÇÌÑÄÁÞÁ ÆÁÊ̦×"
+msgstr "До перегл�дача файлів"
 
-#: src/global.c:621
-#, fuzzy
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "úÁÐÉÓ ÆÁÊÌÕ Õ ÆÏÒÍÁÔ¦ DOS"
+msgstr "Увімкнути/вимкнути викори�танн� формату DOS"
 
-#: src/global.c:622
-#, fuzzy
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "úÁÐÉÓ ÆÁÊÌÕ Õ ÆÏÒÍÁÔ¦ Mac"
+msgstr "Увімкнути/вимкнути викори�танн� формату Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
-msgstr ""
+msgstr "Увімкнути/вимкнути додаванн� до кінц�"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr ""
+msgstr "Увімкнути/вимкнути додаванн� до початку"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
-msgstr ""
+msgstr "Увімкнути/вимкнути резервне копіюванн� початкового файла"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
-msgstr "÷ÉËÏÎÁÔÉ ÚÏ×ΦÛÎÀ ËÏÍÁÎÄÕ"
+msgstr "Виконати зовнішню команду"
 
-#: src/global.c:633
-#, fuzzy
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "ðÅÒÅÍÉËÎÕÔÉ ÒÅÖÉÍ ×ÓÔÁ×ËÉ × ÎÏ×ÉÊ ÂÕÆÅÒ"
+msgstr "Увімкнути/вимкнути викори�танн� нового буферу"
 
-#: src/global.c:636
-#, fuzzy
+#: src/global.c:631
 msgid "Exit from the file browser"
-msgstr "äÏ ÐÅÒÅÇÌÑÄÁÞÁ ÆÁÊ̦×"
+msgstr "Вийти з перегл�дача файлів"
 
-#: src/global.c:638
-#, fuzzy
+#: src/global.c:632
 msgid "Go to the first file in the list"
-msgstr "ðÅÒÅͦÓÔÉÔÉÓÑ ÄÏ ÐÅÒÛÏÇÏ ÒÑÄËÁ ÆÁÊÌÕ"
+msgstr "Перейти до першого файла у �пи�ку"
 
-#: src/global.c:640
-#, fuzzy
+#: src/global.c:633
 msgid "Go to the last file in the list"
-msgstr "ðÅÒÅͦÓÔÉÔÉÓÑ ÄÏ ÏÓÔÁÎÎØÏÇÏ ÒÑÄËÁ ÆÁÊÌÕ"
+msgstr "Перейти до о�таннього файла у �пи�ку"
 
-#: src/global.c:641
-#, fuzzy
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "Перейти до попереднього файла у �пи�ку"
+
+#: src/global.c:635
 msgid "Go to the next file in the list"
-msgstr "ðÅÒÅͦÓÔÉÔÉÓÑ ÄÏ ÏÓÔÁÎÎØÏÇÏ ÒÑÄËÁ ÆÁÊÌÕ"
+msgstr "Перейти до на�тупного файла у �пи�ку"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "До каталогу"
+
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "Викликати linter, �кщо до�тупний"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "До попереднього пов. linter"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "Перейти до на�тупного повідомленн� linter"
 
 #: src/global.c:642
-#, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "ðÅÒÅͦÓÔÉÔÉÓÑ ÄÏ ÐÅÒÛÏÇÏ ÒÑÄËÁ ÆÁÊÌÕ"
+msgid "Invoke formatter, if available"
+msgstr "Викликати formatter, �кщо до�тупний"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "äÏ äÉÒÅËÔÏÒ¦§"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Довідка"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "úÁËÒÉÔÉ"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Ска�увати"
+
+#: src/global.c:678
+msgid "Write Out"
+msgstr "Випи�ати"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
-msgstr "úÁÐÉÓÁÔÉ"
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "До каталогу"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Вирізати"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:728
 msgid "Justify"
-msgstr "÷ÉÒ¦×ÎÀ×ÁÎÎÑ"
+msgstr "Вирівн�ти"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "þÉÔ. æÁÊÌ"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Правопи�"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "÷ÉÒ¦ÚÁÔÉ"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "До linter"
+
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Formatter"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "РегЗалеж"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "ФормВир"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "óËÁÓ÷ÉÒ¦×Î"
+#: src/global.c:755
+msgid "Backwards"
+msgstr "�азад"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-#, fuzzy
-msgid "UnCut Text"
-msgstr "óËÁÓ÷ÉÒ¦Ú"
+#: src/global.c:762
+msgid "No Replace"
+msgstr "�е Заміщати"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
-msgstr "ðÏÚÉæÑ"
+msgstr "Позиці�"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "ðÒÁ×ÏÐÉÓ"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "Поп.Стор."
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "�а�т.Стор."
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Перший Р�док"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "О�танній Р�док"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "До дужки"
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
-msgstr "ðÏͦÔÉÔÉ"
+msgstr "Помітити"
 
-#: src/global.c:777
-#, fuzzy
+#: src/global.c:800
 msgid "Copy Text"
-msgstr "÷ÉÒ¦ÚÁÔÉ"
+msgstr "Скопіювати тек�т"
 
-#: src/global.c:780
-#, fuzzy
+#: src/global.c:803
 msgid "Indent Text"
-msgstr "÷ÉÒ¦ÚÁÔÉ"
+msgstr "Від�туп"
 
-#: src/global.c:783
-#, fuzzy
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "óËÁÓ÷ÉÒ¦Ú"
+msgstr "Ска�Від�т"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
-msgstr ""
+msgstr "Ска�увати"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
-msgstr ""
-
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "÷ÐÅÒÅÄ"
+msgstr "Повторити"
 
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
-msgstr "îÁÚÁÄ"
+msgstr "�азад"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "îÁÓÔóÌÏ×Ï"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Вперед"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
-msgstr "ðÏÐóÌÏ×Ï"
+msgstr "ПопСлово"
 
-#: src/global.c:824
-#, fuzzy
-msgid "Prev Line"
-msgstr "ðÏÐ.óÔÏÒ."
-
-#: src/global.c:827
-#, fuzzy
-msgid "Next Line"
-msgstr "îÁÓÔÕÐÎÉÊ ÆÁÊÌ"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "�а�тСлово"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
-msgstr "ðÏÞÁÔÏË"
+msgstr "Початок"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
-msgstr "ë¦ÎÅÃØ"
+msgstr "Кінець"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "úÎÁÊÔÉ äÒÕÇÕ äÕÖËÕ"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "Поч.абзацу"
 
-#: src/global.c:848
-msgid "Scroll Up"
-msgstr ""
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Кін.абзацу"
 
 #: src/global.c:851
-msgid "Scroll Down"
-msgstr ""
+msgid "Scroll Up"
+msgstr "Гортати вгору"
 
-#: src/global.c:856
-msgid "Previous File"
-msgstr "ðÏÐÅÒÅÄÎ¦Ê æÁÊÌ"
+#: src/global.c:853
+msgid "Scroll Down"
+msgstr "Гортати вниз"
 
 #: src/global.c:858
+msgid "Prev File"
+msgstr "Поп. файл"
+
+#: src/global.c:860
 msgid "Next File"
-msgstr "îÁÓÔÕÐÎÉÊ ÆÁÊÌ"
+msgstr "�а�тупний файл"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr ""
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "Буквально"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
-msgstr "ôÁÂÕÌÑæÑ"
+msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
-msgstr "÷×ÏÄ"
+msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
-msgstr "÷ÉÄÁÌÉÔÉ"
+msgstr "Delete"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
-msgstr "úÁ¦Ê"
+msgstr "Backspace"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
-msgstr ""
+msgstr "ВирДоКінц�"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
-msgstr ""
+msgstr "Кількі�ть �лів"
+
+#: src/global.c:905
+msgid "Suspend"
+msgstr "Призупинка -"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "ПопЖурнал"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "�а�тЖурнал"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "До тек�ту"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "формат DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "формат Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Додати"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Додати(0)"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Зробити резервну копію"
 
-#: src/global.c:1367
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Виконати команду"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "До Файлів"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Перший файл"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "О�т. файл"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "Поп. пов. lint"
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "�а�т. пов. lint"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
-msgstr "òÅÖÉÍ ÄÏÐÏÍÏÇÉ"
+msgstr "Режим довідки"
 
-#: src/global.c:1369
-#, fuzzy
+#: src/global.c:1229
 msgid "Constant cursor position display"
-msgstr "ðÏÓÔ¦ÊÎÁ ÐÏÚÉÃ¦Ñ ËÕÒÓÏÒÁ"
+msgstr "По�тійно показувати мі�це розташуванн� кур�ора"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
-msgstr ""
+msgstr "Викори�танн� додаткового р�дка дл� редагуванн�"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
-msgstr "ðÌÁ×ÎÁ ÐÒÏËÒÕÔËÁ"
+msgstr "Плавна прокрутка"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "М’�ке перене�енн� надто довгих р�дків"
+
+#: src/global.c:1237
 msgid "Whitespace display"
-msgstr ""
+msgstr "Показ пробілів"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
-msgstr "ð¦ÄÓצÞÕ×ÁÎÎÑ ÓÉÎÔÁËÓÉÓÕ ËÏÌØÏÒÏÍ"
+msgstr "Під�вічуванн� �интак�и�у кольором"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
-msgstr ""
+msgstr "Розумна клавіша Home"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
-msgstr "á×ÔÏ-×ÉÒ¦×ÎÀ×ÁÎÎÑ"
+msgstr "�втовід�туп"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
-msgstr "÷ÉÒ¦ÚÁÔÉ ÄÏ Ë¦ÎÃÑ"
+msgstr "Вирізати до кінц�"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr ""
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Жор�тке перене�енн� надзвичайно довгих р�дків"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
-msgstr ""
+msgstr "Перетворенн� знаків табул�ції на пробіли"
 
-#: src/global.c:1389
-#, fuzzy
+#: src/global.c:1251
 msgid "Backup files"
-msgstr "úÒÏÂÉÔÉ ÒÅÚÅÒ×ÎÕ ËÏЦÀ"
+msgstr "Резервні копії"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
-msgstr "äÅ˦ÌØËÁ ÆÁÊÌÏ×ÉÈ ÂÕÆÅÒ¦×"
+msgstr "Декілька файлових буферів"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
-msgstr "ð¦ÄÔÒÉÍËÁ ÍÉÛ¦"
+msgstr "Підтримка миші"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
-msgstr "îÅÍÁ ÐÅÒÅÔ×ÏÒÀ×ÁÎÎÑ ¦Ú DOS/Mac ÆÏÒÍÁÔÕ"
+msgstr "�ема перетворюванн� із DOS/Mac формату"
 
-#: src/global.c:1397
-#, fuzzy
+#: src/global.c:1259
 msgid "Suspension"
-msgstr "ðÒÉÚÕÐÉÎËÁ -"
+msgstr "Призупиненн�"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr ""
-
-#: src/help.c:236
-#, fuzzy
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1042,20 +1103,17 @@ msgid ""
 "prompt.  Hitting Enter without entering any text will perform the previous "
 "search.  "
 msgstr ""
-"ôÅËÓÔ ÄÏÐÏÍÏÇÉ ËÏÍÁÎÄÉ ÐÏÛÕËÕ\n"
-"\n"
-" ÷×ÅĦÔØ ÓÌÏ×Á ÁÂÏ Ì¦ÔÅÒÉ Ñ˦ ÷É ÛÕËÁ¤ÔÅ, ÔÁ ÎÁÔÉÓΦÔØ Enter. ñËÝÏ ÄÌÑ "
-"××ÅÄÅÎϧ ÷ÁÍÉ ÕÍÏ×É ÚÎÁÊÄÅÔØÓÑ ×¦ÄÐÏצÄÎÉÊ Ú¦Ç, ÅËÒÁÎ ÐÅÒÅͦÓÔÉÔØÓÑ × "
-"ÐÏÌÏÖÅÎÎÑ ÐÏÂÌÉÚÕ ÃØÏÇÏ Ú¦ÇÕ.\n"
-"\n"
-" ðÏÐÅÒÅÄÎÑ ÕÍÏ×Á Ú¦ÇÕ Ú'Ñ×ÉÔØÓÑ Õ Ë×ÁÄÒÁÔÎÉÈ ÄÕÖËÁÈ Ð¦ÓÌÑ ÚÁÐÒÏÛÅÎÎÑ "
-"\"ðÏÛÕË:\". îÁÔÉÓÎÅÎÎÑ Enter ÂÅÚ ÒÅÄÁÇÕ×ÁÎÎÑ ÂÕÄØ-ÑËÏÇÏ ÔÅËÓÔÕ ÐÒÉÚ×ÅÄÅ ÄÏ "
-"ÐÏÛÕËÕ ÐÏÐÅÒÅÄÎØϧ ÕÍÏ×É Ú¦ÇÕ.\n"
+"Довідка про команди пошуку\n"
 "\n"
-" îÁÓÔÕÐΦ ÆÕÎËæÏÎÁÌØΦ ËÌÁצۦ ÎÁÑ×Φ Õ ÒÅÖÉͦ ðÏÛÕËÕ:\n"
+" Введіть �лова чи �имволи дл� пошуку та нати�ніть Enter. Якщо введений вами "
+"тек�т буде знайдено, ви перейдете до мі�це найближчого збігу з шуканим "
+"р�дком. \n"
 "\n"
+" Попередній потрібний вам р�док буде показано в дужках пі�л� пропозиції "
+"пошуку. Якщо ви нати�нете Enter не ввівши жодного тек�ту, буде здій�нено "
+"пошук попереднього шуканого р�дка.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1063,8 +1121,13 @@ msgid ""
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
+"Якщо ви позначили тек�т та виконали пошук з заміною, то відбудеть�� заміна "
+"тільки тих збігів, що є у позначеному тек�ті. \n"
+"\n"
+" У режимі пошуку до�тупні такі функціональні клавіші:\n"
+"\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1075,17 +1138,16 @@ msgid ""
 " The following function keys are available in Go To Line mode:\n"
 "\n"
 msgstr ""
-"ôÅËÓÔ ÄÏÐÏÍÏÇÉ ÒÅÖÉÍÕ äÏ_ÒÑÄËÁ\n"
+"Тек�т довідки режиму До_р�дка\n"
 "\n"
-" ÷×ÅĦÔØ ÎÏÍÅÒ ÒÑÄËÁ ÄÏ ÑËÏÇÏ ÷É ÂÁÖÁ¤ÔŠĦÓÔÁÔÉÓØ ÔÁ ÎÁÔÉÓΦÔØ Enter. ñËÝÏ "
-"˦ÌØ˦ÓÔØ ÒÑÄË¦× Õ ÆÁÊ̦ ÍÅÎÛÁ ÚÁ ÞÉÓÌÏ ÑËÅ ÷É ××ÅÌÉ, ÷É ÐÏÐÁÄÅÔÅ ÎÁ "
-"ÏÓÔÁÎÎ¦Ê ÒÑÄÏË ÆÁÊÌÕ.\n"
+" Введіть номер р�дка, до �кого ви хочете перейти і нати�ніть Enter. Якщо "
+"кількі�ть р�дків у файлі менша за чи�ло, �ке ви ввели, ви перейдете до "
+"о�таннього р�дка файла.\n"
 "\n"
-" îÁÓÔÕÐΦ ÆÕÎËæÏÎÁÌØΦ ËÌÁצۦ ÎÁÑ×Φ Õ ÒÅÖÉͦ äÏ_ÒÑÄËÁ:\n"
+" У режимі До_р�дка можна �кори�тати�� такими функціональними клавішами:\n"
 "\n"
 
-#: src/help.c:260
-#, fuzzy
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1097,25 +1159,16 @@ msgid ""
 "Meta-F toggle, or a nanorc file, inserting a file will cause it to be loaded "
 "into a separate buffer (use Meta-< and > to switch between file buffers).  "
 msgstr ""
-"ôÅËÓÔ ÄÏÐÏÍÏÇÉ ÒÅÖÉÍÕ ÷ÓÔÁ×ÉÔÉ æÁÊÌ\n"
+"Довідка по командах пошуку\n"
 "\n"
-" ÷×ÅĦÔØ ¦Í'Ñ ÆÁÊÌÕ ÄÏ ×ÓÔÁ×ËÉ × ÐÏÔÏÞÎÉÊ ÆÁÊÌÏ×ÉÊ ÂÕÆÅÒ × ÐÏÔÏÞÎÕ ÐÏÚÉæÀ "
-"ËÕÒÓÏÒÕ.\n"
-"\n"
-" ñËÝÏ ÷ÁÛ nano Ú¦ÂÒÁÎÉÊ ¦Ú ЦÄÔÒÉÍËÏÀ ÄÅ˦ÌØËÏÈ ÆÁÊÌÏ×ÉÈ ÂÕÆÅÒ¦×, ÔÁ ÃÑ "
-"ÍÏÖÌÉצÓÔØ ×צÍËÎÅÎÁ ÞÅÒÅÚ ÏÐæ§ ËÏÍÁÎÄÎÏÇÏ ÒÑÄËÕ -F ÁÂÏ --multibuffer, ÁÂÏ "
-"ÞÅÒÅÚ ËÏͦÎÁæÀ Meta-F, ÁÂÏ ÚÁ ÄÏÐÏÍÏÇÏÀ ÆÁÊÌÕ nanorc, ÆÁÊÌ ×ÓÔÁ×ÉÔØÓÑ × "
-"ÏËÒÅÍÉÊ ÆÁÊÌÏ×ÉÊ ÂÕÆÅÒ (ËÏÒÉÓÔÕÊÔÅÓØ Meta-< ÔÁ > ÝÏ ÐÅÒÅÍÉËÁÔÉÓØ Í¦Ö "
-"ÂÕÆÅÒÁÍÉ).\n"
-"\n"
-" ñËÝÏ ÷ÁÍ ÐÏÔÒ¦ÂÅÎ ÏËÒÅÍÉÊ ÐÕÓÔÉÊ ÂÕÆÅÒ, ÐÒÏÓÔÏ ÖͦÔØ Enter × ÒÑÄËÕ "
-"ÚÁÐÒÏÛÅÎÎÑ ÂÅÚ ×ÐÉÓÕ×ÁÎÎÑ ¦ÍÅΦ ÆÁÊÌÕ, ÁÂÏ ×ÐÉÛ¦ÔØ ¦Í'Ñ ÎŦÓÎÕÀÞÏÇÏ ÆÁÊÌÕ ÔÁ "
-"ÎÁÔÉÓΦÔØ Enter.\n"
-"\n"
-" îÁÓÔÕÐΦ ÆÕÎËæÏÎÁÌØΦ ËÌÁצۦ ÎÁÑ×Φ × ÒÅÖÉͦ ÷ÓÔÁ×ÉÔÉ æÁÊÌ:\n"
+" Введіть �лова або �имволи, �кі Ви збираєте�� шукати, потім нати�ніть Enter. "
+"Якщо дл� введеного Вами знайдеть�� збіг, екран перемі�тить�� до найближчого "
+"збігу.\n"
 "\n"
+" Попередній р�док пошуку буде показано у дужках пі�л� запрошенн� 'Пошук:'. "
+"�ати�ненн� Enter без редагуванн� тек�ту продовжить попередній пошук.  "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1123,9 +1176,14 @@ msgid ""
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
+"Якщо вам потрібен ще один порожній буфер, не вводьте жодної назви файла або "
+"вкажіть файл, �кого не і�нує, потім нати�ніть Enter.\n"
+"\n"
+" У режимі «В�тавка файла» можна �кори�тати�� такими функціональними "
+"клавішами:\n"
+"\n"
 
-#: src/help.c:275
-#, fuzzy
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1140,20 +1198,21 @@ msgid ""
 " The following function keys are available in Write File mode:\n"
 "\n"
 msgstr ""
-"ôÅËÓÔ ÄÏÐÏÍÏÇÉ ÒÅÖÉÍÕ úÂÅÒÅÇÔÉ æÁÊÌ\n"
+"Довідка до режиму «Запи� файла»\n"
 "\n"
-" ÷×ÅĦÔØ ¦Í'Ñ Ð¦Ä ÑËÉÍ ÷É ÂÁÖÁ¤ÔÅ ÚÂÅÒÅÇÔÉ ÐÏÔÏÞÎÉÊ ÆÁÊÌ ÔÁ ÎÁÔÉÓΦÔØ "
-"Enter.\n"
+" �аберіть назву, �ку �лід викори�тати дл� поточного файла і нати�ніть Enter, "
+"щоб зберегти його.\n"
 "\n"
-" ñËÝÏ ÷É ËÏÒÉÓÔÕ¤ÔÅÓØ ËÏÄÏÍ ×¦ÄͦÔËÉ ¦Ú Ctrl-^ ÔÁ ÐÏͦÔÉÌÉ ÄÅÑËÉÊ ÔÅËÓÔ, "
-"Ú'Ñ×ÉÔØÓÑ ÚÁÐÉÔ ¦Ú ЦÄËÁÚËÏÀ, ÞÉ ÚÁÐÉÓÁÔÉ ÏÂÒÁÎÉÊ ÂÌÏË × ÏËÒÅÍÉÊ ÆÁÊÌ. ýÏ "
-"ÚÍÅÎÛÉÔÉ ÛÁÎÓÉ ÐÅÒÅÚÁÐÉÓÕ ÐÏÔÏÞÎÏÇÏ ÆÁÊÌÕ ÌÉÛÅ ÞÁÓÔÉÎÏÀ ÃØÏÇÏ ÆÁÊÌÕ, ¦Í'Ñ "
-"ÐÏÔÏÞÎÏÇÏ ÆÁÊÌÕ ÎÅ ÂÕÄÅ ¦Í'ÑÍ ÐÏ ÚÁÍÏ×ÞÅÎÎÀ × ÃØÏÍÕ ÒÅÖÉͦ.\n"
+" Якщо у файлі є позначений тек�т, вам запропонують зберегти лише позначений "
+"тек�т до окремого файла. Щоб зменшити ймовірні�ть перезапи�у поточного файла "
+"лише його ча�тиною, у цьому режимі поточна назва файла не є його типовою "
+"назвою.\n"
 "\n"
-" îÁÓÔÕÐΦ ÆÕÎËæÏÎÁÌØΦ ËÌÁצۦ ÎÁÑ×Φ × ÒÅÖÉͦ úÂÅÒÅÇÔÉ æÁÊÌ\n"
+" У режимі «Запи� файла» можна �кори�тати�� такими функціональними "
+"клавішами:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1166,20 +1225,20 @@ msgid ""
 " The following function keys are available in the file browser:\n"
 "\n"
 msgstr ""
-"ôÅËÓÔ ÄÏÐÏÍÏÇÉ ÒÅÖÉÍÕ ðÅÒÅÇÌÑÄÁÞ æÁÊ̦×\n"
+"Тек�т довідки режиму «Перегл�д файлів»\n"
 "\n"
-" ðÅÒÅÇÌÑÄÁÞ ÆÁÊÌ¦× ×ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ ÄÌÑ ×¦ÚÕÁÌØÎÏÇÏ ÐÅÒÅÇÌÑÄÕ ÚͦÓÔÕ "
-"ÄÉÒÅËÔÏÒ¦§ ÔÁ ÏÂÉÒÁÎÎÑ ÐÏÔÒ¦ÂÎÏÇÏ ÆÁÊÌÕ ÄÌÑ ÚÁÐÉÓÕ ÁÂÏ ÞÉÔÁÎÎÑ. ÷É ÍÁ¤ÔÅ "
-"ËÏÒÉÓÔÕ×ÁÔÉÓØ ËÌÁצÛÁÍÉ ËÅÒÕ×ÁÎÎÑ ËÕÒÓÏÒÏÍ ÔÁ PageUp/PageDown ÄÌÑ "
-"ÐÅÒÅÓÕ×ÁÎÎÑ ËÒ¦ÚØ ÆÁÊÌÉ, ÔÁ ÏÂÉÒÁÔÉ ÐÏÔÒ¦ÂÎÉÊ ÆÁÊÌ ÁÂÏ ×ÈÏÄÉÔÉ ÄÏ ÏÂÒÁÎϧ "
-"ÄÉÒÅËÔÏÒ¦§ ËÌÁצÛÅÀ S ÁÂÏ Enter. ýÏ ÐÅÒÅͦÓÔÉÔÉÓØ ÎÁ ÄÉÒÅËÔÏÒ¦À ×ÉÝÅ, "
-"ÏÂÅÒ¦ÔØ ÄÉÒÅËÔÏÒ¦À \"..\" × ÐÏÞÁÔËÕ ÓÐÉÓËÕ ÆÁÊ̦×.\n"
+" Перегл�дач файлів викори�товуєть�� дл� візуального перегл�ду вмі�ту "
+"каталогу та вибору потрібного файла дл� запи�у або читанн�. Ви маєте "
+"кори�тувати�ь клавішами керуванн� кур�ором та PageUp/PageDown дл� "
+"пере�уванн� крізь файли, та обирати потрібний файл або входити до вибраного "
+"каталогу клавішею S або Enter. Щоб перейти на каталог вище, виберіть каталог "
+"«..» на початку �пи�ку файлів.\n"
 "\n"
-" îÁÓÔÕÐΦ ÆÕÎËæÏÎÁÌØΦ ËÌÁצۦ ÎÁÑ×Φ × ÒÅÖÉͦ ðÅÒÅÇÌÑÄÁÞ æÁÊ̦×:\n"
+" У режимі перегл�ду файлів можна �кори�тати�� такими функціональними "
+"клавішами:\n"
 "\n"
 
-#: src/help.c:302
-#, fuzzy
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1192,27 +1251,25 @@ msgid ""
 "search.\n"
 "\n"
 msgstr ""
-"ôÅËÓÔ ÄÏÐÏÍÏÇÉ ËÏÍÁÎÄÉ ÐÏÛÕËÕ\n"
-"\n"
-" ÷×ÅĦÔØ ÓÌÏ×Á ÁÂÏ Ì¦ÔÅÒÉ Ñ˦ ÷É ÛÕËÁ¤ÔÅ, ÔÁ ÎÁÔÉÓΦÔØ Enter. ñËÝÏ ÄÌÑ "
-"××ÅÄÅÎϧ ÷ÁÍÉ ÕÍÏ×É ÚÎÁÊÄÅÔØÓÑ ×¦ÄÐÏצÄÎÉÊ Ú¦Ç, ÅËÒÁÎ ÐÅÒÅͦÓÔÉÔØÓÑ × "
-"ÐÏÌÏÖÅÎÎÑ ÐÏÂÌÉÚÕ ÃØÏÇÏ Ú¦ÇÕ.\n"
+"Довідка до режиму пошуку\n"
 "\n"
-" ðÏÐÅÒÅÄÎÑ ÕÍÏ×Á Ú¦ÇÕ Ú'Ñ×ÉÔØÓÑ Õ Ë×ÁÄÒÁÔÎÉÈ ÄÕÖËÁÈ Ð¦ÓÌÑ ÚÁÐÒÏÛÅÎÎÑ "
-"\"ðÏÛÕË:\". îÁÔÉÓÎÅÎÎÑ Enter ÂÅÚ ÒÅÄÁÇÕ×ÁÎÎÑ ÂÕÄØ-ÑËÏÇÏ ÔÅËÓÔÕ ÐÒÉÚ×ÅÄÅ ÄÏ "
-"ÐÏÛÕËÕ ÐÏÐÅÒÅÄÎØϧ ÕÍÏ×É Ú¦ÇÕ.\n"
+" Введіть �лова або �имволи, �кі ви збираєте�� шукати, потім нати�ніть Enter. "
+"Якщо дл� введеного вами знайдеть�� збіг, екран перемі�тить�� у мі�це поблизу "
+"від знайденого збігу.\n"
 "\n"
-" îÁÓÔÕÐΦ ÆÕÎËæÏÎÁÌØΦ ËÌÁצۦ ÎÁÑ×Φ Õ ÒÅÖÉͦ ðÏÛÕËÕ:\n"
+" Попередній р�док пошуку буде показано у дужках пі�л� запрошенн� «Пошук:». "
+"�ати�ненн� Enter без редагуванн� тек�ту продовжить попередній пошук.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
+" В режимі пошуку можна �кори�тати�� такими функціональними клавішами:\n"
+"\n"
 
-#: src/help.c:315
-#, fuzzy
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1224,19 +1281,18 @@ msgid ""
 " The following function keys are available in Browser Go To Directory mode:\n"
 "\n"
 msgstr ""
-"ôÅËÓÔ ÄÏÐÏÍÏÇÉ ÒÅÖÉÍÕ ÐÅÒÅÇÌÑÄÁÞÁ ÆÁÊÌ¦× äÏ_ÄÉÒÅËÔÏÒ¦§\n"
+"Довідка щодо режиму «До каталогу»\n"
 "\n"
-" ÷×ÅĦÔØ ¦Í'Ñ ÄÉÒÅËÔÏÒ¦§, ÑËÕ ÷É ÂÁÖÁ¤ÔÅ ÐÅÒÅÇÌÑÎÕÔÉ.\n"
+" Введіть назву каталогу, до �кого �лід перейти.\n"
 "\n"
-" ñËÝÏ tab-ÄÏÐÏ×ÎÅÎÎÑ ÎÅ ÚÁÂÏÒÏÎÅÎÏ, ÷É ÍÏÖÅÔÅ ËÏÒÉÓÔÕ×ÁÔÉÓØ ËÌÁצÛÅÀ TAB ÄÌÑ "
-"(ÓÐÒÏÂÉ) Á×ÔÏÍÁÔÉÞÎÏÇÏ ÄÏÐÏ×ÎÅÎÎÑ ÎÁÚ×É ÄÉÒÅËÔÏÒ¦§.\n"
+" Якщо доповненн� за Tab не було вимкнено, ви можете �кори�тати�� клавішею "
+"Tab [�проби] автоматичного доповненн� назви каталогу.\n"
 "\n"
-" îÁÓÔÕÐΦ ÆÕÎËæÏÎÁÌØΦ ËÌÁצۦ ÎÁÑ×Φ × ÒÅÖÉͦ ÐÅÒÅÇÌÑÄÁÞÁ ÆÁÊÌ¦× "
-"äÏ_äÉÒÅËÔÏÒ¦§:\n"
+" У режимі переходу до каталогу можна �кори�тати�� такими функціональними "
+"клавішами:\n"
 "\n"
 
-#: src/help.c:328
-#, fuzzy
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1249,18 +1305,18 @@ msgid ""
 " The following function keys are available in Spell Check mode:\n"
 "\n"
 msgstr ""
-"ôÅËÓÔ ÄÏÐÏÍÏÇÉ ÒÅÖÉÍÕ ðÒÁ×ÏÐÉÓ\n"
+"Тек�т довідки перевірки правопи�у\n"
 "\n"
-" ðÒÏÇÒÁÍÁ ÐÅÒÅצÒËÉ ÐÒÁ×ÏÐÉÓÕ ÐÅÒÅצÒѤ ÏÒÆÏÇÒÁƦÀ ×ÓØÏÇÏ ÔÅËÓÔÕ × ÐÏÔÏÞÎÏÍÕ "
-"ÆÁÊ̦. ëÏÌÉ ÚÕÓÔÒ¦ÞÁ¤ÔØÓÑ ÎÅÚÎÁÊÏÍÅ ÓÌÏ×Ï, ×ÏÎÏ ×ÉĦÌѤÔØÓÑ ÔÁ Ú'Ñ×ÌѤÔØÓÑ "
-"ÍÏÖÌÉצÓÔØ ×¦ÄÒÅÄÁÇÕ×ÁÔÉ ÐÒÏÐÏÎÏ×ÁÎÕ ÚÁͦÎÕ. ðÏÔ¦Í Ú'Ñ×ÉÔØÓÑ ÚÁÐÉÔ ÎÁ ÚÁͦÎÕ "
-"ËÏÖÎÏÇÏ ×ÈÏÄÖÅÎÎÑ ÃØÏÇÏ ÎÅÚÎÁÊÏÍÏÇÏ ÓÌÏ×Á × ÐÏÔÏÞÎÏÍÕ ÆÁÊ̦.\n"
+" Програма перевірки правопи�у перевір�є орфографію у�ього тек�ту поточного "
+"файла. Якщо знайдено невідоме �лово, воно під�вічуєть�� та з’�вл�єть�� "
+"редагована заміна цьому �лову. Потім буде з’�вл�ти�� запрошенн� дл� заміни "
+"кожного входженн� даного помилково напи�аного �лова у поточному файлі.\n"
 "\n"
-" îÁÓÔÕÐΦ ¦ÎÛ¦ ÆÕÎËæ§ ÎÁÑ×Φ × ÒÅÖÉͦ ðÒÁ×ÏÐÉÓ:\n"
+" У режимі перевірки правопи�у можна �кори�тати�� такими функціональними "
+"клавішами:\n"
 "\n"
 
-#: src/help.c:343
-#, fuzzy
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1271,16 +1327,17 @@ msgid ""
 " The following function keys are available in Execute Command mode:\n"
 "\n"
 msgstr ""
-"ôÅËÓÔ ÄÏÐÏÍÏÇÉ ÒÅÖÉÍÕ úÏ×ΦÛÎÑ ëÏÍÁÎÄÁ\n"
+"Тек�т довідки режиму Зовнішн� Команда\n"
 "\n"
-" ãÅ ÍÅÎÀ ÄÏÚ×ÏÌѤ ×ÁÍ ×ÓÔÁ×ÉÔÉ ×É×¦Ä ËÏÍÁÎÄÉ, ÝÏ ×ÉËÏÎÕ×ÁÔÉÍÅÔØÓÑ × "
-"ÏÂÏÌÏÎæ, × ÐÏÔÏÞÎÉÊ ÂÕÆÅÒ (ÁÂÏ Õ ÎÏ×ÉÊ ÂÕÆÅÒ × ÂÁÇÁÔÏ-ÂÕÆÅÒÎÏÍÕ ÒÅÖÉͦ).\n"
+" Це меню дозвол�є вам в�тавити вивід команди, виконаної у командному "
+"інтерпретаторі, у поточний файловий буфер (або у новий буфер у "
+"мультибуферному режимі). Якщо вам потрібен інший порожній буфер, не вводьте "
+"ні�кої команди взагалі.\n"
 "\n"
-" îÁÓÔÕÐΦ ËÌÁצۦ ÎÁÑ×Φ Õ ÃØÏÍÕ ÒÅÖÉͦ:\n"
+" �а�тупні функціональні клавіші до�тупні у режимі Зовнішн� Команда:\n"
 "\n"
 
-#: src/help.c:356
-#, fuzzy
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1291,25 +1348,16 @@ msgid ""
 "showing the file being edited.  The status line is the third line from the "
 "bottom and shows important messages.  "
 msgstr ""
-" ÔÅËÓÔ ÄÏÐÏÍÏÇÉ nano\n"
-"\n"
-" òÅÄÁËÔÏÒ  nano  ÒÏÚÒÏÂÌÅÎÏ  ÄÌÑ  ÅÍÕÌÑæ§  ÆÕÎËæÏÎÁÌØÎÏÓÔ¦  ÔÁ  ÐÒÏÓÔÏÔÉ "
-"×ÉËÏÒÉÓÔÁÎÎÑ ÒÅÄÁËÔÏÒÕ  UW Pico.  òÅÄÁËÔÏÒ ÐÏĦÌѤÔØÓÑ ÎÁ 4 ÇÏÌÏ×Φ ÓÅËæ§: "
-"×ÅÒÈÎ¦Ê ÒÑÄÏË Í¦ÓÔÉÔØ ×ÅÒÓ¦À ÐÒÏÇÒÁÍÉ, ¦Í'Ñ ÐÏÔÏÞÎÏÇÏ ÆÁÊÌÕ, ÝÏ ÒÅÄÁÇÕ¤ÔØÓÑ, "
-"ÔÁ ¦ÎÆÏÒÍÁæÀ ÐÒÏ ÔÅ, ÞÉ ×ÎÅÓÅÎÏ ÂÕÄØ-Ñ˦ ÚͦÎÉ ÄÏ ÆÁÊÌÕ. îÁÓÔÕÐÎÁ ÓÅËÃ¦Ñ - "
-"ÃÅ ÇÏÌÏ×ΊצËÎÏ ÒÅÄÁÇÕ×ÁÎÎÑ, × ÑËÏÍÕ (ÑËÝÏ Õ×ÁÖÎÏ ÐÒÉÄÉ×ÉÔÉÓØ) ÍÏÖÎÁ "
-"ÐÏÂÁÞÉÔÉ ÚͦÓÔ ÐÏÔÏÞÎÏÇÏ ÆÁÊÌÕ. òÑÄÏË ÓÔÁÔÕÔÕ ¤ 3-Í ÚÎÉÚÕ ÒÑÄËÏÍ ÔÁ ͦÓÔÉÔØ "
-"×ÁÖÌÉצ ÐÏצÄÏÍÌÅÎÎÑ. ïÓÔÁÎΦ Ä×Á ÒÑÄËÉ Í¦ÓÔÑÔØ ÎÁʦÌØÛ ÚÁÇÁÌØΦ ËÏͦÎÁæ§ "
-"ËÌÁ×¦Û ÒÅÄÁËÔÏÒÕ.\n"
-"\n"
-"  îÏÔÁÔËÉ ÄÏ ËÏͦÎÁæÊ: ËÏͦÎÁæ§ Ú ËÌÁצÛÅÀ Control ÐÏËÁÚÁΦ ¦Ú ÓÉÍ×ÏÌÏÍ "
-"'^' ÔÁ  ××ÏÄÑÔØÓÑ  Ú  ÎÁÔÉÓÎÕÔÏÀ  ËÌÁצÛÅÀ  Control (Ctrl).   Esc-ËÏͦÎÁæ§ "
-"ÐÏËÁÚÁΦ ÓÉÍ×ÏÌÏÍ 'M' ÔÁ ××ÏÄÑÔØÓÑ Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ ËÌÁצۦ Esc, Alt ÁÂÏ Meta "
-"× ÚÁÌÅÖÎÏÓÔ¦ ×¦Ä  ÷ÁÛϧ ËÌÁצÁÔÕÒÉ. îÁÓÔÕÐΦ ËÏͦÎÁæ§ ÄÏÓÔÕÐΦ × ÇÏÌÏ×ÎÏÍÕ "
-"צËΦ ÒÅÄÁÇÕ×ÁÎÎÑ. äÏÄÁÔËÏצ ËÏͦÎÁæ§ ÐÏËÁÚÁΦ Õ ÄÕÖËÁÈ:\n"
+"Тек�т довідки nano\n"
 "\n"
+" Редактор nano розроблено дл� емул�ції функціонально�ті та про�тоти "
+"викори�танн� оригінального редактора UW Pico.  Редактор розбито на 4 о�новні "
+"ча�тини: верхній р�док мі�тить вер�ію програми, назву поточного файла, �кий  "
+"редагуєть��, та чи було вне�ено зміни у поточний файл. Друга ча�тина — це "
+"головне вікно редагуванн�, у �кому  показано редагований файл. Р�док �тану — "
+"3 р�док знизу — мі�тить різні важливі повідомленн�.  "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1319,8 +1367,15 @@ msgid ""
 "notated with the Meta (M-) symbol and can be entered using either the Esc, "
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
+"Два р�дки знизу показують найча�тіше викори�товувані комбінації клавіш.\n"
+"\n"
+" Си�тема позначень комбінацій клавіш на�тупна: комбінації з Control "
+"позначено �имволом (^), їх можна вве�ти за допомогою нати�канн� клавіші "
+"Control (Ctrl) або подвійного нати�канн� клавіші Escape (Esc); Комбінації з "
+"Esc позначено �имволом Meta (M), їх можна вве�ти за допомогою клавіш Esc, "
+"Alt або Meta, залежно від моделі викори�таної клавіатури.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1328,484 +1383,494 @@ msgid ""
 "keys are shown in parentheses:\n"
 "\n"
 msgstr ""
+"Також, за допомогою подвійного нати�канн� Esc та введенн� тризначного чи�ла "
+"від 000 до 255 можна вве�ти �имвол з відповідним номером у коді. У о�новному "
+"вікні редагуванн� можна �кори�тати�� вказаними нижче комбінаці�ми клавіш. "
+"�льтернативні комбінації наведено у дужках:\n"
+"\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
-msgstr "ÄÏÚ×ÏÌÉÔÉ/ÚÁÂÏÒÏÎÉÔÉ"
+msgstr "дозволити/заборонити"
 
-#: src/nano.c:587
-#, fuzzy
+#: src/nano.c:601
 msgid "Key invalid in view mode"
-msgstr "îÅצÒÎÁ ËÎÏÐËÁ × ÒÅÖÉͦ VIEW"
+msgstr "�екоректна клавіша у режимі перегл�ду"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
 "Buffer written to %s\n"
 msgstr ""
 "\n"
-"âÕÆÅÒ ÚÁÐÉÓÁÎÏ ÄÏ %s\n"
+"Буфер запи�ано до %s\n"
 
-#: src/nano.c:697
-#, fuzzy, c-format
+#: src/nano.c:715
+#, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 "\n"
-"âÕÆÅÒ ÚÁÐÉÓÁÎÏ ÄÏ %s\n"
+"Буфер не запи�ано до %s: %s\n"
 
-#: src/nano.c:700
-#, fuzzy, c-format
+#: src/nano.c:718
+#, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 "\n"
-"âÕÆÅÒ ÚÁÐÉÓÁÎÏ ÄÏ %s\n"
+"Буфер не запи�ано: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
-msgstr "òÏÚÍ¦Ò ×¦ËÎÁ ÚÁÍÁÌÉÊ ÄÌÑ Nano...\n"
+msgstr "Розмір вікна замалий дл� nano...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
+"Викори�танн�: nano [П�Р�МЕТРИ] [[+РЯДОК,СТОВПЧИК] Ф�ЙЛ]...\n"
+"\n"
 
-#: src/nano.c:819
-#, fuzzy, c-format
+#: src/nano.c:839
+#, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr "ïÐæ§\t\täÏ×Ǧ ÏÐæ§\t\túÎÁÞÅÎÎÑ\n"
+msgstr "Параметр\t\tДовга форма\t\tПризначенн�\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
-msgstr "ïÐæÑ\t\túÎÁÞÅÎÎÑ\n"
-
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "ðÏËÁÚÁÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ"
+msgstr "Параметр\t\tПризначенн�\n"
 
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
-msgstr ""
+msgstr "+РЯДОК,СТОВПЧИК"
 
-#: src/nano.c:826
-#, fuzzy
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
-msgstr "ðÏÞÁÔÉ Ú ÒÑÄËÁ ÎÏÍÅÒ òñäïë"
+msgstr "Почати зі вказаного р�дка та позиції"
 
-#: src/nano.c:828
-#, fuzzy
+#: src/nano.c:849
 msgid "Enable smart home key"
-msgstr "äÏÚ×ÏÌÉÔÉ ÍÉÛÕ"
+msgstr "Увімкнути розумну кнопку Home"
 
-#: src/nano.c:829
-#, fuzzy
+#: src/nano.c:850
 msgid "Save backups of existing files"
-msgstr "òÏÂÉÔÉ ÒÅÚÅÒ×Φ ËÏЦ§ ¦ÓÎÕÀÞÉÈ ÆÁÊÌ¦× ÐÒÉ ÚÁÐÉÓÕ"
+msgstr "Зберігати резервні копії на�вних файлів"
 
-#: src/nano.c:830
-#, fuzzy
+#: src/nano.c:851
 msgid "-C <dir>"
-msgstr "-o [ÄÉÒ]"
+msgstr "-C <кат>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
-msgstr ""
+msgstr "--backupdir=<dir>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
-msgstr ""
+msgstr "Каталог дл� зберіганн� унікальних резервних копій"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
-msgstr ""
+msgstr "Викори�товувати жирний шрифт замі�ть звичайного"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
-msgstr ""
+msgstr "Перетворювати табул�ції у пробіли"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
-msgstr "äÏÚ×ÏÌÉÔÉ ÄÅ˦ÌØËÁ ÆÁÊÌÏ×ÉÈ ÂÕÆÅÒ¦×"
+msgstr "Дозволити декілька файлових буферів"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Викори�товувати файли блокуванн� (�к у vim)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
-msgstr "÷ÅÓÔÉ ÖÕÒÎÁÌ ÔÁ ÞÉÔÁÔÉ ¦ÓÔÏÒ¦À ÕÍÏ× ÐÏÛÕËÕ/ÚÁͦÎÉ"
+msgstr "Ве�ти журнал та читати і�торію умов пошуку/заміни"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
-msgstr "îÅ ÄÉ×ÉÔÉÓÑ × nanorc ÆÁÊÌÉ"
+msgstr "�е викори�товувати файли nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
-msgstr ""
+msgstr "Виправл�ти проблему малої клавіатури"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
-msgstr ""
+msgstr "�е додавати порожні р�дки у кінці файла"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
-msgstr "îÅÍÁ ÐÅÒÅÔ×ÏÒÀ×ÁÎÎÑ ¦Ú DOS/Mac ÆÏÒÍÁÔÕ"
+msgstr "�е перетворювати файли з формату DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
-msgstr ""
+msgstr "Викори�товувати додатковий р�док дл� редагуванн�"
 
-#: src/nano.c:860
-#, fuzzy
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Запи�увати до журналу і читати позицію кур�ора"
+
+#: src/nano.c:889
 msgid "-Q <str>"
-msgstr "-Q [ÒÑÄÏË]"
+msgstr "-Q <р�д>"
 
-#: src/nano.c:860
-#, fuzzy
+#: src/nano.c:889
 msgid "--quotestr=<str>"
-msgstr "--quotestr=[ÒÑÄÏË]"
+msgstr "--quotestr=<р�д>"
 
-#: src/nano.c:861
-#, fuzzy
+#: src/nano.c:890
 msgid "Quoting string"
-msgstr "òÑÄÏË ÐÏÓÉÌÁÎÎÑ, ÐÏ ÚÁÍÏ×ÞÅÎÎÀ \"> \""
+msgstr "Р�док цитуванн�"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
-msgstr ""
+msgstr "Обмежений режим"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "Гортати на р�док, а не на пів екрана"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:897
 msgid "-T <#cols>"
-msgstr "-r [#ÓÔÏ×Ð]"
+msgstr "-T <#чи�ло>"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=[ÞÉÓ]"
+msgstr "--tabsize=<#чи�ло>"
 
-#: src/nano.c:869
-#, fuzzy
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
-msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÒÏÚÍ¦Ò ÔÁÂÕÌÑæ§ =ÞÉÓ"
+msgstr "В�тановити ширину табул�ції у #чи�ло позицій"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
-msgstr ""
+msgstr "Викори�товувати швидке очищуванн� р�дка �тану"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
-msgstr "ðÏËÁÚÁÔÉ ×ÅÒÓ¦À ÔÁ ×ÉÊÔÉ"
+msgstr "Показати вер�ію та вийти"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
-msgstr ""
+msgstr "Викори�товувати більш точне визначенн� меж �лів"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "-Y <str>"
-msgstr "-Y [ÒÑÄÏË]"
+msgstr "-Y <р�д>"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "--syntax=<str>"
-msgstr "--syntax [ÒÑÄÏË]"
+msgstr "--syntax=<р�д>"
 
-#: src/nano.c:881
-#, fuzzy
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
-msgstr "÷ÉÚÎÁÞÅÎÎÑ ÓÉÎÔÁËÓÉÓÕ ÄÏ ×ÉËÏÒÉÓÔÁÎÎÑ"
+msgstr "Опи� �интак�и�у, �кий �лід викори�товувати дл� розфарбуванн�"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
-msgstr "ðÏÓÔ¦ÊÎÏ ÐÏËÁÚÕ×ÁÔÉ ÐÏÚÉæÀ ËÕÒÓÏÒÁ"
+msgstr "По�тійно показувати позицію кур�ора"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
-msgstr ""
+msgstr "Виправити проблему Backspace/Delete"
+
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Показати цю довідку"
 
-#: src/nano.c:888
+#: src/nano.c:918
 msgid "Automatically indent new lines"
-msgstr "á×ÔÏÍÁÔÉÞÎÏ ×ÉÒ¦×ÎÀ×ÁÔÉ ÎÏצ ÒÑÄËÉ"
+msgstr "�втоматично вирівнювати нові р�дки"
 
-#: src/nano.c:889
-#, fuzzy
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
-msgstr "äÏÚ×ÏÌÉÔÉ ^K ×ÉÒ¦ÚÁÔÉ ×¦Ä ËÕÒÓÏÒÁ ÄÏ Ë¦ÎÃÑ ÒÑÄËÁ"
+msgstr "Вирізати від кур�ора до кінц� р�дка"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
-msgstr "îÅ ÊÔÉ ÚÁ Ó¦Í̦ÎËÁÍÉ, ÁÌÅ ÐÅÒÅÐÉÓÕ×ÁÔÉ"
+msgstr "�е переходити за �имволічним по�иланн�ми, перезапи�увати"
 
-#: src/nano.c:894
-#, fuzzy
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
-msgstr "äÏÚ×ÏÌÉÔÉ ÍÉÛÕ"
+msgstr "Дозволити викори�танн� миші"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "�е читати файл (лише запи�увати до нього)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
-msgstr "-o [ÄÉÒ]"
+msgstr "-o <кат>"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
-msgstr "--operatingdir=[ÄÉÒ]"
+msgstr "--operatingdir=<кат>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
-msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÒÏÂÏÞÉÊ ËÁÔÁÌÏÇ"
+msgstr "В�тановити робочий каталог"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
-msgstr "úÂÅÒÅÇÔÉ ËÌÁצÛÉ XON (^Q) ÔÁ XOFF (^S)"
+msgstr "Зберегти клавіші XON (^Q) та XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "Мовчки ігнорувати помилки запу�ку, наприклад rc-файла"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:938
 msgid "-r <#cols>"
-msgstr "-r [#ÓÔÏ×Ð]"
+msgstr "-r <#поз>"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:938
 msgid "--fill=<#cols>"
-msgstr "--fill=[#ÓÔÏ×Ð]"
+msgstr "--fill=<#поз>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr ""
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "В�тановити значенн� позиції жор�ткого перене�енн� #поз"
 
-#: src/nano.c:909
-#, fuzzy
+#: src/nano.c:942
 msgid "-s <prog>"
-msgstr "-s [ÐÒÏÇ]"
+msgstr "-s <програма>"
 
-#: src/nano.c:909
-#, fuzzy
+#: src/nano.c:942
 msgid "--speller=<prog>"
-msgstr "--speller=[ÐÒÏÇ]"
+msgstr "--speller=<програма>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
-msgstr "áÌØÔÅÒÎÁÔÉ×ÎÁ ÐÒÏÇÒÁÍÁ ÐÅÒÅצÒËÉ ÐÒÁ×ÏÐÉÓÕ"
+msgstr "�льтернативна програма перевірки правопи�у"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "á×ÔÏúÁÐÉÓ ÐÒÉ ×ÉÈÏĦ, ÂÅÚ ÚÁÐÉÔÁÎØ"
+msgstr "�втоматичне збереженн� при виході, без запитань"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
-#, fuzzy
+#: src/nano.c:947
 msgid "View mode (read-only)"
-msgstr "òÅÖÉÍ ÐÅÒÅÇÌÑÄÁÎÎÑ (Ô¦ÌØËÉ ÞÉÔÁÎÎÑ)"
+msgstr "Режим перегл�ду (лише читанн�)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
-msgstr "îÅ ÚÁÇÏÒÔÁÔÉ ÄÏ×Ǧ ÒÑÄËÉ"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
+msgstr "�е перено�ити надто довгі р�дки жор�тко"
 
-#: src/nano.c:922
-#, fuzzy
+#: src/nano.c:951
 msgid "Don't show the two help lines"
-msgstr "îÅ ÐÏËÁÚÕ×ÁÔÉ ×¦ËÎÏ ÄÏÐÏÍÏÇÉ"
+msgstr "�е показувати два р�дка довідки внизу"
 
-#: src/nano.c:923
-#, fuzzy
+#: src/nano.c:952
 msgid "Enable suspension"
-msgstr "äÏÚ×ÏÌÉÔÉ ÐÒÉÚÕÐÉÎËÕ"
+msgstr "Дозволити призупиненн�"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr ""
-
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(¦ÇÎÏÒÏ×ÁÎÏ, ÄÌÑ ÓÕͦÓÎÏÓÔ¦ ¦Ú Pico)"
+msgstr "Увімкнути м’�ке перене�енн� р�дків"
 
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano ×ÅÒÓ¦§ %s (Ú¦ÂÒÁÎÅ %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano вер�ії %s\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
-msgstr " å-ÐÏÛÔÁ: nano@nano-editor.org\tôÅÎÅÔÁ: http://www.nano-editor.org"
+msgstr " Ел. пошта: nano@nano-editor.org\tІнтернет: http://www.nano-editor.org"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 "\n"
-" ú¦ÂÒÁÎÏ Ú ÏÐæÑÍÉ:"
+" Зібрано з таким параметрами:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
-msgstr "÷ÉÂÁÞÔÅ, ЦÄÔÒÉÍËÁ 椧 ÆÕÎËæ§ ÂÕÌÏ ÚÁÂÏÒÏÎÅÎÏ"
+msgstr "Вибачте, підтримку цієї функції вимкнено"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "�емає назви файла"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "úÂÅÒÅÇÔÉ ÚͦÎÅÎÉÊ ÂÕÆÅÒ (÷¦ÄÐÏצÄØ \"î¦\" óëáóõ´ ÷ó¶ úí¶îé) ? "
+msgstr "Зберегти змінений буфер (Відповідь «�і» СК�СУЄ ВСІ ЗМІ�И)? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "�е вдало�� повторно відкрити �тандартний ввід з клавіатури\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "Читанн� зі �тандартного вводу. ^C дл� перериванн�\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
-msgstr "ðÒÉÊÎÑÔÏ SIGHUP ÁÂÏ SIGTERM\n"
+msgstr "Прийн�то SIGHUP або SIGTERM\n"
 
-#: src/nano.c:1204
-#, fuzzy, c-format
+#: src/nano.c:1301
+#, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "ëÏÒÉÓÔÕÊÔÅÓÑ ËÏÍÁÎÄÏÀ \"fg\" ÄÌÑ ÔÏÇÏ, ÝÏ ÐÏ×ÅÒÎÕÔÉÓÑ ÄÏ nano"
+msgstr "Викори�товуйте «fg» дл� поверненн� у nano\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
-msgstr "ÄÏÚ×ÏÌÅÎÏ"
+msgstr "дозволено"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
-msgstr "ÚÁÂÏÒÏÎÅÎÏ"
+msgstr "заборонено"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
-msgstr ""
+msgstr "�евідома команда"
 
-#: src/nano.c:1674
-#, fuzzy
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
-msgstr "XON ÉÇÎÏÒÏ×ÁÎÏ, ÍÕÒ-ÍÕÒ-ÍÕÒ"
+msgstr "XON проігноровано, мр-бр-бр"
 
-#: src/nano.c:1679
-#, fuzzy
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
-msgstr "XOFF ÉÇÎÏÒÏ×ÁÎÏ, ÐÒÉÍ-ЦÍ-ЦÍ"
+msgstr "XOFF проігноровано, мр-бр-бр"
 
-#: src/nano.c:2209 src/rcfile.c:1100
-#, fuzzy, c-format
+#: src/nano.c:2310 src/rcfile.c:1325
+#, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "ÚÁÐÒÏÛÅÎÉÊ ÒÏÚÍ¦Ò ÔÁÂÕÌÑæ§ %d ¤ ÎÅËÏÒÅËÔÎÉÍ"
+msgstr "Запитаний розмір табул�ції «%s» не підходить"
 
-#: src/nano.c:2268 src/rcfile.c:1025
-#, fuzzy, c-format
+#: src/nano.c:2374 src/rcfile.c:1250
+#, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "ÚÁÐÉÔÁÎÉÊ ÒÏÚÍ¦Ò ÚÁÐÏ×ÎÅÎÎÑ %d ¤ ÎÅËÏÒÅËÔÎÉÍ"
+msgstr "Запитаний некоректний розмір заповненн� \"%s\""
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Введіть команду «%s -h», щоб отримати �пи�ок до�тупних параметрів.\n"
 
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
-msgstr "YyôÔ"
+msgstr "YyТт"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
-msgstr "NnîÎ"
+msgstr "Nn�н"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
-msgstr "Aa÷×"
+msgstr "AaВв"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
-msgstr "ôÁË"
+msgstr "Так"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
-msgstr "÷ÓÅ"
+msgstr "В�е"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
-msgstr "î¦"
+msgstr "�і"
 
-#: src/rcfile.c:130
-#, fuzzy, c-format
+#: src/rcfile.c:137
+#, c-format
 msgid "Error in %s on line %lu: "
-msgstr "ðÏÍÉÌËÁ × %s Õ ÒÑÄËÕ %d: "
+msgstr "Помилка в %s на р�дку %lu: "
 
-#: src/rcfile.c:185
-#, fuzzy, c-format
+#: src/rcfile.c:196
+#, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "ÁÒÇÕÍÅÎÔ %s ÍÁ¤ ÚÁ˦ÎÞÕ×ÁÔÉÓÑ ÎÁ \""
+msgstr "�ргумент %s має незакриту \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
-#, fuzzy
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr ""
-"ÒÑÄËÉ ÆÏÒÍÁÌØÎÉÈ ×ÉÒÁÚ¦× ÐÏ×ÉÎΦ ÐÏÞÉÎÁÔÉÓØ ÔÁ ÚÁ˦ÎÞÕ×ÁÔÉÓØ ÓÉÍ×ÏÌÏÍ '\"'\n"
+"Р�дки регул�рних виразів повинні починати�� та закінчувати�� лапками (\")"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "îŠצÒÎÉÊ ÒÅÇÕÌÑÒÎÉÊ ×ÉÒÁÚ \"%s\": %s"
+msgstr "�е вірний регул�рний вираз \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
-msgstr "÷¦ÄÓÕÔÎÑ ÎÁÚ×Á ÓÉÎÔÁËÓÉÓÕ"
+msgstr "Від�утн� назва �интак�и�у"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
-msgstr ""
+msgstr "Синтак�и� «none» зарезервовано"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
-msgstr ""
+msgstr "Синтак�и� \"default\" не може мати розширень"
 
-#: src/rcfile.c:386 src/rcfile.c:483
-#, fuzzy
+#: src/rcfile.c:433
 msgid "Missing key name"
-msgstr "÷¦ÄÓÕÔÎÑ ÎÁÚ×Á ÓÉÎÔÁËÓÉÓÕ"
+msgstr "Від�утн� назва клавіші"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr ""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "�азва клавіші є надто короткою"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr ""
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "�азва клавіші має починати�� з «^», «M» або «F»"
+
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "Дл� прив’�зуванн� клавіші �лід вказати функцію"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
+"Слід вказати меню (або «all»), до �кого �лід прив’�зати клавішу або "
+"відв’�зати її"
 
-#: src/rcfile.c:426
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ %s ÄÌÑ ÚÁÐÉÓÕ: %s"
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "�е можна пов’�зати назву «%s» з функцією"
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, fuzzy, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "îÅ ÍÏÖÕ ×ÉËÏÎÁÔÉ \"%s\""
+#: src/rcfile.c:496
+#, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "�еможливо пов’�зати назву «%s» з меню"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr ""
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "У меню «%2$s» немає пункту «%1$s»"
+
+#: src/rcfile.c:543
+#, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Вибачте, призначенн� «%s» змінювати не можна"
+
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Помилка під ча� розгортанн� %s: %s"
 
-#: src/rcfile.c:625
-#, fuzzy, c-format
+#: src/rcfile.c:672
+#, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
 "Valid colors are \"green\", \"red\", \"blue\",\n"
@@ -1813,907 +1878,492 @@ msgid ""
 "\"black\", with the optional prefix \"bright\"\n"
 "for foreground colors."
 msgstr ""
-"ËÏÌ¦Ò %s ÎÅ ÚÒÏÚÕͦÌÉÊ.\n"
-"îÁÑ×Φ ËÏÌØÏÒÉ - \"green\", \"red\", \"blue\", \n"
-"\"white\", \"yellow\", \"cyan\", \"magenta\" ÔÁ \n"
-"\"black\", Ú ÏÐæÏÎÁÌØÎÉÍ ÐÒÅƦËÓÏÍ \"bright\".\n"
+"Колір «%s» не зов�ім зрозумілий.\n"
+"Дозволені кольори - «green», «red», «blue»,\n"
+"«white», «yellow», «cyan», «magenta» та\n"
+"«black», з необов’�зковим  префік�ом «bright»\n"
+"дл� кольору тла."
 
-#: src/rcfile.c:647
-#, fuzzy
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
-msgstr "îÅ ÍÏÖÕ ÄÏÄÁÔÉ ËÏÍÁÎÄÕ ËÏÌØÏÒÕ ÂÅÚ ÒÑÄËÁ ÓÉÎÔÁËÓÉÓÕ"
+msgstr "�е вдаєть�� додати команду кольору без команди �интак�и�у"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
-msgstr "÷¦ÄÓÕÔÎÑ ÎÁÚ×Á ËÏÌØÏÒÕ"
+msgstr "Від�утн� назва кольору"
 
-#: src/rcfile.c:672
+#: src/rcfile.c:709 src/rcfile.c:870
+msgid "Missing regex string"
+msgstr "�е вказано регул�рний вираз"
+
+#: src/rcfile.c:785
+msgid "\"start=\" requires a corresponding \"end=\""
+msgstr "\"start=\" потребує відповідного \"end=\""
+
+#: src/rcfile.c:837
 #, c-format
 msgid "Background color \"%s\" cannot be bright"
-msgstr ""
+msgstr "Колір тла \"%s\" не може бути �вітлим"
 
-#: src/rcfile.c:690 src/rcfile.c:809
-msgid "Missing regex string"
+#: src/rcfile.c:865
+msgid "Cannot add a header regex without a syntax command"
+msgstr "�е вдаєть�� додати рег. вираз заголовку без команди �интак�и�у"
+
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
 msgstr ""
+"�е вдало�� додати формальний вираз контрольного р�дка без команди �интак�и�у"
 
-#: src/rcfile.c:762
-msgid "\"start=\" requires a corresponding \"end=\""
-msgstr "\"start=\" ÐÏÔÒÅÂÕ¤ צÄÐÏצÄÎÏÇÏ \"end=\""
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "�е ви�тачає назви контрольного р�дка"
 
-#: src/rcfile.c:804
-#, fuzzy
-msgid "Cannot add a header regex without a syntax command"
-msgstr "îÅ ÍÏÖÕ ÄÏÄÁÔÉ ËÏÍÁÎÄÕ ËÏÌØÏÒÕ ÂÅÚ ÒÑÄËÁ ÓÉÎÔÁËÓÉÓÕ"
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "�е можна додавати linter без команди �интак�и�у"
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "�е ви�тачає програми linter"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "�е можна додавати formatter без команди �интак�и�у"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "�е ви�тачає програми formatter"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr ""
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "Критична помилка: з функцією «%s» не пов’�зано клавіш. Виходимо.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
+"Якщо потрібно, �кори�тайте�� nano з параметром -I, щоб �коригувати параметри "
+"у nanorc.\n"
+
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "�е вдало�� знайти �интак�ичну кон�трукцію «%s» дл� розширенн�"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr ""
+msgstr "Команда \"%s\" не дозволена у включеному файлі"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr ""
+msgstr "Синтак�и� \"%s\" не має колірних команд"
 
-#: src/rcfile.c:966
-#, fuzzy, c-format
+#: src/rcfile.c:1171
+#, c-format
 msgid "Command \"%s\" not understood"
-msgstr "ËÏÍÁÎÄÁ %s ÎÅ ÚÒÏÚÕͦÌÁ"
+msgstr "�е зрозуміла команда \"%s\""
 
-#: src/rcfile.c:972
-#, fuzzy
-msgid "Missing flag"
-msgstr "÷¦ÄÓÕÔÎÑ ÎÁÚ×Á ËÏÌØÏÒÕ"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Пропущено параметр"
 
-#: src/rcfile.c:994
-#, fuzzy, c-format
+#: src/rcfile.c:1208
+#, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "ÏÐÃ¦Ñ %s ÐÏÔÒÅÂÕ¤ ÁÒÇÕÍÅÎÔÁ"
+msgstr "Опці� \"%s\" вимагає аргумент"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
-msgstr ""
+msgstr "Опці� не є припу�тимим багатобайтовим р�дком"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
-msgstr ""
+msgstr "Вимагаєть�� непорожній �имвол"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
-msgstr ""
+msgstr "Вимагаєть�� два одинарних �имволи"
 
-#: src/rcfile.c:1114
-#, fuzzy, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "ÓËÉÎØÔÅ ÆÌÁÇ %d!\n"
+#: src/rcfile.c:1339
+#, c-format
+msgid "Cannot unset option \"%s\""
+msgstr "�еможливо �ка�увати визначенн� параметра «%s»"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr ""
+msgid "Unknown option \"%s\""
+msgstr "�евідомий параметр «%s»"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
-msgstr "ñ ÎÅ ÍÏÖÕ ÚÎÁÊÔÉ Ó×ÏÀ ÄÏͦ×ËÕ! öÁÈ!"
+msgstr "Я не можу знайти �вою домівку! Жах!"
+
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"�ати�ніть Enter, щоб продовжити завантаженн� nano.\n"
 
 #: src/search.c:96
-#, fuzzy, c-format
+#, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "\"%s\" ÎÅ ÚÎÁÊÄÅÎÏ"
+msgstr "\"%.*s%s\" не знайдено"
+
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [РегЗалеж]"
 
-#: src/search.c:205
-#, fuzzy
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [ФормВир]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [�азад]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
-msgstr " (ÄÏ ÚÁͦÎÉ)"
+msgstr " (що змінювати) у позначеному"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
-msgstr " (ÄÏ ÚÁͦÎÉ)"
+msgstr " (до заміни)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
-msgstr "úÁͦÎÉÔÉ ÃÅÊ ÐÒÉͦÒÎÉË?"
+msgstr "Замінити цей примірник?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
-msgstr "úÁͦÎÉÔÉ ÎÁ"
+msgstr "Замінити на"
 
-#: src/search.c:1004
-#, fuzzy, c-format
+#: src/search.c:986
+#, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
-msgstr[0] "úÁͦÎÅÎÏ %d ×ÈÏÄÖÅÎÎÑ"
-msgstr[1] "úÁͦÎÅΦ %d ×ÈÏÄÖÅÎÎÑ"
-msgstr[2] "úÁͦÎÅÎÏ %d ×ÈÏÄÖÅÎØ"
+msgstr[0] "Замінено %lu збіг"
+msgstr[1] "Замінено %lu збіги"
+msgstr[2] "Замінено %lu збігів"
 
-#: src/search.c:1034
-#, fuzzy
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
-msgstr "÷×ÅĦÔØ ÎÏÍÅÒ ÒÑÄËÁ"
+msgstr "Введіть номер р�дка, номер р�ду"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
-msgstr ""
+msgstr "�еправильний номер р�дка або �товпчика"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
-msgstr "îÅ ÄÕÖËÁ"
+msgstr "�е дужка"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
-msgstr "îÅÍÁ צÄÐÏצÄÎϧ ÄÕÖËÉ"
+msgstr "�ема відповідної дужки"
 
 #: src/text.c:54
 msgid "Mark Set"
-msgstr "í¦ÔËÕ ×ÓÔÁÎÏ×ÌÅÎÏ"
+msgstr "Мітку в�тановлено"
 
 #: src/text.c:58
-#, fuzzy
 msgid "Mark Unset"
-msgstr "í¦ÔËÕ ÚÎÑÔÏ"
+msgstr "Мітку зн�то"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "Буфер �ка�уванн� дій порожній!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr ""
+"Внутрішн� помилка: не вдало�� в�тановити відповідні�ть р�дка %d. Збережіть "
+"результати вашої роботи."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
-msgstr ""
+msgstr "додаванн� тек�ту"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
-msgstr "îÁÓÔÕÐÎÉÊ ÆÁÊÌ"
+msgstr "вилученн� тек�ту"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr ""
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
-msgstr ""
+msgstr "об’єднанн� р�дків"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
-msgstr ""
+msgstr "обрізка тек�ту"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr ""
+msgstr "�ка�уванн� обрізки тек�ту"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr ""
+msgstr "розрив р�дка"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
-msgstr "îÁÓÔÕÐÎÉÊ ÆÁÊÌ"
+msgstr "в�тавка тек�ту"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
-msgstr " (ÄÏ ÚÁͦÎÉ)"
+msgstr "заміна тек�ту"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr ""
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Внутрішн� помилка: невідомий тип. Збережіть �вою роботу"
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "Ска�ована ді� (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "�емає чого повторювати!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
 msgstr ""
+"Внутрішн� помилка: не вдало�� налаштувати повторенн� дії. Збережіть "
+"результати вашої роботи."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "Повторена ді� (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "îÅ ÍÏÖÕ ÐÒÁÃÀ×ÁÔÉ ¦Ú ËÁÎÁÌÏÍ (pipe)"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "�е можу �творити канал (pipe)"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
-msgstr "îÅ ÍÏÖÕ ÚÒÏÂÉÔÉ fork()"
+msgstr "�е можу зробити fork()"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr ""
+"Внутрішн� помилка: не вдало�� налаштувати �ка�уванн� від�тупів. Збережіть "
+"результати вашої роботи."
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
-msgstr "ðÏÇÁÎÉÊ ÒÑÄÏË ÃÉÔÕ×ÁÎÎÑ %s: %s"
+msgstr "Поганий р�док цитуванн� %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
-msgstr "íÏÖÕ ÚÁÒÁÚ ÖÅ óËÁÓ÷ÉÒ¦×ÎÀ×ÁÎÎÑ!"
+msgstr "Можу зараз же Ска�Вирівнюванн�!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
-msgstr "òÅÄÁÇÕ×ÁÔÉ ÚÁͦÎÕ"
-
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "îÅ ÍÏÖÕ ÓÔ×ÏÒÉÔÉ ËÁÎÁÌ (pipe)"
+msgstr "Редагувати заміну"
 
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "óÔ×ÏÒÀÀ ÐÅÒÅÌ¦Ë ÏÒÆÏÇÒÁƦÞÎÉÈ ÐÏÍÉÌÏË, ÚÁÖĦÔØ Â-ÌÁÓËÁ..."
+msgstr "Створюємо перелік орфографічних помилок, зачекайте..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
-msgstr "îÅ ÍÏÖÕ ÏÔÒÉÍÁÔÉ ÒÏÚÍ¦Ò ÂÕÆÅÒÕ ËÁÎÁÌÕ"
+msgstr "�е можу отримати розмір буферу каналу"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
-msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ \"spell\""
+msgstr "Помилка виконанн� \"spell\""
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
-msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ \"sort -f\""
+msgstr "Помилка виконанн� \"sort -f\""
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
-msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ \"uniq\""
+msgstr "Помилка виконанн� \"uniq\""
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
-msgstr "ðÅÒÅצÒËÕ ÏÒÆÏÇÒÁƦ§ ÚÁ×ÅÒÛÅÎÏ"
+msgstr "Перевірку орфографії завершено"
 
-#: src/text.c:2815
-#, fuzzy, c-format
+#: src/text.c:2759 src/text.c:3340
+#, c-format
 msgid "Error invoking \"%s\""
-msgstr "ðÏÍÉÌËÁ ×ÉËÏÎÁÎÎÑ \"spell\""
+msgstr "Помилка виконанн� \"%s\""
+
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "Викликаємо програму дл� пошуку друкар�ьких помилок, зачекайте"
 
-#: src/text.c:2960
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
-msgstr "ðÅÒÅצÒËÁ ÏÒÆÏÇÒÁƦ§ ÎÅ ×ÄÁÌÁÓÑ: %s"
+msgstr "Перевірка орфографії не вдала��: %s"
 
-#: src/text.c:2962
-#, fuzzy, c-format
+#: src/text.c:2904
+#, c-format
 msgid "Spell checking failed: %s: %s"
-msgstr "ðÅÒÅצÒËÁ ÏÒÆÏÇÒÁƦ§ ÎÅ ×ÄÁÌÁÓÑ: %s"
+msgstr "�е вдало�ь перевірити орфографію: %s: %s"
+
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Дл� цього типу файлів не визначено обробника!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Зберегти змінений буфер перед обробкою?"
 
-#: src/text.c:3030
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "Викликаємо linter, зачекайте"
+
+#: src/text.c:3125
 #, c-format
-msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Від команди отримано 0 придатних р�дків: %s"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
 msgstr ""
+"Це повідомленн� пов’�зано із невідкритим файлом %s. Відкрити його у новому "
+"буфері?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "�а о�танньому повідомленні"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "�а першому повідомленні"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Помилка: не визначено formatter"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "Завершено"
 
-#: src/text.c:3031
-#, fuzzy
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "Викликаємо formatter, зачекайте"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Форматуванн� завершено"
+
+#: src/text.c:3438
+#, c-format
+msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
+msgstr "%sСлів: %lu Р�дків: %ld  Символів: %lu"
+
+#: src/text.c:3439
 msgid "In Selection:  "
-msgstr "äÏÄÁÔÉ ÷ÉĦÌÅÎÅ ÄÏ ÆÁÊÌÕ"
+msgstr "У позначеному:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Буквальний ввід"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
-msgstr "ÎÅ×ÉÓÔÁÞÁ¤ צÌØÎϧ ÐÁÍ'ÑÔ¦ ÄÌÑ nano!"
+msgstr "не ви�тачає вільної пам'�ті дл� nano!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
-msgstr ""
+msgstr "Ввід юнікод"
 
-#: src/winio.c:2149 src/winio.c:2153
-#, fuzzy
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
-msgstr " úͦÎÅÎÏ "
+msgstr "Змінено"
 
-#: src/winio.c:2150
-#, fuzzy
+#: src/winio.c:2143
 msgid "View"
-msgstr " ðÅÒÅÇÌÑÄ "
+msgstr "Вигл�д"
 
-#: src/winio.c:2164
-#, fuzzy
+#: src/winio.c:2157
 msgid "DIR:"
-msgstr " äÉÒ: "
+msgstr "Кат.:"
 
-#: src/winio.c:2171
-#, fuzzy
+#: src/winio.c:2164
 msgid "File:"
-msgstr "æÁÊÌ: "
+msgstr "Файл:"
+
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Попередженн�: вно�имо зміни до файла, �кий не заблоковано, — перевірити "
+"права до�тупу до каталогу?"
 
-#: src/winio.c:3360
-#, fuzzy, c-format
+#: src/winio.c:3377
+#, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
-msgstr "ÒÑÄÏË %ld/%ld (%d%%), ÓÔÏ×ÐÞÉË %lu/%lu (%d%%, ̦ÔÅÒÁ %lu/%ld (%d%%)"
+msgstr "р�док %ld/%ld (%d%%), �товпчик %lu/%lu (%d%%), �имвол %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
-msgstr "ôÅËÓÔÏ×ÉÊ ÒÅÄÁËÔÏÒ nano"
+msgstr "Тек�товий редактор nano"
 
-#: src/winio.c:3493
-#, fuzzy
+#: src/winio.c:3508
 msgid "version"
-msgstr "×ÅÒÓ¦Ñ "
+msgstr "вер�і�"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
-msgstr "óÔ×ÏÒÅÎÏ ÄÌÑ ÷ÁÓ:"
+msgstr "Створено дл� Ва�:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
-msgstr "ïÓÏÂÌÉ×Á ÐÏÄÑËÁ:"
+msgstr "О�облива под�ка:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
-msgstr "The Free Software Foundation (æÏÎÄ ÷¦ÌØÎÏÇÏ ðÒÏÇÒÁÍÎÏÇÏ ÚÁÂÅÚÐÅÞÅÎÎÑ)"
+msgstr "The Free Software Foundation (Фонд Вільного Програмного забезпеченн�)"
+
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "багатьом перекладачам та TP"
 
-#: src/winio.c:3497
+#: src/winio.c:3513
 msgid "For ncurses:"
-msgstr "äÌÑ ncurses:"
+msgstr "За ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
-msgstr "ÔÁ ¦ÎÛÉÍ ËÏÇÏ ÍÉ ÚÁÂÕÌÉ..."
+msgstr "та іншим, кого ми забули..."
 
-#: src/winio.c:3499
-#, fuzzy
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
-msgstr "äÑËÕ¤ÍÏ ÷ÁÍ ÚÁ ÔÅ, ÝÏ ÏÂÒÁÌÉ nano!\n"
-
-#~ msgid "add_to_cutbuffer() called with inptr->data = %s\n"
-#~ msgstr "add_to_cutbuffer() ×ÉËÌÉËÁÎÏ Ú inptr->data = %s\n"
-
-#~ msgid "Blew away cutbuffer =)\n"
-#~ msgstr "\"ËÉÛÅÎÀ\" (cutbuffer) ÚÄÕÌÏ ×¦ÔÒÏÍ =)\n"
-
-#~ msgid "File to insert into new buffer [from ./] "
-#~ msgstr "æÁÊÌ ÄÏ ×ÓÔÁ×ËÉ (× ÎÏ×ÉÊ ÂÕÆÅÒ) [×¦Ä ./] "
-
-#~ msgid "File to insert [from ./] "
-#~ msgstr "æÁÊÌ ÄÏ ×ÓÔÁ×ËÉ [×¦Ä ./] "
-
-#~ msgid "filename is %s\n"
-#~ msgstr "¦Í'Ñ ÆÁÊÌÕ: %s\n"
-
-#~ msgid "%s: free'd a node, YAY!\n"
-#~ msgstr "%s: êÏÊ.. ×ÕÚÏÌ ÚצÌØÎÅÎÏ!\n"
-
-#~ msgid "%s: free'd last node.\n"
-#~ msgstr "%s: ÚצÌØÎÅÎÏ ÏÓÔÁÎÎØÏÇÏ ×ÕÚÌÁ.\n"
-
-#~ msgid "Could not read %s for backup: %s"
-#~ msgstr "îÅ ÍÏÖÕ ÐÒÏÞÉÔÁÔÉ %s ÄÌÑ ÒÅÚÅÒ×Õ×ÁÎÎÑ: %s"
-
-#~ msgid "Couldn't write backup: %s"
-#~ msgstr "îÅ ÍÏÖÕ ÚÁÐÉÓÁÔÉ ÒÅÚÅÒ×: %s"
-
-#~ msgid "Backing up %s to %s\n"
-#~ msgstr "òÏÂÌÀ ÒÅÚÅÒ×ÎÕ ËÏЦÀ ÆÁÊÌÕ %s, ÒÅÚÅÒ×ÎÉÊ ÆÁÊÌ: %s\n"
-
-#~ msgid "Could not set permissions %o on backup %s: %s"
-#~ msgstr "îÅ ÍÏÖÕ ×ÓÔÁÎÏ×ÉÔÉ ÐÒÁ×Á %o ÎÁ ÒÅÚÅÒ×ÎÉÊ ÆÁÊÌ %s: %s"
-
-#~ msgid "Could not set owner %d/group %d on backup %s: %s"
-#~ msgstr "îÅ ÍÏÖÕ ×ÓÔÁÎÏ×ÉÔÉ ×ÌÁÓÎÉËÁ %d/ÇÒÕÐÕ %d ÎÁ ÒÅÚÅÒ×ÎÉÊ ÆÁÊÌ %s: %s"
-
-#~ msgid "Could not set access/modification time on backup %s: %s"
-#~ msgstr ""
-#~ "îÅ ÍÏÖÕ ×ÓÔÁÎÏ×ÉÔÉ ÞÁÓ ÏÓÔÁÎØϧ ÚͦÎÉ/Ú×ÅÒÔÁÎÎÑ ÎÁ ÒÅÚÅÒ×ÎÉÊ ÆÁÊÌ %s: %s"
-
-#~ msgid "Could not open file for writing: %s"
-#~ msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ ÆÁÊÌ ÄÌÑ ÚÁÐÉÓÕ: %s"
-
-#~ msgid "Wrote >%s\n"
-#~ msgstr "úÁÐÉÓÁÎÏ >%s\n"
-
-#~ msgid "Could not close %s: %s"
-#~ msgstr "îÅ ÍÏÖÕ ÚÁÞÉÎÉÔÉ %s: %s"
-
-#~ msgid "Could not reopen %s: %s"
-#~ msgstr "îÅ ×ÄÁ¤ÔØÓÑ ÐÅÒÅצÄËÒÉÔÉ %s: %s"
-
-#~ msgid "Could not open %s for prepend: %s"
-#~ msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ %s ÄÌÑ ÚÁÐÉÓÕ: %s"
-
-#~ msgid "Could not set permissions %o on %s: %s"
-#~ msgstr "îÅ ÍÏÖÕ ×ÓÔÁÎÏ×ÉÔÉ ÐÒÁ×Á %o ÎÁ %s: %s"
-
-#~ msgid "Can't open \"%s\": %s"
-#~ msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ \"%s\": %s"
-
-#~ msgid "Goto Cancelled"
-#~ msgstr "óËÁÓÏ×ÁÎÏ"
-
-#~ msgid "Unable to open ~/.nano_history file, %s"
-#~ msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ ÆÁÊÌ ~/.nano_history, %s"
-
-#~ msgid "Unable to write ~/.nano_history file, %s"
-#~ msgstr "îÅ ×ÄÁ¤ÔØÓÑ ÚÁÐÉÓÁÔÉ ÆÁÊÌ ~/.nano_history, %s"
-
-#~ msgid "Writing file in DOS format"
-#~ msgstr "úÁÐÉÓ ÆÁÊÌÕ Õ ÆÏÒÍÁÔ¦ DOS"
-
-#~ msgid "Writing file in Mac format"
-#~ msgstr "úÁÐÉÓ ÆÁÊÌÕ Õ ÆÏÒÍÁÔ¦ Mac"
-
-#~ msgid "Backing up file"
-#~ msgstr "òÏÂÉÔÉ ÒÅÚÅÒ×ÎÕ ËÏЦÀ ÆÁÊÌÁ"
-
-#~ msgid "Auto wrap"
-#~ msgstr "á×ÔÏ ÚÁÇÏÒÔÁÎÎÑ"
-
-#~ msgid "Invoke the help menu"
-#~ msgstr "÷ÉËÌÉËÁÔÉ ÍÅÎÀ ÄÏÐÏÍÏÇÉ"
-
-#~ msgid "Unjustify after a justify"
-#~ msgstr "óËÁÓÕ×ÁÔÉ ÏÓÔÁÎΤ ×ÉÒ¦×ÎÀ×ÁÎÎÑ"
-
-#~ msgid "Replace text within the editor"
-#~ msgstr "úÁͦÎÉÔÉ ÔÅËÓÔ Õ ÍÅÖÁÈ ÒÅÄÁËÔÏÒÁ"
-
-#~ msgid "Search for text within the editor"
-#~ msgstr "ûÕËÁÔÉ ÔÅËÓÔ × ÍÅÖÁÈ ÒÅÄÁËÔÏÒÕ"
-
-#~ msgid "Move up one line"
-#~ msgstr "ð¦ÄÎÑÔÉÓÑ ×ÇÏÒÕ ÎÁ ÏÄÉÎ ÒÑÄÏË"
-
-#~ msgid "Insert a tab character"
-#~ msgstr "÷ÓÔÁ×ÉÔÉ ÓÉÍ×ÏÌ ÔÁÂÕÌÑæ§"
-
-#~ msgid "Make the current search or replace case (in)sensitive"
-#~ msgstr "úÒÏÂÉÔÉ ÐÏÔÏÞÎÉÊ ÐÏÛÕË ÁÂÏ ÚÁͦÎÕ (ÎÅ)ÚÁÌÅÖÎÉÍ ×¦Ä ÒÅǦÓÔÒÕ Ì¦ÔÅÒ"
-
-#~ msgid "Prepend to the current file"
-#~ msgstr "äÏÄÁÔÉ ÄÏ ÐÏÔÏÞÎÏÇÏ ÆÁÊÌÕ (× ÐÏÞÁÔÏË ÆÁÊÌÁ)"
-
-#~ msgid "Search backwards"
-#~ msgstr "ûÕËÁÔÉ ÎÁÚÁÄ"
-
-#~ msgid "Write file out in DOS format"
-#~ msgstr "úÁÐÉÓ ÆÁÊÌÕ Õ ÆÏÒÍÁÔ¦ DOS"
-
-#~ msgid "Write file out in Mac format"
-#~ msgstr "úÁÐÉÓ ÆÁÊÌÕ Õ ÆÏÒÍÁÔ¦ Mac"
-
-#~ msgid "Back up original file when saving"
-#~ msgstr "úÒÏÂÉÔÉ ÒÅÚÅÒ×ÎÕ ËÏЦÀ ÆÁÊÌÕ ÐÒÉ ÚÂÅÒ¦ÇÁÎΦ"
-
-#~ msgid "Find other bracket"
-#~ msgstr "úÎÁÊÔÉ ÄÒÕÇÕ ÄÕÖËÕ"
-
-#~ msgid "Open previously loaded file"
-#~ msgstr "÷¦ÄËÒÉÔÉ ÐÏÐÅÒÅÄÎ¦Ê ÆÁÊÌ"
-
-#~ msgid "Open next loaded file"
-#~ msgstr "÷¦ÄËÒÉÔÉ ÎÁÓÔÕÐÎÉÊ ÆÁÊÌ"
-
-#~ msgid "Up"
-#~ msgstr "÷ÇÏÒÕ"
-
-#~ msgid "Down"
-#~ msgstr "÷ÎÉÚ"
-
-#~ msgid "Direction"
-#~ msgstr "îÁÐÒÑÍÏË"
-
-#~ msgid "Space"
-#~ msgstr "ðÒϦÌ"
-
-#~ msgid ""
-#~ "Usage: nano [+LINE] [GNU long option] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "÷ÉËÏÒÉÓÔÁÎÎÑ: nano [+òñäïë] [ÄÏ×Ǧ ÏÐæ§ GNU] [ÏÐæ§] [ÆÁÊÌ]\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "Usage: nano [+LINE] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "÷ÉËÏÒÉÓÔÁÎÎÑ: nano [+òñäïë] [ÏÐæÑ] [ÆÁÊÌ]\n"
-#~ "\n"
-
-#~ msgid "+LINE"
-#~ msgstr "+òñäïë"
-
-#~ msgid "Use alternate keypad routines"
-#~ msgstr "÷ÖÉ×ÁÔÉ ÁÌØÔÅÒÎÁÔÉ×Φ ЦÄÐÒÏÇÒÁÍÉ ÄÌÑ keypad"
-
-#~ msgid "Do regular expression searches"
-#~ msgstr "ðÏÛÕË ÐÏ ÆÏÒÍÁÌØÎÏÍÕ ×ÉÒÁÚÕ (regexp)"
-
-#~ msgid "-T [num]"
-#~ msgstr "-T [ÞÉÓ]"
-
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÚÁÇÏÒÔÁÎÎÑ ÒÑÄË¦× × ÐÏÚÉæ§ #ÓÔÏ×Ð"
-
-#~ msgid "current->data now = \"%s\"\n"
-#~ msgstr "current->data ÚÁÒÁÚ = \"%s\"\n"
-
-#~ msgid "After, data = \"%s\"\n"
-#~ msgstr "ð¦ÓÌÑ, ÄÁΦ = \"%s\"\n"
-
-#~ msgid "Could not create a temporary filename: %s"
-#~ msgstr "îÅ ÍÏÖÕ ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×Õ ÎÁÚ×Õ ÄÌÑ ÆÁÊÌÕ: %s"
-
-#~ msgid "Spell checking failed: unable to write temp file!"
-#~ msgstr ""
-#~ "ðÅÒÅצÒËÁ ÏÒÆÏÇÒÁƦ§ ÎÅ ×ÄÁÌÁÓÑ: ÎÅÍÏÖÌÉ×Ï ÚÁÐÉÓÁÔÉ ÔÉÍÞÁÓÏ×ÉÊ ÆÁÊÌ!"
-
-#~ msgid "Cannot resize top win"
-#~ msgstr "îÅ ÍÏÖÕ ÚͦÎÉÔÉ ÒÏÚÍ¦Ò ×ÅÒÈÎØÏÇÏ ×¦ËÎÁ"
-
-#~ msgid "Cannot move top win"
-#~ msgstr "îÅ ÍÏÖÕ ÐÅÒÅͦÓÔÉÔÉ ×ÅÒÈÎØÏÇÏ ×¦ËÎÏ"
-
-#~ msgid "Cannot resize edit win"
-#~ msgstr "îÅ ÍÏÖÕ ÚͦÎÉÔÉ ÒÏÚÍ¦Ò ×¦ËÎÁ ÒÅÄÁÇÕ×ÁÎÎÑ"
-
-#~ msgid "Cannot move edit win"
-#~ msgstr "îÅ ÍÏÖÕ ÐÅÒÅͦÓÔÉÔÉ ×¦ËÎÏ ÒÅÄÁÇÕ×ÁÎÎÑ"
-
-#~ msgid "Cannot resize bottom win"
-#~ msgstr "îÅ ÍÏÖÕ ÚͦÎÉÔÉ ÒÏÚÍ¦Ò ÎÉÖÎØÏÇÏ ×¦ËÎÁ"
-
-#~ msgid "Cannot move bottom win"
-#~ msgstr "îÅ ÍÏÖÕ ÐÅÒÅͦÓÔÉÔÉ ÎÉÖΤ צËÎÏ"
-
-#~ msgid "NumLock glitch detected.  Keypad will malfunction with NumLock off"
-#~ msgstr "ÐÏͦÞÅÎÏ ÇÌÀË NumLock'Á. äÏÄÁÔËÏ×Á ËÌÁצÁÔÕÒÁ ÍÏÖÅ ÎÅ ÐÒÁÃÀ×ÁÔÉ"
-
-#~ msgid "Tab size is too small for nano...\n"
-#~ msgstr "òÏÚÍ¦Ò ÔÁÂÕÌÑæ§ ÚÁÍÁÌÉÊ ÄÌÑ nano...\n"
-
-#~ msgid "Main: set up windows\n"
-#~ msgstr "Main: ×ÓÔÁÎÏ×ÉÔÉ ×¦ËÎÁ\n"
-
-#~ msgid "Main: bottom win\n"
-#~ msgstr "Main: ÎÉÖΤ צËÎÏ\n"
-
-#~ msgid "Main: open file\n"
-#~ msgstr "Main: צÄËÒÉÔÉ ÆÁÊÌ\n"
-
-#~ msgid "AHA!  %c (%d)\n"
-#~ msgstr "áÇÁ! %c (%d)\n"
-
-#~ msgid "I got Alt-O-%c! (%d)\n"
-#~ msgstr "ñ ЦÊÍÁ× Alt-O-%c! (%d)\n"
-
-#~ msgid "I got Alt-[-1-%c! (%d)\n"
-#~ msgstr "ñ ЦÊÍÁ× Alt-[-1-%c! (%d)\n"
-
-#~ msgid "I got Alt-[-2-%c! (%d)\n"
-#~ msgstr "ñ ЦÊÍÁ× Alt-[-2-%c! (%d)\n"
-
-#~ msgid "I got Alt-[-%c! (%d)\n"
-#~ msgstr "ñ ЦÊÍÁ× Alt-[-%c! (%d)\n"
-
-#~ msgid "I got Alt-%c! (%d)\n"
-#~ msgstr "ñ ЦÊÍÁ× Alt-%c! (%d)\n"
-
-#~ msgid "I got %c (%d)!\n"
-#~ msgstr "ñ ЦÊÍÁ× %c (%d)!\n"
-
-#~ msgid "Adding new syntax after 1st\n"
-#~ msgstr "äÏÄÁ¤ÍÏ ÎÏ×ÉÊ ÓÉÎÔÁËÓ Ð¦ÓÌÑ ÐÅÒÛÏÇÏ\n"
-
-#~ msgid "Starting a new syntax type\n"
-#~ msgstr "ðÏÞÉÎÁ¤ÍÏ ÎÏ×ÉÊ ÔÉÐ ÓÉÎÔÁËÓÕ\n"
-
-#~ msgid "Starting a new colorstring for fg %d bg %d\n"
-#~ msgstr "ðÏÞÉÎÁ¤ÍÏ ÎÏ×ÉÊ ÒÑÄÏË ËÏÌØÏÒÕ ÄÌÑ ËÏÌØÏÒÕ %d ÎÁ ÆÏΦ %d\n"
-
-#~ msgid "Adding new entry for fg %d bg %d\n"
-#~ msgstr "äÏÄÁ¤ÍÏ ÎÏ×ÉÊ ÚÁÐÉÓ ÄÌÑ ËÏÌØÏÒÕ %d ÎÁ ÆÏΦ %d\n"
+msgstr "Д�куємо за викори�танн� nano!"
 
-#~ msgid "%s: Read a comment\n"
-#~ msgstr "%s: ÞÉÔÁ¤ÍÏ ËÏÍÅÎÔÁÒ\n"
-
-#~ msgid "%s: Parsing option %s\n"
-#~ msgstr "%s: òÏÚ¦ÂÒÁÎÎÑ ÏÐæ§ %s\n"
-
-#~ msgid "set flag %d!\n"
-#~ msgstr "×ÓÔÁÎÏ×ÉÔØ ÆÌÁÇ %d!\n"
-
-#~ msgid "Errors found in .nanorc file"
-#~ msgstr "úÎÁÊÄÅÎÏ ÐÏÍÉÌËÉ Õ ÆÁÊ̦ .nanorc"
-
-#~ msgid "Unable to open ~/.nanorc file, %s"
-#~ msgstr "îÅ ÍÏÖÕ ×¦ÄËÒÉÔÉ ÆÁÊÌ ~/.nanorc, %s"
-
-#~ msgid "\"%s...\" not found"
-#~ msgstr "\"%s...\" ÎÅ ÚÎÁÊÄÅÎÏ"
-
-#~ msgid "Invalid regex \"%s\""
-#~ msgstr "îÅצÒÎÉÊ ÒÅÇÕÌÑÒÎÉÊ ×ÉÒÁÚ \"%s\""
-
-#~ msgid "Search Cancelled"
-#~ msgstr "ðÏÛÕË ÓËÁÓÏ×ÁÎÏ"
-
-#~ msgid "Replace Cancelled"
-#~ msgstr "úÁͦÎÕ ÓËÁÓÏ×ÁÎÏ"
-
-#~ msgid "Replace failed: unknown subexpression!"
-#~ msgstr "úÁͦÎÁ ÎÅ×ÄÁÌÁ: ÎÅÚÎÁÊÏÍÉÊ Ð¦Ä×ÉÒÁÚ!"
-
-#~ msgid "Aborted"
-#~ msgstr "ðÒÅÒ×ÁÎÏ"
-
-#~ msgid "Come on, be reasonable"
-#~ msgstr "çÅÊ, ÂÕÄØÔÅ Á×ÔÏÔÅÎÔÉÞΦ"
-
-#~ msgid "actual_x for xplus=%d returns %d\n"
-#~ msgstr "actual_x ÄÌÑ xplus=%d ÐÏ×ÅÒÔÁ¤ %d\n"
-
-#~ msgid "Aha! '%c' (%d)\n"
-#~ msgstr "áÇÁ! '%c' (%d)\n"
-
-#~ msgid "input '%c' (%d)\n"
-#~ msgstr "×È¦Ä '%c' (%d)\n"
-
-#~ msgid "  File: ..."
-#~ msgstr "  æÁÊÌ: ..."
-
-#~ msgid "   DIR: ..."
-#~ msgstr "   äÉÒ: ..."
-
-#~ msgid "Refusing 0 length regex match"
-#~ msgstr "÷¦ÄËÉÄÁ¤ÍÏ ÓЦ×ÐÁĦÎÎÑ ÆÏÒÍÁÌØÎÏÇÏ ×ÉÒÁÚÕ ÄÏ×ÖÉÎÏÀ 0"
-
-#~ msgid "Moved to (%d, %d) in edit buffer\n"
-#~ msgstr "ðÅÒÅͦÝÅÎÏ ÄÏ (%d,%d) × ÂÕÆÅÒ¦ ÒÅÄÁÇÕ×ÁÎÎÑ\n"
-
-#~ msgid "I got \"%s\"\n"
-#~ msgstr "ñ ЦÊÍÁ× \"%s\"\n"
-
-#~ msgid "Dumping file buffer to stderr...\n"
-#~ msgstr "óËÉÄÁÎÎÑ ÂÕÆÅÒÕ ÆÁÊÌÕ ÄÏ stderr...\n"
-
-#~ msgid "Dumping cutbuffer to stderr...\n"
-#~ msgstr "óËÉÄÁÎÎÑ ÚͦÓÔÕ \"ËÉÛÅΦ\" ÄÏ stderr...\n"
-
-#~ msgid "Dumping a buffer to stderr...\n"
-#~ msgstr "óËÉÄÁÎÎÑ ÂÕÆÅÒÕ ÄÏ stderr...\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "The -p flag now invokes the Pico \"preserve\" flag.\n"
-#~ "The Pico compatibility flag has been removed as nano\n"
-#~ "now fully Pico compatible.  Please see the nano FAQ\n"
-#~ "for more info on this change...\n"
-#~ "\n"
-#~ "Press return to continue\n"
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
 #~ msgstr ""
-#~ "\n"
-#~ "ïÐÃ¦Ñ -p ÚÁÒÁÚ ×ÉÚÎÁÞÁ¤ ÏÐæÀ \"preserve\" ÒÅÄÁËÔÏÒÁ Pico.\n"
-#~ "ïÐæÀ ÓÕͦÓÎÏÓÔ¦ ¦Ú Pico ÂÕÌÏ ×ÉÄÁÌÅÎÏ, ÏÓ˦ÌØËÉ nano ÔÅÐÅÒ ÐÏ×ΦÓÔÀ\n"
-#~ "ÓÕͦÓÎÉÊ ¦Ú Pico. âÕÄØ ÌÁÓËÁ ÄÉ×ÉÔØÓÑ FAQ ÄÌÑ Â¦ÌØÛ ÐÏ×Îϧ ÄÏצÄËÉ\n"
-#~ "ÝÏÄÏ Ã¦¤§ ÚͦÎÉ.\n"
-#~ "\n"
-#~ "îÁÔÉÓΦÔØ ÂÕÄØ-ÌÁÓËÁ Enter\n"
-
-#~ msgid "Generic error"
-#~ msgstr "úÁÇÁÌØÎÁ ÐÏÍÉÌËÁ"
-
-#~ msgid "delete_opennode(): free'd a node, YAY!\n"
-#~ msgstr "delete_opennode(): OÊ.. ×ÕÚÏÌ ÚצÌØÎÅÎÏ!\n"
-
-#~ msgid "delete_opennode(): free'd last node.\n"
-#~ msgstr "delete_opennode(): ÚצÌØÎÅÎÏ ÏÓÔÁÎÎØÏÇÏ ×ÕÚÌÁ.\n"
-
-#~ msgid "Can't visit parent in restricted mode"
-#~ msgstr "îÅ ÍÏÖÕ ×¦ÄצÄÁÔÉ ÂÁÔØËÁ (cd ./..) × ÏÂÍÅÖÅÎÏÍÕ ÒÅÖÉͦ"
-
-#~ msgid "-p"
-#~ msgstr "-p"
-
-#~ msgid "--preserve"
-#~ msgstr "--preserve"
-
-#~ msgid ""
-#~ "\n"
-#~ "The -p flag now invokes the Pico \"preserve\" flag.  The Pico\n"
-#~ msgstr ""
-#~ "\n"
-#~ "ïÐÃ¦Ñ -p ÚÁÒÁÚ ×ÉÚÎÁÞÁ¤ ÏÐæÀ \"preserve\" ÒÅÄÁËÔÏÒÁ Pico. ïÐæÀ\n"
-
-#~ msgid "compatibility flag has been removed as nano is now fully Pico\n"
-#~ msgstr "ÓÕͦÓÎÏÓÔ¦ ¦Ú Pico ÂÕÌÏ ×ÉÄÁÌÅÎÏ, ÏÓ˦ÌØËÉ nano ÔÅÐÅÒ ÐÏ×ΦÓÔÀ\n"
-
-#~ msgid ""
-#~ "compatible.  Please see the nano FAQ for more info on this change...\n"
-#~ "\n"
-#~ msgstr ""
-#~ "ÓÕͦÓÎÉÊ ¦Ú Pico. âÕÄØ ÌÁÓËÁ ÄÉ×ÉÔØÓÑ FAQ ÄÌÑ Â¦ÌØÛ ÐÏ×Îϧ ÄÏצÄËÉ\n"
-#~ "ÝÏÄÏ Ã¦¤§ ÚͦÎÉ.\n"
-
-#~ msgid "Press return to continue\n"
-#~ msgstr "îÁÔÉÓΦÔØ Enter ÄÌÑ ÐÏÄÏ×ÖÅÎÎÑ\n"
-
-#~ msgid "string val=%s\n"
-#~ msgstr "ÒÑÄÏË val=%s\n"
-
-#~ msgid "For end part, beginning = \"%s\"\n"
-#~ msgstr "äÌÑ Ë¦ÎÃÅ×ϧ ÞÁÓÔÉÎÉ, ÐÏÞÁÔÏË = \"%s\"\n"
-
-#~ msgid "current->data = \"%s\"\n"
-#~ msgstr "(winio.c) current->data = \"%s\"\n"
-
-#~ msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
-#~ msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
-
-#~ msgid "read_line: not on first line and prev is NULL"
-#~ msgstr "read_line: ÎÅ ÎÁ ÐÅÒÛÏÍÕ ÒÑÄËÕ, ÔÁ ÝÅ Ê ÐÏÐÅÒÅÄÎ¦Ê ¤ NULL"
-
-#~ msgid "Pico mode"
-#~ msgstr "òÅÖÉÍ Pico"
-
-#~ msgid "Emulate Pico as closely as possible"
-#~ msgstr "åÍÕÌÀ×ÁÔÉ Pico ÎÁÓ˦ÌØËÉ ÍÏÖÌÉ×Ï"
-
-#~ msgid "'\")}]>"
-#~ msgstr "'\")}]>"
-
-#~ msgid ".?!"
-#~ msgstr ".?!"
-
-#~ msgid "Replaced 1 occurrence"
-#~ msgstr "úÁͦÎÅÎÏ 1 ×ÈÏÄÖÅÎÎÑ"
-
-#~ msgid "Replace with [%s]"
-#~ msgstr "úÁͦÎÉÔÉ ÎÁ [%s]"
-
-#~ msgid "nano: realloc: out of memory!"
-#~ msgstr "nano: realloc: ÎÅÍÁ¤ צÌØÎϧ ÐÁÍ'ÑÔ¦!"
-
-#~ msgid "Backwards search"
-#~ msgstr "ðÏÛÕË îÁÚÁÄ"
-
-#~ msgid "Goto"
-#~ msgstr "äÏ òÑÄËÁ"
-
-#~ msgid "check_wrap called with inptr->data=\"%s\"\n"
-#~ msgstr "check_wrap ×ÉÚ×ÁÎÏ Ú inptr->data=\"%s\"\n"
-
-#~ msgid "nano: calloc: out of memory!"
-#~ msgstr "nano: calloc: ÎÅÍÁ¤ צÌØÎϧ ÐÁÍ'ÑÔ¦!"
-
-#~ msgid " -D \t\t--dos\t\t\tWrite file in DOS format\n"
-#~ msgstr " -D \t\t--dos\t\t\túÁÐÉÓ ÆÁÊÌÕ Õ ÆÏÒÍÁÔ¦ DOS\n"
-
-#~ msgid " -F \t\t--multibuffer\t\tEnable multiple file buffers\n"
-#~ msgstr " -F \t\t--multibuffer\t\täÏÚ×ÏÌÉÔÉ ÄÅ˦ÌØËÁ ÆÁÊÌÏ×ÉÈ ÂÕÆÅÒ¦×\n"
-
-#~ msgid " -K \t\t--keypad\t\tUse alternate keypad routines\n"
-#~ msgstr " -K \t\t--keypad\t\t÷ÖÉ×ÁÔÉ ÁÌØÔÅÒÎÁÔÉ×Φ ЦÄÐÒÏÇÒÁÍÉ keypad\n"
-
-#~ msgid " -M \t\t--mac\t\t\tWrite file in Mac format\n"
-#~ msgstr " -M \t\t--mac\t\t\túÁÐÉÓ ÆÁÊÌÕ Õ ÆÏÒÍÁÔ¦ Mac\n"
-
-#~ msgid " -N \t\t--noconvert\t\tDon't convert files from DOS/Mac format\n"
-#~ msgstr " -N \t\t--noconvert\t\tîÅ ÏÂÅÒÔÁÔÉ ÆÁÊÌÉ ¦Ú ÆÏÒÍÁÔ¦× DOS/Mac\n"
-
-#~ msgid " -Q [str]\t--quotestr [str]\tQuoting string, default \"> \"\n"
-#~ msgstr ""
-#~ " -Q [str]\t--quotestr [str]\tòÑÄÏË ÐÏÓÉÌÁÎÎÑ, ÐÏ ÚÁÍÏ×ÞÅÎÎÀ \"> \"\n"
-
-#~ msgid " -S\t\t--smooth\t\tSmooth scrolling\n"
-#~ msgstr " -S\t\t--smooth\t\tðÌÁ×ÎÁ ÐÒÏËÒÕÔËÁ\n"
-
-#~ msgid " -T [num]\t--tabsize=[num]\t\tSet width of a tab to num\n"
-#~ msgstr " -T [ÎÏÍ]\t--tabsize=[ÎÏÍ]\t\t÷ÓÔÁÎÏ×ÉÔÉ ÒÏÚÍ¦Ò ÔÁÂÕÌÑæ§ ÄÏ ÎÏÍ\n"
-
-#~ msgid " -V \t\t--version\t\tPrint version information and exit\n"
-#~ msgstr " -V \t\t--version\t\tîÁÄÒÕËÕ×ÁÔÉ ×ÅÒÓ¦À ÔÁ ×ÉÊÔÉ\n"
-
-#~ msgid " -c \t\t--const\t\t\tConstantly show cursor position\n"
-#~ msgstr " -c \t\t--const\t\t\tðÏÓÔ¦ÊÎÏ ÐÏËÁÚÕ×ÁÔÉ ÐÏÚÉæÀ ËÕÒÓÏÒÁ\n"
-
-#~ msgid " -h \t\t--help\t\t\tShow this message\n"
-#~ msgstr " -h \t\t--help\t\t\tðÏËÁÚÁÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ\n"
-
-#~ msgid " -i \t\t--autoindent\t\tAutomatically indent new lines\n"
-#~ msgstr " -i \t\t--autoindent\t\tá×ÔÏÍÁÔÉÞÎÏ ×ÉÒ¦×ÎÀ×ÁÔÉ ÎÏצ ÒÑÄËÉ\n"
-
-#~ 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äÏÚ×ÏÌÉÔÉ ×ÉÒ¦ÚÁÔÉ ×¦Ä ËÕÒÓÏÒÁ ÄÏ Ë¦ÎÃÑ\n"
-#~ "\t\t\t\t\tÒÑÄËÁ ÚÁ ÄÏÐÏÍÏÇÏÀ ^K\n"
-
-#~ msgid " -l \t\t--nofollow\t\tDon't follow symbolic links, overwrite\n"
-#~ msgstr " -l \t\t--nofollow\t\tîÅ ÊÔÉ ÚÁ Ó¦Í̦ÎËÁÍÉ, ÁÌÅ ÐÅÒÅÐÉÓÕ×ÁÔÉ\n"
-
-#~ msgid " -m \t\t--mouse\t\t\tEnable mouse\n"
-#~ msgstr " -m \t\t--mouse\t\t\täÏÚ×ÏÌÉÔÉ ÍÉÛÕ\n"
-
-#~ msgid " -o [dir] \t--operatingdir=[dir]\tSet operating directory\n"
-#~ msgstr " -o [dir] \t--operatingdir=[dir]\t÷ÓÔÁÎÏ×ÉÔÉ ÒÏÂÏÞÉÊ ËÁÔÁÌÏÇ\n"
-
-#~ msgid " -p \t\t--pico\t\t\tEmulate Pico as closely as possible\n"
-#~ msgstr " -p\t \t--pico\t\t\tåÍÕÌÀ×ÁÔÉ Pico ÎÁÓ˦ÌØËÉ ÃÅ ÍÏÖÌÉ×Ï\n"
-
-#~ msgid ""
-#~ " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
-#~ msgstr ""
-#~ " -r [#ÓÔÏ×Ð]\t--fill=[#ÓÔÏ×Ð]\t\túÁÇÏÒÔÁÔÉ ÒÑÄËÉ × ÐÏÚÉæ§ ÓÔÏ×ÐÃÑ "
-#~ "#ÓÔÏ×Ð\n"
-
-#~ msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
-#~ msgstr ""
-#~ " -s [ÐÒÏÇ] \t--speller=[ÐÒÏÇ]\táÌØÔÅÒÎ. ÐÒÏÇÒÁÍÁ ÐÅÒÅצÒËÉ ÐÒÁ×ÏÐÉÓÕ\n"
-
-#~ msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
-#~ msgstr " -t \t\t--tempfile\t\tá×ÔÏúÁÐÉÓ ÐÒÉ ×ÉÈÏĦ, ÂÅÚ ÚÁÐÉÔÁÎØ\n"
-
-#~ msgid " -v \t\t--view\t\t\tView (read only) mode\n"
-#~ msgstr " -v \t\t--view\t\t\tòÅÖÉÍ ÐÅÒÅÇÌÑÄÁÎÎÑ (Ô¦ÌØËÉ ÞÉÔÁÎÎÑ)\n"
-
-#~ msgid " -w \t\t--nowrap\t\tDon't wrap long lines\n"
-#~ msgstr " -w \t\t--nowrap\t\tîÅ ÚÁÇÏÒÔÁÔÉ ÄÏ×Ǧ ÒÑÄËÉ\n"
-
-#~ msgid " -x \t\t--nohelp\t\tDon't show help window\n"
-#~ msgstr " -x \t\t--nohelp\t\tîÅ ÐÏËÁÚÕ×ÁÔÉ ×¦ËÎÏ ÄÏÐÏÍÏÇÉ\n"
-
-#~ msgid " -z \t\t--suspend\t\tEnable suspend\n"
-#~ msgstr " -z \t\t--suspend\t\täÏÚ×ÏÌÉÔÉ ÐÒÉÚÕÐÉÎËÕ\n"
-
-#~ msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
-#~ msgstr " +òñäïë\t\t\t\t\tðÏÞÁÔÉ Ú ÒÑÄËÁ ÎÏÍÅÒ òñäïë\n"
-
-#~ msgid " -D \t\tWrite file in DOS format\n"
-#~ msgstr " -D \t\túÁÐÉÓ ÆÁÊÌÕ Õ ÆÏÒÍÁÔ¦ DOS\n"
-
-#~ msgid " -M \t\tWrite file in Mac format\n"
-#~ msgstr " -M \t\túÁÐÉÓ ÆÁÊÌÕ Õ ÆÏÒÍÁÔ¦ Mac\n"
-
-#~ msgid " -R\t\tUse regular expressions for search\n"
-#~ msgstr " -R\t\tëÏÒÉÓÔÕ×ÁÔÉÓÑ æÏÒÍÁÌØÎÉÍÉ ÷ÉÒÁÚÁÍÉ ÄÌÑ ÐÏÛÕËÕ\n"
-
-#~ msgid " -S\t\tSmooth scrolling\n"
-#~ msgstr " -S\t\tðÌÁ×ÎÁ ÐÒÏËÒÕÔËÁ\n"
-
-#~ msgid "Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses"
-#~ msgstr "ðÁ×ÌÏ ëÕÒÔ¦Ó, úÅÊÄ ÓÉÎ-èÁ̦ÍÁ ÔÁ åÒ¦Ë ó. òÅÊÍÏÎÄ ÚÁ ncurses"
-
-#~ msgid "File already loaded"
-#~ msgstr "æÁÊÌ ×ÖÅ ÚÁ×ÁÎÔÁÖÅÎÏ"
-
-#~ msgid " -R\t\t--regexp\t\tUse regular expressions for search\n"
-#~ msgstr " -R\t\t--regexp\t\tûÕËÁÔÉ ËÏÒÉÓÔÕÀÞÉÓØ æÏÒÍÁÌØÎÉÍÉ ÷ÉÒÁÚÁÍÉ\n"
-
-#~ msgid "Write"
-#~ msgstr "úÁÐÉÓÁÔÉ"
-
-#~ msgid "Case Sensitive Regexp Search%s%s"
-#~ msgstr "òÅÇÉÓÔÒÏÚÁÌÅÖÎÉÊ ÐÏÛÕË æÏÒÍÁÌØÎÏÇÏ ÷ÉÒÁÚÕ%s%s"
+#~ "Внутрішн� помилка: не вдало�� в�тановити відповідні�ть р�дка %ld. "
+#~ "Збережіть результати вашої роботи."
 
-#~ msgid "Regexp Search%s%s"
-#~ msgstr "ðÏÛÕË æÏÒÍÁÌØÎÏÇÏ ÷ÉÒÁÚÕ%s%s"
+#~ msgid "line wrap"
+#~ msgstr "перене�енн� р�дка"
 
-#~ msgid "Only %d lines available, skipping to last line"
-#~ msgstr "ô¦ÌØËÉ %d ÒÑÄË¦× Õ ÎÁÑ×ÎÏÓÔ¦, ÓËÉÐÁ¤ÍÏ ÄÏ ÏÓÔÁÎÎØÏÇÏ ÒÑÄËÁ"
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Дозволити функцію �ка�уванн� дій [ЕКСПЕРИМЕ�Т�ЛЬ��]"
diff --git a/po/vi.gmo b/po/vi.gmo
index 487a4ca..747c9f8 100644
--- a/po/vi.gmo
+++ b/po/vi.gmo
diff --git a/po/vi.po b/po/vi.po
index fb2db9a..4408378 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,122 +1,151 @@
 # Vietnamese translation for Nano.
-# Copyright © 2010 Free Software Foundation, Inc.
+# Bản dịch tiếng Việt dành cho nano.
+# Copyright © 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
 # Phan Vinh Thinh <teppi82@gmail.com>, 2005, 2006.
 # Clytie Siddall <clytie@riverland.net.au>, 2007-2010.
+# Trần Ng�c Quân <vnwildman@gmail.com>, 2012-2014, 2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.99pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-04-07 17:07+0930\n"
-"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2015-03-19 07:56+0700\n"
+"Last-Translator: Trần Ng�c Quân <vnwildman@gmail.com>\n"
+"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.8\n"
+"X-Language-Team-Website: <http://translationproject.org/team/vi.html>\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "�i tới thư mục"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
-msgstr "Bị thôi"
+msgstr "Bị hủy b�"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "Không đi ra được bên ngoài của %s trong chế độ hạn chế"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
-msgstr "Lỗi đ�c %s: %s"
+msgstr "Gặp lỗi khi đ�c %s: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
-msgstr "Không thể nâng lên một thư mục"
+msgstr "Không thể nhảy lên một thư mục"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
-msgstr "(thư mục)"
+msgstr "(thmục)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
-msgstr "(thư mục cha)"
+msgstr "(thmục cha)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [Tính đến kiểu chữ]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [Biểu thức chính quy]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [Ngược lại]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
-msgstr "Tìm (cuộn lại)"
+msgstr "Tìm Toàn bộ"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
-msgstr "�ây là tương ứng duy nhất"
+msgstr "�ây là lần xảy ra duy nhất"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
-msgstr "Không có mẫu tìm kiếm hiện th�i"
+msgstr "Không có mẫu tìm kiếm hiện tại"
+
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+"Không thể nhận ra định danh của tôi dành cho tập tin khóa (hàm getpwuid() "
+"gặp lỗi)"
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "Không thể dò tìm tên máy cho tập tin khóa: %s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "Gặp lỗi khi ghi tập tin khóa %s: %s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "Gặp lỗi khi xóa tập tin khóa %s: %s"
 
-#: src/files.c:125
+#: src/files.c:272
+#, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "Gặp lỗi khi mở tập tin khóa %s: %s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "Gặp lỗi khi đ�c tập tin khóa %s: Dữ liệu không đủ"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr "Tập tin %s đang được biên soạn (bởi %s bằng %s, PID %d); tiếp tục?"
+
+#: src/files.c:308
+#, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "Gặp lỗi khi ghi tập tin khóa: Thư mục “%s� không tồn tại"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "Không chèn được tập tin từ bên ngoài của %s"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "Không còn bộ đệm mở tập tin nữa"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "�ã chuyển tới %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
-msgstr "Bộ đệm mới"
+msgstr "Bộ nhớ đệm mới"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
-msgstr[0] "��c %lu dòng (�ã chuyển đổi từ định dạng DOS và Mac)"
+msgstr[0] "��c %lu dòng (�ược chuyển đổi từ định dạng DOS và Mac)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -125,508 +154,471 @@ msgid_plural ""
 "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
 "permission)"
 msgstr[0] ""
-"��c %lu dòng (�ã chuyển đổi từ định dạng DOS và Mac — Cảnh báo : không có "
+"��c %lu dòng (�ã chuyển đổi từ định dạng DOS và Mac — Cảnh báo: Không có "
 "quy�n ghi)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "��c %lu dòng (�ã chuyển đổi từ định dạng Mac)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from Mac format - Warning: No write permission)"
 msgstr[0] ""
-"��c %lu dòng (�ã chuyển đổi từ định dạng Mac — Cảnh báo : không có quy�n ghi)"
+"��c %lu dòng (�ã chuyển đổi từ định dạng Mac — Cảnh báo: không có quy�n ghi)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "��c %lu dòng (�ã chuyển đổi từ định dạng DOS)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS format - Warning: No write permission)"
 msgstr[0] ""
-"��c %lu dòng (�ã chuyển đổi từ định dạng DOS — Cảnh báo : không có quy�n ghi)"
+"��c %lu dòng (�ã chuyển đổi từ định dạng DOS — Cảnh báo: không có quy�n ghi)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "��c %lu dòng"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] "��c %lu dòng (Cảnh báo : không có quy�n ghi)"
+msgstr[0] "��c %lu dòng (Cảnh báo: Không có quy�n ghi)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "�ang đ�c tập tin"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "Tập tin mới"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
-msgstr "Không tìm thấy « %s »"
+msgstr "Không tìm thấy “%s�"
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
-msgstr "« %s » là một thư mục"
+msgstr "“%s� là một thư mục"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
-msgstr "« %s » là một tập tin thiết bị"
+msgstr "“%s� là một tập tin thiết bị"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "Câu lệnh để thực hiện trong bộ đệm mới [từ %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "Câu lệnh để thực hiện [từ %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "Tập tin để chèn vào bộ đệm mới [từ %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "Tập tin để chèn [từ %s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "Phím không hợp lệ trong chế độ khác đa bộ đệm"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr ""
+"Ghi tập tin sao lưu dự phòng gặp lỗi, tiếp tục ghi? (Gõ N hay K nếu không "
+"chắc chắn)"
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "Không ghi được ra bên ngoài của %s"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr ""
 "Không thể thêm vào trước hoặc thêm vào sau một liên kết m�m bằng tùy ch�n --"
 "nofollow"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "Gặp lỗi khi ghi tập tin sao lưu %s: %s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
-msgstr "Quá nhi�u tập tin lưu trữ?"
+msgstr "Quá nhi�u tập tin sao lưu dự phòng?"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
-msgstr "Lá»—i ghi nhá»› %s: %s"
+msgstr "Gặp lỗi khi ghi %s: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
-msgstr "Lỗi ghi nhớ tập tin tạm th�i: %s"
+msgstr "Gặp lỗi khi ghi tập tin tạm th�i: %s"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "�ã ghi %lu dòng"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [�ịnh dạng DOS]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [�ịnh dạng Mac]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
-msgstr " [Lưu trữ]"
+msgstr " [Sao lưu dự phòng]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "Thêm lựa ch�n vào trước Tập tin"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "Thêm lựa ch�n vào sau Tập tin"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
-msgstr "Ghi nhớ lựa ch�n vào một tập tin"
+msgstr "Lưu lựa ch�n vào một tập tin"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "Tên tập tin để thêm vào trước"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "Tên tập tin để thêm vào sau"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
-msgstr "Tên tập tin để ghi nhớ"
+msgstr "Tên tập tin dùng để ghi vào"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
-msgstr "Tập tin đã tồn tại, GHI �È LÊN ? "
+msgstr "Tập tin đã có sẵn, GHI �È LÊN ? "
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
-msgstr "Ghi nhớ tập tin dưới TÊN KH�C ? "
+msgstr "Ghi tập tin bằng TÊN MỚI ? "
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
-"Tập tin bị sửa đổi kể từ lần bạn mở cuối cùng: có nên tiếp tục lưu không?"
+msgstr "Tập tin bị sửa đổi kể từ lần bạn mở cuối cùng, có tiếp tục lưu không? "
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(còn nữa)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"Nhấn Enter để tiếp tục khởi chạy nano.\n"
+"Hãy nhấn RETURN để tiếp tục\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "Thôi"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "Thay thế"
+#: src/files.c:2989
+#, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"Không thể tạo thư mục %s: %s\n"
+"Nó là yêu cầu cho tải/ghi lịch sử tìm kiếm hay vị trí của con tr�.\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "Không thay thế"
+#: src/files.c:2995
+#, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"�ư�ng dẫn “%s� không phải là thư mục và cần phải thế.\n"
+"Nano sẽ không thể tải hay ghi lịch sử tìm kiếm hay vị trí con tr� chuột.\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "Tính đến kiểu chữ"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"Tìm thấy tập tin lịch sử cũ của nano (%s) cái mà tôi đã thử di chuyển đến\n"
+"vị trí ưu tiên (%s) nhưng lại gặp một lỗi: %s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "Ngược lại"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"Tìm thấy tập tin lịch sử cũ của nano (%s) cái mà Tôi đã di chuyển\n"
+"tới vị trí ưu tiên (%s)\n"
+"(xem FAQ của nano để có thông tin v� thay đổi này)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "Biểu thức chính quy"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "Thoát"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "Lịch sử lùi"
+#: src/global.c:478
+msgid "Close"
+msgstr "�óng"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "Lịch sử kế"
+#: src/global.c:479
+msgid "Uncut Text"
+msgstr "Dán chữ"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "Tới văn bản"
+#: src/global.c:481
+msgid "Unjustify"
+msgstr "B�CănHàng"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
-msgstr "Tiếp theo ở đâu"
-
-#: src/global.c:457
-msgid "First File"
-msgstr "Tập tin đầu"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "Tập tin cuối"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "Tới tập tin"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "�ịnh dạng DOS"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "�ịnh dạng Mac"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "Phụ thêm"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "Thêm vào trước"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "Lưu trữ tập tin"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "Thực hiện lệnh"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "Tới thư mục"
+msgstr "Tiếp là đâu"
 
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "Trợ giúp"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "Thoát"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
-msgstr "Ở đâu"
-
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "Trang trÆ°á»›c"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "Trang kế"
+msgstr "Tìm kiếm"
 
-#: src/global.c:485
-msgid "First Line"
-msgstr "Dòng đầu"
+#: src/global.c:493
+msgid "Replace"
+msgstr "Thay thế"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "Dòng cuối"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "Tới dòng"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "NgÆ°ng"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "Dòng trước"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "�ầu đoạn văn"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "Dòng kế"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "Cuối đoạn văn"
+#: src/global.c:497
+msgid "Read File"
+msgstr "��c T.tin"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "Sắp hàng đầy đủ"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "Cập nhật"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "Chèn tập tin"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "Tới dòng"
-
-#: src/global.c:500
-msgid "Justify the current paragraph"
-msgstr "Sắp chữ đúng hàng cho đoạn văn hiện th�i"
-
 #. TRANSLATORS: The next long series of strings are shortcut descriptions;
 #. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:507
+msgid "Justify the current paragraph"
+msgstr "Sắp chữ đúng hàng cho đoạn văn hiện tại"
+
+#: src/global.c:509
 msgid "Cancel the current function"
-msgstr "Dừng hàm hiện th�i"
+msgstr "Hủy hàm hiện tại"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "Hiển thị trợ giúp này"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
-msgstr "�óng bộ đệm tập tin hiện th�i/Thoát nano"
+msgstr "�óng bộ đệm tập tin hiện tại / Thoát từ nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "Thoát kh�i nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
-msgstr "Ghi nhớ tập tin hiện th�i lên đĩa"
+msgstr "Ghi tập tin hiện tại lên đĩa"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
-msgstr "Chèn tập tin khác vào tập tin hiện th�i"
+msgstr "Chèn tập tin khác vào tập tin hiện tại"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "Tìm một chuỗi hay biểu thức chính quy"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "V� màn hình trước"
+#: src/global.c:526
+msgid "Search for a string"
+msgstr "Tìm một chuỗi nào đó"
 
-#: src/global.c:521
-msgid "Go to next screen"
-msgstr "Tới màn hình kế"
+#: src/global.c:528
+msgid "Go one screenful up"
+msgstr "�i lên một màn hình"
 
-#: src/global.c:523
+#: src/global.c:529
+msgid "Go one screenful down"
+msgstr "�i xuống một màn hình"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
-msgstr "Cắt dòng hiện th�i và ghi nhớ nó vào bộ đệm cắt"
+msgstr "Cắt dòng hiện tại và ghi nó vào bộ đệm cắt"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
-msgstr "Hủy cắt từ bộ đệm cắt vào dòng hiện th�i"
+msgstr "Dán từ bộ đệm cắt vào dòng hiện tại"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "Hiển thị vị trí con tr�"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "G�i trình kiểm tra chính tả, nếu có thể"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "Thay thế một chuỗi hay biểu thức chính quy"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "Chuyển tới dòng và cột có số thứ tự đưa ra"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
-msgstr "�ặt nhãn cho văn bản tại vị trí con tr�"
+#: src/global.c:541
+msgid "Mark text starting from the cursor position"
+msgstr "�ánh dấu văn bản bắt đầu tại vị trí con tr�"
 
-#: src/global.c:535
-msgid "Repeat last search"
-msgstr "Lặp lại tìm kiếm cuối cùng"
+#: src/global.c:542
+msgid "Repeat the last search"
+msgstr "Lặp lại tìm kiếm cuối"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
-msgstr "Sao chép dòng hiện th�i và ghi nhớ nó vào bộ đệm cắt"
+msgstr "Sao chép dòng hiện tại và ghi nó vào bộ đệm cắt"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "Thụt l� dòng hiện tại"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "Hủy thụt l� dòng hiện tại"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "Hủy bước vừa mới làm"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "Làm lại bước vừa mới được hủy"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "Tiếp tới một ký tự"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "Lùi lại một ký tự"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "Tiếp tới một từ"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "Lùi lại một từ"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "V� dòng trước"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "Tới dòng kế"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "V� đầu của dòng hiện tại"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "Tới cuối của dòng hiện tại"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "V� đầu của đoạn văn này; rồi v� đầu của đoạn văn trước"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr ""
 "Tới đúng sau cuối của đoạn văn này; rồi tới đúng sau cuối của đoạn văn sau"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "V� dòng đầu của tập tin"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "Tới dòng cuối của tập tin"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "Tới dấu ngoặc tương ứng"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "�ưa màn hình lên một dòng nhưng giữ nguyên vị trí con tr�"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "�ưa màn hình xuống một dòng nhưng giữ nguyên vị trí con tr�"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "Chuyển tới bộ đệm tập tin trước"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "Chuyển tới bộ đệm tập tin tiếp theo"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "Chèn ký tự kế tiếp đúng nguyên văn"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "Chèn một ký tự tab tại vị trí con tr�"
 
@@ -634,330 +626,434 @@ msgstr "Chèn một ký tự tab tại vị trí con tr�"
 msgid "Insert a newline at the cursor position"
 msgstr "Chèn một ký tự dòng mới tại vị trí con tr�"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "Xóa ký tự nằm dưới con tr�"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "Xóa ký tự ở bên trái con tr�"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "Cắt từ vị trí con tr� tới cuối tập tin"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "Sắp chữ đúng hàng cho cả tập tin"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "�ếm số từ, số dòng và số ký tự"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
-msgstr "Cập nhật (vẽ lại) màn hình hiện th�i"
+msgstr "Cập nhật (vẽ lại) màn hình hiện tại"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "Ngưng trình soạn thảo (nếu tính năng ngưng đã được bật)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr "Bật/tắt khả năng phân biệt chữ hoa/thư�ng của việc tìm"
+msgstr "Bật/tắt phân biệt chữ HOA/thư�ng khi tìm kiếm"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "�ảo ngược hướng tìm"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "Bật/tắt khả năng sử dụng biểu thức chính quy"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "Xem lại chuỗi tìm kiếm/thay thế trước"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "Xem lại chuỗi tìm kiếm/thay thế kế"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "�i tới trình duyệt tập tin"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "Bật/tắt khả năng sử dụng định dạng DOS"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "Bật/tắt khả năng sử dụng định dạng Mac"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "Bật/tắt khả năng phụ thêm"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "Bật/tắt khả năng thêm vào trước"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "Bật/tắt khả năng sao lưu tập tin gốc"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "Thực hiện câu lệnh ngoại trú"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "Bật/tắt khả năng sử dụng bộ đệm mới"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "Thoát kh�i trình duyệt tập tin"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "Chuyển tới dòng đầu tiên của danh sách"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "Chuyển tới dòng cuối cùng của danh sách"
 
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "Chuyển tới tập tin đằng sau trong danh sách"
-
-#: src/global.c:642
+#: src/global.c:634
 msgid "Go to the previous file in the list"
 msgstr "Chuyển tới tập tin đằng trước trong danh sách"
 
-#: src/global.c:643
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "Chuyển tới tập tin đằng sau trong danh sách"
+
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "�i tới thư mục"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "�óng"
+#: src/global.c:639
+msgid "Invoke the linter, if available"
+msgstr "G�i trình lint, nếu có thể"
+
+#: src/global.c:640
+msgid "Go to previous linter msg"
+msgstr "�ến l�i nhắn lint kế trước"
+
+#: src/global.c:641
+msgid "Go to next linter msg"
+msgstr "�ến l�i nhắn lint kế"
+
+#: src/global.c:642
+msgid "Invoke formatter, if available"
+msgstr "G�i trình định dạng, nếu có thể"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "Trợ giúp"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
-msgstr "Ghi"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "Hủy b�"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:678
+msgid "Write Out"
+msgstr "Ghi lại"
+
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "Tới ThMục"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "Cắt chữ"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "Sắp chữ"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "��c tập tin"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "Chính tả"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "Cắt văn bản"
+#: src/global.c:738
+msgid "To Linter"
+msgstr "Lint"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "Hủy sắp chữ"
+#: src/global.c:740
+msgid "Formatter"
+msgstr "Bộ định dạng"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "Tính đến kiểu chữ"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "Hủy cắt văn bản"
+#: src/global.c:750
+msgid "Regexp"
+msgstr "BTCQ"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:755
+msgid "Backwards"
+msgstr "Ngược lại"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "Không thay thế"
+
+#: src/global.c:770
 msgid "Cur Pos"
-msgstr "Vị trí con tr�"
+msgstr "Vị trí"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "Chính tả"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "TrangTrÆ°á»›c"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "Trang kế"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "Dòng đầu"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "Dòng cuối"
+
+#: src/global.c:794
+msgid "To Bracket"
+msgstr "�ặt Ngoặc"
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "�ánh dấu văn bản"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
-msgstr "Chép văn bản"
+msgstr "Chép VBản"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
-msgstr "Thụt l� văn bản"
+msgstr "Thụt VBản"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "Hủy thụt l� văn bản"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "Hủy bước"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "Hoàn lại"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "Tiếp"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "Lùi"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "Từ kế"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "Kế tiếp"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "Từ trước"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "Dòng trước"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "Dòng kế"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "Từ kế"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "Nhà"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "Cuối"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "Tìm ngoặc đơn khác"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "�ầu đoạn văn"
 
-#: src/global.c:848
-msgid "Scroll Up"
-msgstr "�ưa lên"
+#: src/global.c:846
+msgid "End of Par"
+msgstr "Cuối đoạn văn"
 
 #: src/global.c:851
-msgid "Scroll Down"
-msgstr "�ưa xuống"
+msgid "Scroll Up"
+msgstr "Cuộn lên"
 
-#: src/global.c:856
-msgid "Previous File"
-msgstr "Tập tin trước"
+#: src/global.c:853
+msgid "Scroll Down"
+msgstr "Cuộn xuống"
 
 #: src/global.c:858
+msgid "Prev File"
+msgstr "Tập tin Trước"
+
+#: src/global.c:860
 msgid "Next File"
-msgstr "Tập tin kế"
+msgstr "Tập tin Sau"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
-msgstr "Dữ liệu nhập nguyên bản"
+#: src/global.c:869
+msgid "Verbatim"
+msgstr "�úng nguyên văn"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "Tab"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "Enter"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
-msgstr "Xoá"
+msgstr "Xóa"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
-msgstr "Xoá lùi"
+msgstr "Xóa lùi"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
-msgstr "Cắt đến cuối"
+msgstr "Cắt�ếnCuối"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "�ếm từ"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "NgÆ°ng"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "LịchSửTrước"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "LịchSửKế"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "Tới văn bản"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "�ịnh dạng DOS"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "�ịnh dạng Mac"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "Phụ thêm"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "Thêm vào trước"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "Tập tin Sao lưu dự phòng"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "Thực hiện lệnh"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "Tới tập tin"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "Tập tin đầu"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "Tập tin cuối"
+
+#: src/global.c:977
+msgid "Prev Lint Msg"
+msgstr "LNhắn Lint tr"
+
+#: src/global.c:979
+msgid "Next Lint Msg"
+msgstr "LNhắn Lint sau"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "Chế độ Trợ giúp"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "Hiển thị ví trí cố định của con tr�"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
-msgstr "Sử dụng dòng thêm để soạn thảo"
+msgstr "Sử dụng nhi�u dòng hơn dành cho việc soạn thảo"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "Cuộn trơn mượt"
 
-#: src/global.c:1375
+#: src/global.c:1235
+msgid "Soft wrapping of overlong lines"
+msgstr "Ngắt m�m những dòng dài"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "Hiển thị khoảng trắng"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
-msgstr "Chiếu sáng cú pháp"
+msgstr "Tô sáng cú pháp"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "Phím home khéo"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "Tự động thụt l�"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "Cắt tới cuối"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "Ngắt dòng dài"
+#: src/global.c:1247
+msgid "Hard wrapping of overlong lines"
+msgstr "Ngắt cứng những dòng dài"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "Chuyển các tab thành dấu cách"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
-msgstr "Lưu trữ tập tin"
+msgstr "Tập tin sao lưu dự phòng"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "Bộ đệm đa tập tin"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "Hỗ trợ chuột"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "Không chuyển đổi từ định dạng DOS/Mac"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "Tạm dừng"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "Ngắt dòng m�m"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -979,7 +1075,7 @@ msgstr ""
 "kiếm.  Không nhập văn bản nào và gõ Enter sẽ thực hiện tìm kiếm ngay trước "
 "này.  "
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -993,7 +1089,7 @@ msgstr ""
 " Những phím chức năng sau có trong chế độ Tìm kiếm:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1012,7 +1108,7 @@ msgstr ""
 " Có thể dùng các phím chức năng sau trong chế độ Tới dòng:\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1026,7 +1122,7 @@ msgid ""
 msgstr ""
 "Văn bản của Trợ giúp cho Chèn tập tin\n"
 "\n"
-" Hãy gõ tên của tập tin bạn muốn chèn vào bộ đệm hiện th�i tại vị trí con "
+" Hãy gõ tên của tập tin bạn muốn chèn vào bộ đệm hiện tại tại vị trí con "
 "tr�.\n"
 "\n"
 " Nếu bạn đã biên dịch nano với sự hỗ trợ đa bộ đệm, và bật sự hỗ trợ này "
@@ -1035,7 +1131,7 @@ msgstr ""
 "việc nạp tập tin đó vào một bộ đệm riêng (sử dụng Meta-< và > để chuyển giữa "
 "các bộ đệm này).  "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1049,7 +1145,7 @@ msgstr ""
 " Có những phím chức năng sau trong chế độ Chèn Tập tin:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1064,20 +1160,20 @@ msgid ""
 " The following function keys are available in Write File mode:\n"
 "\n"
 msgstr ""
-"Văn bản của Trợ giúp cho Ghi nhớ tập tin\n"
+"Văn bản của Trợ giúp cho việc lưu tập tin\n"
 "\n"
-" Hãy gõ tên bạn muốn ghi nhớ cho tập tin hiện th�i và gõ Enter để hoàn thành "
-"ghi nhá»›.\n"
+" Hãy gõ tên bạn muốn lưu cho tập tin hiện tại và gõ Enter để hoàn thành "
+"lÆ°u.\n"
 "\n"
 " Nếu đã lựa ch�n một đoạn văn bản nào đó (bằng dấu hiệu), thì chương trình "
-"sẽ nhắc ghi nhớ đoạn văn bản đã lựa ch�n đó vào một tập tin riêng rẽ.  �ể "
-"giảm khả năng ghi một phần đè lên cả tập tin hiện th�i, thì tên tập tin hiện "
-"th�i không phải là mặc định trong chế độ này.\n"
+"sẽ nhắc lưu đoạn văn bản đã lựa ch�n đó vào một tập tin riêng rẽ.  �ể giảm "
+"khả năng ghi một phần đè lên cả tập tin hiện tại, thì tên tập tin hiện tại "
+"không phải là mặc định trong chế độ này.\n"
 "\n"
-" Có thể dùng các phím chức năng sau trong chế độ Ghi nhớ Tập tin:\n"
+" Có thể dùng các phím chức năng sau trong chế độ lưu Tập tin:\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1095,13 +1191,13 @@ msgstr ""
 " Trình duyệt tập tin sử dụng cho việc xem cấu trúc thư mục và ch�n một tập "
 "tin để đ�c hay soạn thảo.  Bạn có thể sử dụng các phím mũi tên hoặc Page Up/"
 "Down để di chuyển qua các tập tin, và S hoặc Enter để ch�n tập tin hay thư "
-"mục đánh dấu.  �ể di chuyển lên trên một bậc, hãy ch�n thư mục có tên \"..\" "
+"mục đánh dấu.  �ể di chuyển lên trên một bậc, hãy ch�n thư mục có tên “..� "
 "trên đầu danh sách.\n"
 "\n"
 " Có thể dùng các phím chức năng sau trong trình duyệt:\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1125,7 +1221,7 @@ msgstr ""
 "này.\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1133,7 +1229,7 @@ msgstr ""
 "Có thể dùng các phím chức năng sau trong chế độ Tìm trong trình duyệt:\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1156,7 +1252,7 @@ msgstr ""
 "mục:\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1172,14 +1268,14 @@ msgstr ""
 "Văn bản của Trợ giúp cho Kiểm tra chính tả\n"
 "\n"
 " Trình kiểm tra chính tả sẽ kiểm tra chính tả của tất cả văn bản trong tập "
-"tin hiện th�i.  Khi tìm thấy một từ không biết, nó sẽ chiếu sáng và có thể "
+"tin hiện tại.  Khi tìm thấy một từ không biết, nó sẽ chiếu sáng và có thể "
 "soạn thảo một thay thế.  Sau đó nó sẽ nhắc thay thế m�i từ sai lỗi chính tả "
-"này trong tập tin hiện th�i, hoặc, trong đoạn văn bản đã đánh dấu, nếu có.\n"
+"này trong tập tin hiện tại, hoặc, trong đoạn văn bản đã đánh dấu, nếu có.\n"
 "\n"
 " Có các chức năng sau trong chế độ Kiểm tra chính tả:\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1193,13 +1289,13 @@ msgstr ""
 "Văn bản của Trợ giúp cho Thực hiện Câu lệnh\n"
 "\n"
 " Chế độ này cho phép bạn chèn kết quả của một câu lệnh chạy bằng trình bao "
-"vào bộ đệm hiện th�i (hoặc vào một bộ đệm mới ở chế độ đa bộ đệm). Nếu cần "
+"vào bộ đệm hiện tại (hoặc vào một bộ đệm mới ở chế độ đa bộ đệm). Nếu cần "
 "một bộ đệm trống khác, thì đừng nhập câu lệnh.\n"
 "\n"
 " Có thể dùng các phím sau trong chế độ Thực hiện Câu lệnh:\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1210,7 +1306,7 @@ msgid ""
 "showing the file being edited.  The status line is the third line from the "
 "bottom and shows important messages.  "
 msgstr ""
-"Văn bản Trợ giúp Chính của nano\n"
+"Trợ giúp Chính dạng văn bản của nano\n"
 "\n"
 " Trình soạn thảo nano được thiết kế để nâng cao tính năng suất và sự dễ sử "
 "dụng của trình soạn thảo UW Pico.  Nano gồm bốn phần chính. Dòng trên cùng "
@@ -1219,7 +1315,7 @@ msgstr ""
 "đang soạn thảo.  Dòng trạng thái là dòng thứ ba từ dưới lên và hiển thị "
 "những thông báo quan tr�ng."
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1237,7 +1333,7 @@ msgstr ""
 "ký hiệu bằng ký tự Meta (M) và nhập vào bằng (một trong) các phím Esc, Alt "
 "hay Meta tùy thuộc vào cấu hình bàn phím.  "
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1250,456 +1346,486 @@ msgstr ""
 "sổ soạn thảo chính.  Các phím tương đương đặt trong dấu ngoặc đơn:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "bật/tắt"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "Phím không hợp lệ trong chế độ xem"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
 "Buffer written to %s\n"
 msgstr ""
 "\n"
-"Ghi nhớ bộ đệm vào %s\n"
+"Bộ nhớ đệm ghi vào %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
 "Buffer not written to %s: %s\n"
 msgstr ""
 "\n"
-"Chưa ghi nhớ bộ đệm vào %s: %s\n"
+"Bộ nhớ đệm chưa được ghi vào %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
 "Buffer not written: %s\n"
 msgstr ""
 "\n"
-"Chưa ghi nhớ bộ đệm: %s\n"
+"Bộ nhớ đệm chưa được ghi lại: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
-msgstr "Kích thước cửa sổ quá nh� cho nano...\n"
+msgstr "Kích thước cửa sổ quá nh� cho nano…\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
-"Sử dụng: nano [TÙY_CHỌN] [[+DÒNG,CỘT] TẬP_TIN]...\n"
+"Cách dùng: nano [TÙY_CHỌN] [[+DÒNG,CỘT] TẬP_TIN]…\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
-msgstr "Tùy ch�n\t\tTùy ch�n GNU dài\t\t� nghĩa\n"
+msgstr "Tùy ch�n\tTùy ch�n GNU dài\t� nghĩa\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "Tùy ch�n\t\t� nghĩa\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "Hiển thị thông báo này"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+DÒNG,CỘT"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
-msgstr "Bắt đầu trên dòng DÒNG, cột CỘT"
+msgstr "Bắt đầu tại dòng DÒNG, cột CỘT"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "Bật dùng phím home khéo"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "Lưu trữ các tập tin đã có"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
-msgstr "-C <thư mục>"
+msgstr "-C <thư_mục>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
-msgstr "--backupdir=<thư mục>"
+msgstr "--backupdir=<thư_mục>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
-msgstr "Thư mục để ghi nhớ tập tin lưu trữ duy nhất"
+msgstr "Thư mục để lưu tập tin lưu trữ duy nhất"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "Hiển thị chữ in đậm thay cho chữ ảnh động đảo ngược"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "Chuyển tab thành dấu cách"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "Bật dùng bộ đệm đa tập tin"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "Dùng các tập tin khóa (kiểu-vim)"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "Ghi lại và đ�c lịch sử các chuỗi tìm kiếm/thay thế"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "�ừng nhìn vào các tập tin nanorc"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "Giải quyết vấn đ� nhầm lẫn trên bàn phím số"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "�ừng thêm dòng mới vào cuối tập tin"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "�ừng chuyển đổi tập tin từ định dạng DOS/Mac"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "Sử dụng một dòng thêm để soạn thảo"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "Ghi nhật ký & đ�c vị trí tại vị trí con tr�"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <chuá»—i>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<chuá»—i>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "Chuỗi dùng để trích dẫn"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "Chế độ hạn chế"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "Cuộn theo dòng thay vào theo nửa màn hình"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
-msgstr "-T <số_cột>"
+msgstr "-T <#số_cột>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=<số_cột>"
+msgstr "--tabsize=<#số_cột>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "�ặt độ rộng của tab tính theo cột tới số cột này"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "Xóa nhanh dòng trạng thái"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "In ra thông tin phiên bản và thoát"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "Nhận dạng ranh giới của từ cẩn thận hơn"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <chuá»—i>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<chuá»—i>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "�ịnh nghĩa cú pháp để sử dụng khi tô màu"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "Luôn luôn hiển thị vị trí con tr�"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "Giải quyết vấn đ� nhầm lẫn Backspace/Delete"
 
-#: src/nano.c:888
+#: src/nano.c:915
+msgid "Show this help text"
+msgstr "Hiển thị trợ giúp này"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "Tự động thụt các dòng mới"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "Cắt từ vị trí con tr� tới cuối dòng"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "�ừng đi theo liên kết m�m, hãy ghi đè"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
-msgstr "Hỗ trợ chuột"
+msgstr "Hỗ trợ việc dùng chuột"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr "Không thể đ�c tập tin (chỉ có thể ghi nó)"
+
+#: src/nano.c:928
 msgid "-o <dir>"
-msgstr "-o <thư mục>"
+msgstr "-o <thư_mục>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
-msgstr "--operatingdir=<thư mục>"
+msgstr "--operatingdir=<thư_mục>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "�ặt thư mục thao tác"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
-msgstr "Giữ gìn các phím XON (^Q) và XOFF (^S)"
+msgstr "Cấm các phím XON (^Q) và XOFF (^S)"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
-"B� qua im (không xuất thông điệp) các vấn đ� khởi chạy, v.d. lỗi tập tin rc"
+msgstr "Không xuất các l�i nhắn v� các vấn đ� khởi chạy như là lỗi tập tin rc"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
-msgstr "-r <số_cột>"
+msgstr "-r <#số_cột>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
-msgstr "--fill=<số_cột>"
+msgstr "--fill=<#số_cột>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
-msgstr "�ặt điểm ngắt dòng tính theo cột tới số cột này"
+#: src/nano.c:939
+msgid "Set hard-wrapping point at column #cols"
+msgstr "�ặt điểm ngắt dòng cứng tính tại #cột này"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <chương trình>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
-msgstr "--speller=<chương trình>"
+msgstr "--speller=<ch_trình>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "Dùng chương trình kiểm tra chính tả khác"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
-msgstr "Tự động ghi nhớ khi thoát, đừng h�i lại"
+msgstr "Tự động lưu khi thoát, đừng h�i lại"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "Cho phép hủy bước giống loài [VẪN THỰC NGHIỆM]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "Chế độ Xem (chỉ đ�c)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+msgid "Don't hard-wrap long lines"
 msgstr "�ừng ngắt những dòng dài"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "�ừng hiển thị hai dòng trợ giúp"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
-msgstr "Bật dùng sự Tạm hoãn"
+msgstr "Bật tạm ngưng"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "Bật ngắt dòng m�m"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(bị l� đi, để tương thích với Pico)"
-
-#: src/nano.c:938
+#: src/nano.c:963
 #, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano phiên bản %s (biên dịch %s, %s)\n"
+msgid " GNU nano, version %s\n"
+msgstr " GNU nano, phiên bản %s\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
-msgstr " �ịa chỉ thư : nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
+msgstr " �ịa chỉ thư: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
 " Compiled options:"
 msgstr ""
 "\n"
-" Tùy ch�n được biên dịch:"
+" Tùy ch�n biên dịch:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
-msgstr "Rất tiếc, hỗ trợ cho chức năng này bị tắt"
+msgstr "Rất tiếc, hỗ trợ cho chức năng này đã bị tắt"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr "Không có tên tập tin"
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
-msgstr "Ghi bộ đệm đã sửa đổi (TRẢ LỜI \"K\" SẼ BỎ MỌI THAY �ỔI) (C/K) ? "
+msgstr ""
+"Ghi lại bộ đệm đã được sửa đổi (TRẢ LỜI “K� SẼ BỎ MỌI THAY �ỔI) (C/K) ? "
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "Tiếc là không thể mở lại đầu vào tiêu chuẩn từ bàn phím\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr "�ang đ�c từ đầu vào tiêu chuẩn (bấm ^C để hủy b�)\n"
+msgstr "�ang đ�c từ đầu vào tiêu chuẩn, bấm ^C để hủy b�\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "Nhận được tín hiệu SIGHUP hoặc SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "Sử dụng \"fg\" để quay lại nano.\n"
+msgstr "Dùng “fg� để quay lại nano.\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
-msgstr "đã bật"
+msgstr "được bật"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "bị tắt"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "Lệnh không rõ"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "XON bị l� đi."
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "XOFF bị l� đi."
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "Yêu cầu một kích thước tab « %s » không hợp lệ"
+msgstr "Yêu cầu một kích thước tab “%s� không hợp lệ"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "Yêu cầu một kích thước tô đầy « %s » không hợp lệ"
+msgstr "Yêu cầu một kích thước tô đầy “%s� không hợp lệ"
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr "Gõ “%s -h� để biết danh sách các tùy ch�n sẵn có.\n"
 
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Cc"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Kk"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Tt"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "Có"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "Tất cả"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "Không"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "Lỗi trong %s trên dòng %lu: "
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "�ối số « %s » không kết thúc \""
+msgstr "�ối số “%s� chưa được \" kết thúc"
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "Biểu thức chính quy phải bắt đầu và kết thúc bởi một ký tự \""
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "Biểu thức chính quy xấu \"%s\": %s"
+msgstr "Biểu thức chính sai “%s�: %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "Thiếu tên cú pháp"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
-msgstr "Cú pháp \"none\" bị hạn chế"
+msgstr "Cú pháp “none� là được để dành dùng trong tương lai"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
-msgstr "Cú pháp \"default\" không chấp nhận phần mở rộng"
+msgstr "Cú pháp “default� không chấp nhận phần mở rộng"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
-msgstr "Thiếu tên khoá"
+msgstr "Thiếu tên khóa"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
-msgstr "tổ hợp phím phải bắt đầu với « ^ », « M » hoặc « F »"
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr "Tên khóa quá ngắn"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr "Phải ghi rõ chức năng với đó cần tổ hợp phím"
+#: src/rcfile.c:463
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "Nên phím phải bắt đầu với “^�, “M� hoặc “F�"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
+#: src/rcfile.c:472
+msgid "Must specify a function to bind the key to"
+msgstr "Phải ghi rõ hàm ràng buộc với tổ hợp phím"
+
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
-"Phải ghi rõ trình đơn với đó cần tổ hợp phím (hoặc đặt « all » (tất cả))"
+"Phải chỉ định một trình đơn (hoặc \"all\") để mà ràng buộc hay không vào phím"
+
+#: src/rcfile.c:489
+#, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "Không thể ánh xạ tên “%s� đến một hàm"
 
-#: src/rcfile.c:426
+#: src/rcfile.c:496
 #, c-format
-msgid "Could not map name \"%s\" to a function"
-msgstr "Không thể ánh xạ tên « %s » tới một chức năng"
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "Không thể ánh xạ tên “%s� đến một trình đơn"
 
-#: src/rcfile.c:432 src/rcfile.c:517
+#: src/rcfile.c:528
 #, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr "Không thể ánh xạ tên « %s » tới một trình đơn"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr "Chức năng “%s� không tồn tại trong trình đơn “%s�"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:543
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
-msgstr "Tiếc là không cho phép dùng tổ hợp phím « %s »"
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "Tiếc là không cho phép dùng tổ hợp phím “%s�"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, c-format
+msgid "Error expanding %s: %s"
+msgstr "Gặp lỗi khi khải triển %s: %s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1709,150 +1835,206 @@ msgid ""
 "for foreground colors."
 msgstr ""
 "Không hiểu màu %s.\n"
-"Có thể dùng các màu :\n"
-" • green\tlục\n"
-" • red\tđ�\n"
-" • blue\txanh\n"
-" • white\ttrắng\n"
-" • yellow\tvàng\n"
-" • cyan\txanh lá mạ\n"
-" • magenta\tđ� tươi\n"
-" • black\tđên\n"
+"Có thể dùng các màu:\n"
+" * green\tlục\n"
+" * red\tđ�\n"
+" * blue\txanh\n"
+" * white\ttrắng\n"
+" * yellow\tvàng\n"
+" * cyan\txanh lá mạ\n"
+" * magenta\tđ� tươi\n"
+" * black\tđen\n"
 "với ti�n tố không bắt buộc:\n"
-" • bright\tsáng\n"
+" * bright\tsáng\n"
 "cho màu của văn bản."
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "Không thêm được một chỉ thị màu mà không có dòng cú pháp"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "Thiếu tên màu"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "Màu n�n « %s » không thể là màu sáng (khó đ�c)"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "Thiếu các chuỗi biểu thức chính quy"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
-msgstr ""
-"\"start=\" (bắt đầu) thì yêu cầu một phần \"end=\" (kết thúc) tương ứng"
+msgstr "“start=� (bắt đầu) thì yêu cầu một phần “end=� (kết thúc) tương ứng"
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "Màu n�n “%s� không thể là màu sáng (khó đ�c)"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr ""
 "Không thêm được một biểu thức chính quy kiểu phần đầu mà không có câu lệnh "
 "cú pháp"
 
-#: src/rcfile.c:874
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr ""
+"Không thêm được một biểu thức chính quy kiểu chuỗi mà không có câu lệnh cú "
+"pháp"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "Thiếu tên chuỗi kỳ diệu"
+
+#: src/rcfile.c:985
+msgid "Cannot add a linter without a syntax command"
+msgstr "Không thêm được một linter đầu mà không có câu lệnh cú pháp"
+
+#: src/rcfile.c:990
+msgid "Missing linter command"
+msgstr "Thiếu lệnh linter"
+
+#: src/rcfile.c:1010
+msgid "Cannot add formatter without a syntax command"
+msgstr "Không thêm được một bộ định dạng mà không có câu lệnh cú pháp"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr "Thiếu lệnh trình định dạng"
+
+#: src/rcfile.c:1045
 #, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
-msgstr "Lỗi nghiêm tr�ng: chưa ánh xạ phím với chức năng « %s »"
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "Lỗi nghiêm tr�ng: chưa ánh xạ phím với chức năng “%s�. Thoát ra.\n"
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr ""
-"�ang thoát... Hãy sử dụng trình soạn thảo nano với tùy ch�n « -l » nếu cần "
-"thiết, để đi�u chỉnh thiết lập nanorc của bạn\n"
+"Nếu cần, hãy sử dụng trình soạn thảo nano với tùy ch�n “-I� để đi�u chỉnh "
+"cài đặt nanorc của bạn.\n"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "Không thể tìm thấy cú pháp “%s� để khai triển"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr "Lệnh « %s » không được phép trong tập tin đã bao gồm"
+msgstr "Lệnh “%s� không được phép trong tập tin đã bao gồm"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr "Cú pháp « %s » không có câu lệnh màu"
+msgstr "Cú pháp “%s� không có câu lệnh màu"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
-msgstr "Không hiểu câu lệnh « %s »"
+msgstr "Không hiểu câu lệnh “%s�"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "Thiếu c�"
+#: src/rcfile.c:1186
+msgid "Missing option"
+msgstr "Thiếu tùy ch�n"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "Tùy ch�n « %s » cần một tham số"
+msgstr "Tùy ch�n “%s� cần một tham số"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "Tùy ch�n không phải là một chuỗi đa byte hợp lệ"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "Yêu cầu các ký tự không phải khoảng trắng"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "Yêu cầu hai ký tự một cột"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "Không b� đặt được c� « %s »"
+msgid "Cannot unset option \"%s\""
+msgstr "Không thể b� đặt tùy ch�n “%s�"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, c-format
-msgid "Unknown flag \"%s\""
-msgstr "C� không rõ « %s »"
+msgid "Unknown option \"%s\""
+msgstr "Không hiểu tùy ch�n “%s�"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "Tôi không thể tìm thấy thư mục cá nhân của mình!"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"Nhấn Enter để tiếp tục khởi chạy nano.\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
-msgstr "Không tìm thấy \"%.*s%s\""
+msgstr "Không tìm thấy “%.*s%s�"
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [Phân biệt HOA/thư�ng]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [BTCQ]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [Ngược lại]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " (thay thế) trong lựa ch�n"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (thay thế)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
-msgstr "Thay thế tương ứng này?"
+msgstr "Thay thế minh dụ này?"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
-msgstr "Thay thế bởi"
+msgstr "Thay thế bằng"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "�ã thay thế %lu lần"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "Nhập số thứ tự dòng, cột"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "Sai số thứ tự dòng hoặc cột"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "Không phải ngoặc đơn"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "Không có ngoặc đơn tương ứng"
 
@@ -1864,217 +2046,320 @@ msgstr "�ánh dấu văn bản"
 msgid "Mark Unset"
 msgstr "Hủy dấu văn bản"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
-msgstr "Không có gì trong vùng đệm hủy bước !"
+msgstr "Không có gì trong vùng đệm hủy bước!"
 
-#: src/text.c:455 src/text.c:593
+#: src/text.c:445 src/text.c:590
 #, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
-msgstr "Lỗi nội bộ : không thể khớp dòng %d. Hãy lưu tập tin"
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "Lỗi nội bộ: không thể khớp dòng %d. Hãy lưu công việc của bạn lại."
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "thêm văn bản"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
-msgstr "xoá văn bản"
-
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "ngắt dòng"
+msgstr "xóa văn bản"
 
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "nối dòng"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "văn bản cắt"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr "văn bản không cắt"
+msgstr "văn bản dán"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr "chia dòng"
+msgstr "ngắt dòng"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "chèn văn bản"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "thay thế văn bản"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "Lỗi nội bộ : kiểu không rõ. Hãy lưu tập tin"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "Lỗi nội bộ: kiểu không rõ. Hãy lưu công việc của bạn lại."
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "Bước được hủy (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
-msgstr "Không có gì cần hoàn lại !"
+msgstr "Không có gì cần hoàn lại!"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "Lỗi nội bộ : không thiết lập được việc hoàn lại. Hãy lưu tập tin"
+#: src/text.c:584
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr ""
+"Lỗi nội bộ: không thể cài đặt redo (hoàn lại). Hãy lưu công việc của bạn lại."
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "Bước được hoàn lại (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "Không thể gửi qua đư�ng ống"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "Không thể tạo đư�ng ống"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "Không thể tạo tiến trình con"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr "Lỗi nội bộ : không thể thiết lập mà không cắt. Hãy lưu tập tin."
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "Lỗi nội bộ : kiểu không rõ. Hãy lưu tập tin."
+#: src/text.c:969
+msgid "Internal error: cannot set up uncut.  Please save your work."
+msgstr ""
+"Lỗi nội bộ: không thể cài đặt uncut (dán). Hãy lưu công việc của bạn lại."
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
-msgstr "Chuỗi trích dẫn xấu %s: %s"
+msgstr "Chuỗi trích dẫn sai %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "Bây gi� có thể B� sắp chữ!"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "Sửa chuỗi thay thế"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "Không thể tạo đư�ng ống"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "�ang tạo danh sách từ sai chính tả, xin hãy ch�..."
+msgstr "�ang tạo danh sách từ sai chính tả, xin hãy ch�…"
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "Không lấy được kích thước của bộ đệm đư�ng ống"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
-msgstr "Lỗi g�i \"spell\""
+msgstr "Gặp lỗi khi g�i “spell�"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
-msgstr "Lỗi g�i \"sort -f\""
+msgstr "Gặp lỗi khi g�i “sort -f�"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
-msgstr "Lỗi g�i \"uniq\""
+msgstr "Gặp lỗi khi g�i “uniq�"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "Hoàn thành việc kiểm tra chính tả"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
-msgstr "Lỗi g�i \"%s\""
+msgstr "Lỗi g�i “%s�"
 
-#: src/text.c:2960
+#: src/text.c:2885
+msgid "Invoking spell checker, please wait"
+msgstr "G�i trình kiểm tra chính tả, vui lòng ch�"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "Kiểm tra chính tả không thành công: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "Kiểm tra chính tả không thành công: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+msgid "No linter defined for this type of file!"
+msgstr "Không có lint cho kiểu này của tập tin!"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr "Ghi lại bộ đệm đã sửa trước khi lint?"
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr "�ang g�i bộ lint, vui lòng ch�"
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr "Nhận được 0 dòng có thể phân tích từ lệnh: %s"
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+"L�i nhắn này là dành cho tập tin %s chưa được mở, mở nó trong bộ đệm mới?"
+
+#: src/text.c:3205
+msgid "At last message"
+msgstr "Tại thông báo cuối"
+
+#: src/text.c:3210
+msgid "At first message"
+msgstr "Tại thông báo đầu"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr "Lỗi: chưa định nghĩa bộ định dạng"
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr "�ã xong"
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr "�ang g�i bộ định dạng, vui lòng ch�"
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr "Hoàn tất định dạng"
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%sTừ: %lu  Dòng: %ld  Ký tự: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "Trong lựa ch�n:  "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "Dữ liệu nhập nguyên bản"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano làm tràn bộ nhớ!"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Dữ liệu nhập Unicode"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "�ã sửa đổi"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
-msgstr "Xem"
+msgstr "Trình bày"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
-msgstr "THƯ MỤC:"
+msgstr "TMỤC:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "Tập tin:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+"Cảnh báo: Sửa một tập tin mà nó không được khóa, hãy kiểm tra quy�n đối với "
+"thư mục?"
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "dòng %ld/%ld (%d%%), cột %lu/%lu (%d%%), ký tự %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "Trình soạn thảo văn bản nano"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "phiên bản"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "�ược đem tới bởi:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "�ặc biệt cảm ơn:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "Tổ chức Phần m�m Tự do (FSF)"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr "nhi�u ngư�i dịch thuật và TP"
+
+#: src/winio.c:3513
 msgid "For ncurses:"
-msgstr "Cho ncurses:"
+msgstr "Dành cho ncurses:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
-msgstr "và những ngư�i khác mà chúng tôi quên..."
+msgstr "và những ngư�i khác mà chúng tôi quên…"
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "Cảm ơn bạn đã dùng nano!"
 
+#~ msgid "Internal error: can't match line %ld.  Please save your work."
+#~ msgstr "Lỗi nội bộ: không thể khớp dòng %ld. Hãy lưu công việc của bạn lại."
+
+#~ msgid "line wrap"
+#~ msgstr "ngắt dòng"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "Cho phép hủy bước chung [VẪN THỰC NGHIỆM]"
+
+#~ msgid "Insert File"
+#~ msgstr "Chèn tập tin"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "V� màn hình trước"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "Tìm ngoặc đơn khác"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "Ngắt dòng dài"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "Ngắt dòng m�m"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(bị l� đi, để tương thích với Pico)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr ""
+#~ "Phải ghi rõ trình đơn với đó cần tổ hợp phím (hoặc đặt “all� (tất cả))"
+
+#~ msgid "Missing flag"
+#~ msgstr "Thiếu c�"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "Lỗi nội bộ: kiểu không rõ. Hãy lưu tập tin"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr "Lỗi nội bộ: không cài đặt được việc hoàn lại. Hãy lưu tập tin"
+
+#~ msgid "Could not pipe"
+#~ msgstr "Không thể gửi qua đư�ng ống"
+
 #~ msgid "Error writing backup file %s: File owner mismatch"
 #~ msgstr ""
-#~ "Gặp lỗi khi ghi tập tin sao lưu %s: chủ sở hữu tập tin không tương ứng"
+#~ "Gặp lỗi khi ghi tập tin sao lưu %s: Chủ sở hữu tập tin không tương ứng"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 8488fd4..3c0cd92 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9488e7c..5853c7c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,121 +1,146 @@
 # Simplified Chinese Messages for the nano editor
-# Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# LI Daobing <lidaobing@gmail.com>, 2007, 2008, 2009.
-# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
 #
+# LI Daobing <lidaobing@gmail.com>, 2007, 2008, 2009.
+# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 2.2.4pre2\n"
+"Project-Id-Version: nano 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2010-04-07 17:10+0800\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2011-03-08 03:15+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "跳至目录"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "已�消"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "在�制模�中无法跳至%s 外部"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "读�%s 出错：%s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "无法上移一个目录"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(目录)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
 msgstr "(父目录)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "�索"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [区分大�写]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [正则表示�]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [���索]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "已从头�索"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "这是惟一出现之处"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "没有当��索模�"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr ""
+
+#: src/files.c:145
+#, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr ""
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, fuzzy, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "写入备份文件%s 出错：%s"
+
+#: src/files.c:237
+#, fuzzy, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "写入备份文件%s 出错：%s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "写入备份文件%s 出错：%s"
+
+#: src/files.c:282
+#, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr ""
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, fuzzy, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "写入备份文件%s 出错：文件所有者�匹�"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "无法�入%s 外部的文件"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "无多余文件缓冲区��用"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "切�至%s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "新缓冲区"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "已读�%lu 行(转�自DOS 与Mac 格�)"
 
-#: src/files.c:638
+#: src/files.c:879
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
@@ -125,13 +150,13 @@ msgid_plural ""
 "permission)"
 msgstr[0] "已读�%lu 行(转�自DOS 与Mac 格�- 警告：无写入��)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "已读�%lu 行 (转�自Mac 格�)"
 
-#: src/files.c:648
+#: src/files.c:889
 #, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
@@ -139,13 +164,13 @@ msgid_plural ""
 "Read %lu lines (Converted from Mac format - Warning: No write permission)"
 msgstr[0] "已读�%lu 行 (转�自Mac 格�- 警告：无写入��)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "已读�%lu 行 (转�自DOS 格�)"
 
-#: src/files.c:658
+#: src/files.c:899
 #, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
@@ -153,471 +178,439 @@ msgid_plural ""
 "Read %lu lines (Converted from DOS format - Warning: No write permission)"
 msgstr[0] "已读�%lu 行 (转�自DOS 格�- 警告：无写入��)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "已读�%lu 行"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
 msgstr[0] "已读�%lu 行(警告：无写入��)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "正在读�文件"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "新文件"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "找�到\"%s\""
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" 是一个目录"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
 #, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" 是一个设备文件"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "在新缓冲区中执行的命令 [从%s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "执行的命令 [从%s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "��入新缓冲区的文件 [从%s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "��入的文件 [从%s] "
 
-#: src/files.c:1077
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "�多�缓冲区模�中此按键无效"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr "写入备份文件失败，继续�存�？(如果�确定请输入N)"
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "无法写入%s 外部"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "--nofollow 设定下，无法�引或附加至符�连结档"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
 #, c-format
 msgid "Error writing backup file %s: %s"
 msgstr "写入备份文件%s 出错：%s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "太多备份文件？"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "写入%s 出错：%s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "写入临时文件%s 出错"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "已写入%lu 行"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS 格�]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac 格�]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [备份]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
 msgstr "�引选择部份于文件"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
 msgstr "附加选择部份至文件"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
 msgstr "写入选择部份至文件"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "��引于的文件�"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "�附加至的文件�"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "�写入的文件�"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "文件已存在，�覆盖�？"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "以��的�称存档？"
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
 msgstr "在您打开文件�文件已被改�，是�继续�存？"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(更多)"
 
-#: src/files.c:2694 src/rcfile.c:1220
+#: src/files.c:2974
 #, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"按下回车键继续�动 nano\n"
+"按下回车键继续\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "�消"
-
-#: src/global.c:416
-msgid "Replace"
-msgstr "替�"
+#: src/files.c:2989
+#, fuzzy, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"无法创建目录 %s：%s\n"
+"然而�存和载入�索历�或光标�置需�它。\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "�替�"
+#: src/files.c:2995
+#, fuzzy, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"路径%s 应为一个目录，但现在�是。\n"
+"Nano 将无法载入或�存�索历�或光标�置\n"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "区分大�写"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"检测到了旧版的Nano 历�文件(%s)并试图移动到默认�置(%s)。\n"
+"此�作出现错误：%s"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "���索"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"检测到了旧版的Nano 历�文件(%s)并已移动到默认�置(%s)。\n"
+"(关于这个�更请�阅Nano 常�问题解答)"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "正则表达�"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "离开"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
-msgid "PrevHstory"
-msgstr "�一记录"
+#: src/global.c:478
+msgid "Close"
+msgstr "关闭"
 
-#: src/global.c:452
-msgid "NextHstory"
-msgstr "�一记录"
+#: src/global.c:479
+#, fuzzy
+msgid "Uncut Text"
+msgstr "还原剪切"
 
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "跳至文字"
+#: src/global.c:481
+#, fuzzy
+msgid "Unjustify"
+msgstr "还原对�"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
 msgstr "何处是下一个"
 
-#: src/global.c:457
-msgid "First File"
-msgstr "首文件"
-
-#: src/global.c:458
-msgid "Last File"
-msgstr "末文件"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "文件选�"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS 格�"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac 格�"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "附加"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "�引"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "备份文件"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "执行命令"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "跳至目录"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "求助"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "离开"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "�索"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "上页"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "下页"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "首行"
+#: src/global.c:493
+msgid "Replace"
+msgstr "替�"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "尾行"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "跳行"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "暂�"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "上行"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "段�开头"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "下行"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "段�结尾"
+#: src/global.c:497
+msgid "Read File"
+msgstr "读档"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "全部对�"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "刷新"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "�入文件"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "跳行"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "对�当�段�"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "�消当�功能"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
 msgstr "显示帮助"
 
-#: src/global.c:509
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
 msgstr "关闭当�文件缓冲区 / 离开 nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "离开 nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "写入当�文件至�盘"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "�入其他文件至当�文件"
 
-#: src/global.c:519
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
 msgstr "查找字符串或正则表示�"
 
-#: src/global.c:520
-msgid "Go to previous screen"
-msgstr "跳至�一�"
+#: src/global.c:526
+#, fuzzy
+msgid "Search for a string"
+msgstr "查找字符串或正则表示�"
 
-#: src/global.c:521
-msgid "Go to next screen"
+#: src/global.c:528
+#, fuzzy
+msgid "Go one screenful up"
 msgstr "跳至�一�"
 
-#: src/global.c:523
+#: src/global.c:529
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "跳至�一�"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "剪切当�这行并存至剪贴�"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "从剪贴�粘贴至当�行"
 
-#: src/global.c:527
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "显示光标�置"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "�试�行拼写检查"
 
-#: src/global.c:531
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
 msgstr "替�字符串或正则表示�"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "跳至指定行与列�置"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "标记游标所在文字"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "��上次�索"
 
-#: src/global.c:537
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "拷�当�行至剪贴�"
 
-#: src/global.c:538
+#: src/global.c:545
 msgid "Indent the current line"
 msgstr "缩进当�行"
 
-#: src/global.c:539
+#: src/global.c:546
 msgid "Unindent the current line"
 msgstr "�消缩进当�行"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
 msgstr "撤销上次�作"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
 msgstr "��撤销的�作"
 
-#: src/global.c:543
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "��跳一字符"
 
-#: src/global.c:544
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "��跳一字符"
 
-#: src/global.c:546
+#: src/global.c:553
 msgid "Go forward one word"
 msgstr "��跳一个�"
 
-#: src/global.c:547
+#: src/global.c:554
 msgid "Go back one word"
 msgstr "��跳一个�"
 
-#: src/global.c:549
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "跳至�一行"
 
-#: src/global.c:550
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "跳至�一行"
 
-#: src/global.c:551
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "跳至当�行首"
 
-#: src/global.c:552
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "跳至当�行尾"
 
-#: src/global.c:555
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
 msgstr "跳至当�段�开头，如已在段�开头，则调至上一段�起始处"
 
-#: src/global.c:557
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
 msgstr "跳至当�段�结尾，如已在段�结尾，则调至下一段�结尾"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "跳至文件第一行"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "跳至文件最�一行"
 
-#: src/global.c:564
+#: src/global.c:569
 msgid "Go to the matching bracket"
 msgstr "移动至对应括�"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "�上�动一行但��动游标"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "�下�动一行但��动游标"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "切�至上个文件缓冲区"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "切�至下个文件缓冲区"
 
-#: src/global.c:577
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
 msgstr "�入下一按键原型"
 
-#: src/global.c:579
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "�入制表符于游标�置"
 
@@ -625,330 +618,448 @@ msgstr "�入制表符于游标�置"
 msgid "Insert a newline at the cursor position"
 msgstr "�入新行于游标�置"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "删除游标之下的字符"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "删除游标左侧的字符"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "从游标�置剪切至文件结尾"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "对�整个文件"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "计算字数�行数与字符数"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "�新显示当�画�"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
 msgstr "暂�编辑器(如果�用了暂�)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
 msgstr "切�查找的区分大�写选项"
 
-#: src/global.c:605
+#: src/global.c:604
 msgid "Reverse the direction of the search"
 msgstr "�转�索方�"
 
-#: src/global.c:609
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
 msgstr "切�使用正则表示�"
 
-#: src/global.c:613
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
 msgstr "编辑�次�索/替�字符串"
 
-#: src/global.c:615
+#: src/global.c:614
 msgid "Recall the next search/replace string"
 msgstr "编辑下次�索/替�字符串"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "打开文件选�"
 
-#: src/global.c:621
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
 msgstr "切�使用DOS 格�"
 
-#: src/global.c:622
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
 msgstr "切�使用Mac 格�"
 
-#: src/global.c:624
+#: src/global.c:622
 msgid "Toggle appending"
 msgstr "切�追加"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
 msgstr "切��置�入"
 
-#: src/global.c:628
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
 msgstr "切�储存既有文件的备份"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "执行外部命令"
 
-#: src/global.c:633
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
 msgstr "切�使用新缓冲区"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "从文件选�离开"
 
-#: src/global.c:638
+#: src/global.c:632
 msgid "Go to the first file in the list"
 msgstr "跳至文件第一列"
 
-#: src/global.c:640
+#: src/global.c:633
 msgid "Go to the last file in the list"
 msgstr "跳至文件最�一列"
 
-#: src/global.c:641
-msgid "Go to the next file in the list"
-msgstr "跳至列表中的下一个文件"
-
-#: src/global.c:642
+#: src/global.c:634
 msgid "Go to the previous file in the list"
 msgstr "跳至列表中的�一个文件"
 
-#: src/global.c:643
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "跳至列表中的下一个文件"
+
+#: src/global.c:636
 msgid "Go to directory"
 msgstr "跳至目录"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "关闭"
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "�试�行拼写检查"
+
+#: src/global.c:640
+#, fuzzy
+msgid "Go to previous linter msg"
+msgstr "跳至�一行"
+
+#: src/global.c:641
+#, fuzzy
+msgid "Go to next linter msg"
+msgstr "跳至�一行"
+
+#: src/global.c:642
+#, fuzzy
+msgid "Invoke formatter, if available"
+msgstr "�试�行拼写检查"
+
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "求助"
+
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "�消"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "写入"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "跳至目录"
+
+#: src/global.c:719
+msgid "Cut Text"
+msgstr "剪切文字"
+
+#: src/global.c:728
 msgid "Justify"
 msgstr "对�"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "读档"
+#: src/global.c:733
+msgid "To Spell"
+msgstr "拼写检查"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
-msgid "Cut Text"
-msgstr "剪切文字"
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "跳行"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "还原对�"
+#: src/global.c:740
+#, fuzzy
+msgid "Formatter"
+msgstr "DOS 格�"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
-msgid "UnCut Text"
-msgstr "还原剪切"
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "区分大�写"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:750
+msgid "Regexp"
+msgstr "正则表达�"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "���索"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "�替�"
+
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "游标�置"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "拼写检查"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "上页"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "下页"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "首行"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "尾行"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "并�一个括�"
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "标记文字"
 
-#: src/global.c:777
+#: src/global.c:800
 msgid "Copy Text"
 msgstr "�制文字"
 
-#: src/global.c:780
+#: src/global.c:803
 msgid "Indent Text"
 msgstr "缩进文字"
 
-#: src/global.c:783
+#: src/global.c:805
 msgid "Unindent Text"
 msgstr "�消缩进"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
 msgstr "撤销"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
 msgstr "��"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "��"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "��"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "�一个字"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "��"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "�一个字"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "上行"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "下行"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "�一个字"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "顶端"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "尾端"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "寻找其他括�"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "段�开头"
+
+#: src/global.c:846
+msgid "End of Par"
+msgstr "段�结尾"
 
-#: src/global.c:848
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "�上�动"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "�下�动"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "上个文件"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "下个文件"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
 msgstr "原形输入"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "制表符"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "回车"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "删除"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "退格"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "删至末端"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "字数统计"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "暂�"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "�一记录"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "�一记录"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "跳至文字"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS 格�"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac 格�"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "附加"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "�引"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "备份文件"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "执行命令"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "文件选�"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "首文件"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "末文件"
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "上行"
+
+#: src/global.c:979
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "下行"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "辅助模�"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "�续显示游标�置"
 
-#: src/global.c:1371
+#: src/global.c:1231
 msgid "Use of one more line for editing"
 msgstr "编辑时使用多一行"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "平滑��动画�"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "��自动�行"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "显示空格"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "语法色彩高亮"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "智能HOME 键"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "自动缩进"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "剪切至行尾"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "长行转�"
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "��自动�行"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "已输入制表符至空白的转�"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "备份文件"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "多�文件缓冲区"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "鼠标支�"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "�从 DOS/Mac 格�转�"
 
-#: src/global.c:1397
+#: src/global.c:1259
 msgid "Suspension"
 msgstr "暂�"
 
-#: src/global.c:1399
-msgid "Soft line wrapping"
-msgstr "软�行"
-
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -968,7 +1079,7 @@ msgstr ""
 "最近一次�索的字符串将会显示在�索�示符�的括�中。�输入任何文字而直接按下"
 "回车键则会��使用最近一次的�索�件。"
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -982,7 +1093,7 @@ msgstr ""
 " 以下的功能键�用于�索模�：\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1001,7 +1112,7 @@ msgstr ""
 " 以下的功能键�用于跳行模�：\n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1021,7 +1132,7 @@ msgstr ""
 "multibuffer�Meta-F 开关，或者 nanorc 文件��动的�，所�入的文件 将会被载入"
 "�外的缓冲区中 (利用 Meta-< 和 > 在文件缓冲区间切�)。 "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1035,7 +1146,7 @@ msgstr ""
 " 以下的功能键�用于�入文件模�：\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1061,7 +1172,7 @@ msgstr ""
 " 以下的功能键�用于写入文件模�：\n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1083,7 +1194,7 @@ msgstr ""
 " 以下的功能键�用于文件选�：\n"
 "\n"
 
-#: src/help.c:302
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1105,7 +1216,7 @@ msgstr ""
 "按下回车键则会��最近一次的�索�件。\n"
 "\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
@@ -1113,7 +1224,7 @@ msgstr ""
 "在�索模��使用如下的功能键：\n"
 "\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1134,7 +1245,7 @@ msgstr ""
 " 以下的功能键�用于跳至目录模�：\n"
 "\n"
 
-#: src/help.c:328
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1156,7 +1267,7 @@ msgstr ""
 " 以下的功能键�用于拼写检查模�：\n"
 "\n"
 
-#: src/help.c:343
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1175,7 +1286,7 @@ msgstr ""
 " 以下的功能键�用于执行命令模�：\n"
 "\n"
 
-#: src/help.c:356
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1195,7 +1306,7 @@ msgstr ""
 "\n"
 " "
 
-#: src/help.c:366
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1210,7 +1321,7 @@ msgstr ""
 "是以\"中介\" (Meta, M) 符�表示，它�以�照您的键盘设定，利用Esc，Alt 或Meta "
 "�输入。"
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1222,15 +1333,15 @@ msgstr ""
 "的字符。下列按键组��用于主�编辑区，替代按键则显示于括�内“\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "�用/关闭"
 
-#: src/nano.c:587
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "观看模�中此按键无效"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1239,7 +1350,7 @@ msgstr ""
 "\n"
 "缓冲内容已写入 %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1248,7 +1359,7 @@ msgstr ""
 "\n"
 "缓冲内容未写入至 %s：%s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1257,11 +1368,11 @@ msgstr ""
 "\n"
 "缓冲区未写入：%s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
 msgstr "窗�尺寸对 nano �说太�了...\n"
 
-#: src/nano.c:816
+#: src/nano.c:836
 #, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
@@ -1270,251 +1381,260 @@ msgstr ""
 "用法: nano [选项] [[+行,列] 文件�]...\n"
 "\n"
 
-#: src/nano.c:819
+#: src/nano.c:839
 #, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "选项\t\tGNU 长选项\t\t�义\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "选项\t\t�义\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "显示此信�"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+行,列"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "从所指列数与行数开始"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "�用智能 HOME 键"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "储存既有文件的备份"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "-C <dir>"
 msgstr "-C <目录>"
 
-#: src/nano.c:830
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
 msgstr "--backupdir=<目录>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "用以储存独一备份文件的目录"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
 msgstr "用粗体替代颜色�转"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "将已输入的制表符转�为空白"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "�用多�文件缓冲区功能"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr ""
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "记录与读��索/替�的历�字符串"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "���考nanorc 文件"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "修正数字键区按键混淆问题"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "��将�行加到文件末端"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "��从 DOS/Mac 格�转�"
 
-#: src/nano.c:858
+#: src/nano.c:883
 msgid "Use one more line for editing"
 msgstr "编辑时多使用一行"
 
-#: src/nano.c:860
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "记录并读�光标�置"
+
+#: src/nano.c:889
 msgid "-Q <str>"
 msgstr "-Q <字符串>"
 
-#: src/nano.c:860
+#: src/nano.c:889
 msgid "--quotestr=<str>"
 msgstr "--quotestr=<字符串>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "引用代表字符串"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "�制模�"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
 msgstr "按行滚动而�是��"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "-T <#cols>"
 msgstr "-T <#列数>"
 
-#: src/nano.c:868
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
 msgstr "--tabsize=<#列数>"
 
-#: src/nano.c:869
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "设定制表符宽度为 #列数"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "状�行快速闪动"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "显示版本资讯并离开"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "更正确地侦测�字边界"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "-Y <str>"
 msgstr "-Y <字符串>"
 
-#: src/nano.c:880
+#: src/nano.c:909
 msgid "--syntax=<str>"
 msgstr "--syntax=<字符串>"
 
-#: src/nano.c:881
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
 msgstr "用于加亮的语法定义"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "�续显示游标�置"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "修正退格键/删除键混淆问题"
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "显示帮助"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "自动缩进新行"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "从游标剪切至行尾"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "���照符�连结，而是覆盖"
 
-#: src/nano.c:894
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "�用鼠标功能"
 
-#: src/nano.c:897
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
 msgstr "-o <目录>"
 
-#: src/nano.c:897
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
 msgstr "--operatingdir=<目录>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "设定�作目录"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "�留XON (^Q) 和XOFF (^S) 按键"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
 msgstr "沉默忽略�动问题, 比如rc 文件错误"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "-r <#cols>"
 msgstr "-r <#列数>"
 
-#: src/nano.c:905
+#: src/nano.c:938
 msgid "--fill=<#cols>"
 msgstr "--fill=<#列数>"
 
-#: src/nano.c:906
-msgid "Set wrapping point at column #cols"
+#: src/nano.c:939
+#, fuzzy
+msgid "Set hard-wrapping point at column #cols"
 msgstr "设定折行宽度为 #列数"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "-s <prog>"
 msgstr "-s <程�>"
 
-#: src/nano.c:909
+#: src/nano.c:942
 msgid "--speller=<prog>"
 msgstr "--speller=<程�>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "�用替代的拼写检查程�"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "离开时自动储存，���示"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr "�许通用撤销[试验性特性]"
-
-#: src/nano.c:918
+#: src/nano.c:947
 msgid "View mode (read-only)"
 msgstr "查看(�读)模�"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "��自动�行"
 
-#: src/nano.c:922
+#: src/nano.c:951
 msgid "Don't show the two help lines"
 msgstr "��显示辅助区"
 
-#: src/nano.c:923
+#: src/nano.c:952
 msgid "Enable suspension"
 msgstr "�用暂�功能"
 
-#: src/nano.c:924
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
 msgstr "�用软�行"
 
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(忽略，为与Pico 相容)"
-
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano 版本%s (编译于%s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " 电�邮件: nano@nano-editor.org\t\t网页: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1523,153 +1643,179 @@ msgstr ""
 "\n"
 " 编译选项："
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "对�起，此功能的支�以�用"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "储存更动过的缓冲区�(回答 \"No\" 会撤销修改)？"
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
 msgstr "对�起，无法从键盘设备�新打开标准输入\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
 msgstr "正在从标准输入读入，�用 ^C 中断\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "接收到SIGHUP 或SIGTERM\n"
 
-#: src/nano.c:1204
+#: src/nano.c:1301
 #, c-format
 msgid "Use \"fg\" to return to nano.\n"
 msgstr "使用\"fg\" 返回nano\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "已�用"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "已�用"
 
-#: src/nano.c:1548 src/winio.c:1256
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
 msgstr "未知命令"
 
-#: src/nano.c:1674
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "忽略XON，嗯嗯。"
 
-#: src/nano.c:1679
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "忽略XOFF，嗯嗯。"
 
-#: src/nano.c:2209 src/rcfile.c:1100
+#: src/nano.c:2310 src/rcfile.c:1325
 #, c-format
 msgid "Requested tab size \"%s\" is invalid"
 msgstr "所�求的制表符宽度%s 无效"
 
-#: src/nano.c:2268 src/rcfile.c:1025
+#: src/nano.c:2374 src/rcfile.c:1250
 #, c-format
 msgid "Requested fill size \"%s\" is invalid"
 msgstr "所�求的填满行数\"%s\" 无效"
 
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr ""
+
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "是"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "全部"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "�"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "在%s(第%lu 行)中�生错误："
 
-#: src/rcfile.c:185
+#: src/rcfile.c:196
 #, c-format
 msgid "Argument '%s' has an unterminated \""
 msgstr "�数%s 有未�闭的 \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "正则表示�字符串必须以 \" 字符开始�结�"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "�法的正则表示� \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "缺少语法�称"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\" 语法已被�留"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "\"default\" 语法必须��任何副文件�"
 
-#: src/rcfile.c:386 src/rcfile.c:483
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "缺少键�称"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
+msgstr ""
+
+#: src/rcfile.c:463
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
 msgstr "键绑定必须以\"^\", \"M\" 或 \"F\" 开始"
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
+#: src/rcfile.c:472
+#, fuzzy
+msgid "Must specify a function to bind the key to"
 msgstr "必须指定键绑定到的函数"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr "必须指定键绑定到的��(或 \"all\")"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
+msgstr ""
 
-#: src/rcfile.c:426
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#: src/rcfile.c:489
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
 msgstr "无法映射�字\"%s\" 到一个函数"
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
+#: src/rcfile.c:496
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
 msgstr "无法映射�字\"%s\" 到一个��"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Function '%s' does not exist in menu '%s'"
+msgstr ""
+
+#: src/rcfile.c:543
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
 msgstr "对�起，键\"%s\" 属�法绑定"
 
-#: src/rcfile.c:625
+#: src/rcfile.c:629
+#, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "读�%s 出错：%s"
+
+#: src/rcfile.c:672
 #, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
@@ -1684,132 +1830,191 @@ msgstr ""
 "\"black\"(黑)，选择性的�置字 \"bright\"(明亮) \n"
 "�用于�景色。"
 
-#: src/rcfile.c:647
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
 msgstr "无法直接增加颜色而没有语法行"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "缺少颜色�称"
 
-#: src/rcfile.c:672
-#, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "背景色%s ��为明亮"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "缺少正则表示�字符串"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" �求对应的\"end=\""
 
-#: src/rcfile.c:804
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "背景色%s ��为明亮"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
 msgstr "无法直接增加头部正则表达�而没有语法行"
 
-#: src/rcfile.c:874
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "无法在没有语法命令的情况下添加魔字符串"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "缺少魔字符串�称"
+
+#: src/rcfile.c:985
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "无法直接增加头部正则表达�而没有语法行"
+
+#: src/rcfile.c:990
+#, fuzzy
+msgid "Missing linter command"
+msgstr "缺少颜色�称"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "无法直接增加颜色而没有语法行"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
+msgstr ""
+
+#: src/rcfile.c:1045
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
 msgstr "严�错误; 没有键映射到函数 \"%s\""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1047
+#, fuzzy, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
 msgstr "正在退出。如果您想调整您的nanorc 设置，请使用nano 的-I 选项。\n"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "无法映射�字\"%s\" 到一个��"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
 msgstr "命令\"%s\" 被�止在包�文件中使用"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
 msgstr "语法\"%s\" 没有color 命令"
 
-#: src/rcfile.c:966
+#: src/rcfile.c:1171
 #, c-format
 msgid "Command \"%s\" not understood"
 msgstr "无法识别\"%s\" 命令"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "缺少旗标"
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "缺少颜色�称"
 
-#: src/rcfile.c:994
+#: src/rcfile.c:1208
 #, c-format
 msgid "Option \"%s\" requires an argument"
 msgstr "选项%s 需��数"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "选项并�正确的多字节字符串"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "需��空格字符"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "需�两个�行字符"
 
-#: src/rcfile.c:1114
-#, c-format
-msgid "Cannot unset flag \"%s\""
+#: src/rcfile.c:1339
+#, fuzzy, c-format
+msgid "Cannot unset option \"%s\""
 msgstr "无法解除旗标 %s 设定"
 
-#: src/rcfile.c:1123
-#, c-format
-msgid "Unknown flag \"%s\""
+#: src/rcfile.c:1345
+#, fuzzy, c-format
+msgid "Unknown option \"%s\""
 msgstr "未知旗标 %s"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "我找�到我的家目录�哇�"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"按下回车键继续�动 nano\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "找�到 \"%.*s%s\""
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [区分大�写]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [正则表示�]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [���索]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " 在标记中(替�)"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (替�)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "替�这个？"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "替�我"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "已替�%lu 处"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "输入列�，行�"
 
-#: src/search.c:1061
+#: src/search.c:1054
 msgid "Invalid line or column number"
 msgstr "无效的列�或行�"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "并�一个括�"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "无对应括�"
 
@@ -1821,219 +2026,316 @@ msgstr "标记设定"
 msgid "Mark Unset"
 msgstr "标记解除"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
 msgstr "没有�撤销的�作�"
 
-#: src/text.c:455 src/text.c:593
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
+#: src/text.c:445 src/text.c:590
+#, fuzzy, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
 msgstr "内部错误：无法匹�行 %d。请�存您的工作"
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
 msgstr "文字增加"
 
-#: src/text.c:475 src/text.c:613
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
 msgstr "文本删除"
 
-#: src/text.c:489 src/text.c:628
-msgid "line wrap"
-msgstr "自动�行"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
 msgstr "行�并"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
 msgstr "文字剪切"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
 msgstr "�消剪切"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
 msgstr "�行符"
 
-#: src/text.c:532 src/text.c:665
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
 msgstr "文本�入"
 
-#: src/text.c:550 src/text.c:659
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
 msgstr "文本替�"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr "内部错误：未知类型。请�存您的工作"
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "内部错误：未知类型。请�存您的工作。"
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
 msgstr "已撤销�作(%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
 msgstr "没有���的�作�"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr "内部错误：��设置失败。请�存您的工作"
+#: src/text.c:584
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "内部错误：无法�置�消剪切。请�存您的工作"
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
 msgstr "已���作(%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "管线功能无效"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "无法建立管线功能"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "执行功能无效"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
+#: src/text.c:969
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
 msgstr "内部错误：无法�置�消剪切。请�存您的工作"
 
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr "内部错误：未知类型。请�存您的工作。"
-
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "�良引用字符串%s：%s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "现在�以还原对��"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "编辑替代文字"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "无法建立管线功能"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
 msgstr "正在建立错字列表，请�待..."
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "无法得知管线缓冲区大�"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "�行 \"spell\" 错误"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "�行 \"sort -f\" 错误"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "�行 \"uniq\" 错误"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "拼写检查结�"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "�行 \"%s\" 错误"
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "�试�行拼写检查"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "拼写检查失败：%s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "拼写检查失败：%s：%s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "��将�行加到文件末端"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "显示此信�"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "显示此信�"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%s字数: %lu  行数: %ld  字符数: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
 msgstr "于选择部份："
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "原形输入"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano 已耗尽内存�"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
 msgstr "Unicode 输入"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "已更改"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "查看"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "目录："
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "文件："
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr ""
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "行 %ld/%ld (%d%%)，列 %lu/%lu (%d%%)，字符 %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "nano 文本编辑器"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "版本"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "�自于:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "特别感谢:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "自由软体基金会"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
 msgstr "ncurses 部份:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
 msgstr "以�其他我们�记得的人..."
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "谢谢您使用 nano�"
 
-#~ msgid "Error writing backup file %s: File owner mismatch"
-#~ msgstr "写入备份文件%s 出错：文件所有者�匹�"
+#~ msgid "Insert File"
+#~ msgstr "�入文件"
+
+#~ msgid "Go to previous screen"
+#~ msgstr "跳至�一�"
+
+#~ msgid "Find Other Bracket"
+#~ msgstr "寻找其他括�"
+
+#~ msgid "Long line wrapping"
+#~ msgstr "长行转�"
+
+#~ msgid "Soft line wrapping"
+#~ msgstr "软�行"
+
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "�许通用撤销[试验性特性]"
+
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(忽略，为与Pico 相容)"
+
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "必须指定键绑定到的��(或 \"all\")"
+
+#~ msgid "Missing flag"
+#~ msgstr "缺少旗标"
+
+#~ msgid "line wrap"
+#~ msgstr "自动�行"
+
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "内部错误：未知类型。请�存您的工作"
+
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr "内部错误：��设置失败。请�存您的工作"
+
+#~ msgid "Could not pipe"
+#~ msgstr "管线功能无效"
 
 #~ msgid "line split"
 #~ msgstr "行分割"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index e766811..5c79d78 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ff4f42e..bc5f34c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,1002 +1,1065 @@
-# Traditional Chinese Messages for the nano editor
+# Traditional Chinese Messages for the nano editor.
 # Copyright (C) 2004, 05 Free Software Foundation, Inc.
 # This file is distributed under the same license as the nano package.
-# Wei-Lun Chao <chaoweilun@pcmail.com.tw>, 2004, 05
 #
+# Wei-Lun Chao <bluebat@member.fsf.org>, 2004, 2005, 2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.3.10pre2\n"
+"Project-Id-Version: nano 2.3.2pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-22 06:34-0500\n"
-"PO-Revision-Date: 2005-12-13 09:33+0800\n"
-"Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
+"POT-Creation-Date: 2015-03-22 23:49-0400\n"
+"PO-Revision-Date: 2013-06-24 23:29+0800\n"
+"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/browser.c:220
+#. TRANSLATORS: This is a prompt.
+#: src/browser.c:203
 msgid "Go To Directory"
 msgstr "跳至目錄"
 
-#: src/browser.c:233 src/browser.c:830 src/files.c:860 src/files.c:2048
-#: src/nano.c:1060 src/search.c:220 src/search.c:314 src/search.c:975
-#: src/search.c:1040
+#: src/browser.c:214 src/browser.c:770 src/files.c:1101 src/files.c:2321
+#: src/nano.c:1159 src/search.c:212 src/search.c:302 src/search.c:957
+#: src/search.c:1033 src/text.c:2949 src/text.c:3164
 msgid "Cancelled"
 msgstr "已�消"
 
-#: src/browser.c:266 src/browser.c:314
+#: src/browser.c:246 src/browser.c:293
 #, c-format
 msgid "Can't go outside of %s in restricted mode"
 msgstr "在�制模�中無法至 %s 外部"
 
-#: src/browser.c:277 src/browser.c:324 src/browser.c:347 src/files.c:722
-#: src/files.c:731 src/files.c:1540 src/files.c:1659 src/files.c:1711
-#: src/files.c:1732 src/files.c:1855 src/files.c:2691 src/rcfile.c:568
-#: src/rcfile.c:1204
+#: src/browser.c:257 src/browser.c:303 src/browser.c:324 src/files.c:966
+#: src/files.c:975 src/files.c:1802 src/files.c:1929 src/files.c:1983
+#: src/files.c:2004 src/files.c:2127 src/files.c:3029 src/files.c:3225
+#: src/rcfile.c:590 src/rcfile.c:1426
 #, c-format
 msgid "Error reading %s: %s"
 msgstr "讀� %s 時發生錯誤: %s"
 
-#: src/browser.c:303
+#: src/browser.c:283
 msgid "Can't move up a directory"
 msgstr "無法上移一個目錄"
 
 #. TRANSLATORS: Try to keep this at most 7
 #. * characters.
-#: src/browser.c:665 src/browser.c:674
+#: src/browser.c:626 src/browser.c:635
 msgid "(dir)"
 msgstr "(目錄)"
 
 #. TRANSLATORS: Try to keep this at most 12
 #. * characters.
-#: src/browser.c:671
+#: src/browser.c:632
 msgid "(parent dir)"
-msgstr ""
+msgstr "(上層目錄)"
 
-#: src/browser.c:801 src/search.c:185
+#. TRANSLATORS: This is the main search prompt.
+#: src/browser.c:759 src/search.c:181
 msgid "Search"
 msgstr "�尋"
 
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:805 src/search.c:189
-msgid " [Case Sensitive]"
-msgstr " [符�大�寫]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:811 src/search.c:195
-msgid " [Regexp]"
-msgstr " [正�表示�]"
-
-#. TRANSLATORS: This string is just a modifier for the search
-#. * prompt; no grammar is implied.
-#: src/browser.c:817 src/search.c:201
-msgid " [Backwards]"
-msgstr " [�後�尋]"
-
-#: src/browser.c:909 src/browser.c:917 src/search.c:395
+#: src/browser.c:812 src/search.c:382
 msgid "Search Wrapped"
 msgstr "已從頭�尋"
 
-#: src/browser.c:1006 src/browser.c:1039 src/search.c:514 src/search.c:517
-#: src/search.c:574 src/search.c:577
+#: src/browser.c:885 src/browser.c:912 src/search.c:500 src/search.c:503
+#: src/search.c:560 src/search.c:563
 msgid "This is the only occurrence"
 msgstr "這是惟一出�之處"
 
-#: src/browser.c:1042 src/search.c:583
+#: src/browser.c:915 src/search.c:569
 msgid "No current search pattern"
 msgstr "沒有符�目��尋形�者"
 
-#: src/files.c:125
+#: src/files.c:139
+msgid "Couldn't determine my identity for lock file (getpwuid() failed)"
+msgstr "無法確�我的身分以用於鎖定檔案 (getpwuid() 失敗)"
+
+#: src/files.c:145
+#, fuzzy, c-format
+msgid "Couldn't determine hostname for lock file: %s"
+msgstr "無法確�主機�稱以用於鎖定檔案：%s"
+
+#: src/files.c:165 src/files.c:175 src/files.c:212 src/files.c:222
+#, c-format
+msgid "Error writing lock file %s: %s"
+msgstr "寫入鎖定檔案 %s 時發生錯誤：%s"
+
+#: src/files.c:237
+#, c-format
+msgid "Error deleting lock file %s: %s"
+msgstr "刪除鎖定檔案 %s 時發生錯誤：%s"
+
+#: src/files.c:272
+#, fuzzy, c-format
+msgid "Error opening lock file %s: %s"
+msgstr "開啟鎖定檔案 %s 時發生錯誤：%s"
+
+#: src/files.c:282
+#, fuzzy, c-format
+msgid "Error reading lock file %s: Not enough data read"
+msgstr "讀�鎖定檔案 %s 時發生錯誤：未讀�足夠的資料"
+
+#. TRANSLATORS: The second %s is the name of the user, the third that of the editor.
+#: src/files.c:297
+#, c-format
+msgid "File %s is being edited (by %s with %s, PID %d); continue?"
+msgstr ""
+
+#: src/files.c:308
+#, fuzzy, c-format
+msgid "Error writing lock file: Directory '%s' doesn't exist"
+msgstr "寫入鎖定檔案 %s 時發生錯誤：%s"
+
+#: src/files.c:339
 #, c-format
 msgid "Can't insert file from outside of %s"
 msgstr "無法�入 %s 外部的檔案"
 
-#: src/files.c:234
+#: src/files.c:467
 msgid "No more open file buffers"
 msgstr "無多餘檔案緩���開啟"
 
-#: src/files.c:250
+#: src/files.c:484
 #, c-format
 msgid "Switched to %s"
 msgstr "切�至 %s"
 
-#: src/files.c:251 src/global.c:469 src/winio.c:2168
+#: src/files.c:485 src/global.c:953 src/winio.c:2161
 msgid "New Buffer"
 msgstr "新緩��"
 
-#: src/files.c:633
+#: src/files.c:874
 #, c-format
 msgid "Read %lu line (Converted from DOS and Mac format)"
 msgid_plural "Read %lu lines (Converted from DOS and Mac format)"
 msgstr[0] "已讀� %lu 列 (轉檔自 DOS 與 Mac 格�)"
 
-#: src/files.c:638
-#, fuzzy, c-format
+#: src/files.c:879
+#, c-format
 msgid ""
 "Read %lu line (Converted from DOS and Mac format - Warning: No write "
 "permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS and Mac format - Warning: No write "
 "permission)"
-msgstr[0] "已讀� %lu 列 (轉檔自 DOS 與 Mac 格�)"
+msgstr[0] "已讀� %lu 列 (轉檔自 DOS 與 Mac 格� - 警告：沒有寫入權�)"
 
-#: src/files.c:644
+#: src/files.c:885
 #, c-format
 msgid "Read %lu line (Converted from Mac format)"
 msgid_plural "Read %lu lines (Converted from Mac format)"
 msgstr[0] "已讀� %lu 列 (轉檔自 Mac 格�)"
 
-#: src/files.c:648
-#, fuzzy, c-format
+#: src/files.c:889
+#, c-format
 msgid ""
 "Read %lu line (Converted from Mac format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from Mac format - Warning: No write permission)"
-msgstr[0] "已讀� %lu 列 (轉檔自 Mac 格�)"
+msgstr[0] "已讀� %lu 列 (轉檔自 Mac 格� - 警告：沒有寫入權�)"
 
-#: src/files.c:654
+#: src/files.c:895
 #, c-format
 msgid "Read %lu line (Converted from DOS format)"
 msgid_plural "Read %lu lines (Converted from DOS format)"
 msgstr[0] "已讀� %lu 列 (轉檔自 DOS 格�)"
 
-#: src/files.c:658
-#, fuzzy, c-format
+#: src/files.c:899
+#, c-format
 msgid ""
 "Read %lu line (Converted from DOS format - Warning: No write permission)"
 msgid_plural ""
 "Read %lu lines (Converted from DOS format - Warning: No write permission)"
-msgstr[0] "已讀� %lu 列 (轉檔自 DOS 格�)"
+msgstr[0] "已讀� %lu 列 (轉檔自 DOS 格� - 警告：沒有寫入權�)"
 
-#: src/files.c:664
+#: src/files.c:905
 #, c-format
 msgid "Read %lu line"
 msgid_plural "Read %lu lines"
 msgstr[0] "已讀� %lu 列"
 
-#: src/files.c:667
+#: src/files.c:908
 #, c-format
 msgid "Read %lu line ( Warning: No write permission)"
 msgid_plural "Read %lu lines (Warning: No write permission)"
-msgstr[0] ""
+msgstr[0] "已讀� %lu 列 (警告：沒有寫入權�)"
 
-#: src/files.c:700 src/files.c:736
+#: src/files.c:943 src/files.c:980
 msgid "Reading File"
 msgstr "正在讀�檔案"
 
-#: src/files.c:706
+#: src/files.c:950
 msgid "New File"
 msgstr "新檔案"
 
-#: src/files.c:709
+#: src/files.c:953
 #, c-format
 msgid "\"%s\" not found"
 msgstr "找�到 \"%s\""
 
-#: src/files.c:717 src/rcfile.c:559 src/rcfile.c:1154 src/rcfile.c:1195
+#: src/files.c:961 src/rcfile.c:583 src/rcfile.c:1376 src/rcfile.c:1417
 #, c-format
 msgid "\"%s\" is a directory"
 msgstr "\"%s\" 是一個目錄"
 
-#: src/files.c:718 src/rcfile.c:560 src/rcfile.c:1155 src/rcfile.c:1196
-#, fuzzy, c-format
+#: src/files.c:962 src/rcfile.c:584 src/rcfile.c:1377 src/rcfile.c:1418
+#, c-format
 msgid "\"%s\" is a device file"
 msgstr "\"%s\" 是一個�置檔案"
 
-#: src/files.c:817
+#: src/files.c:1060
 #, c-format
 msgid "Command to execute in new buffer [from %s] "
 msgstr "在新緩��中執行的命令 [從 %s] "
 
-#: src/files.c:819
+#: src/files.c:1062
 #, c-format
 msgid "Command to execute [from %s] "
 msgstr "執行的命令 [從 %s] "
 
-#: src/files.c:825
+#: src/files.c:1069
 #, c-format
 msgid "File to insert into new buffer [from %s] "
 msgstr "所��入新緩��的檔案 [從 %s] "
 
-#: src/files.c:827
+#: src/files.c:1071
 #, c-format
 msgid "File to insert [from %s] "
 msgstr "所��入的檔案 [從 %s] "
 
-#: src/files.c:1077
-#, fuzzy
+#: src/files.c:1320
 msgid "Key invalid in non-multibuffer mode"
 msgstr "�多�緩��模�中此按�無效"
 
-#: src/files.c:1486
+#: src/files.c:1622
+msgid "Failed to write backup file, continue saving? (Say N if unsure) "
+msgstr "寫入備份檔案時失敗，�繼續儲存？(如果�確定就以 N 表示) "
+
+#: src/files.c:1746
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "無法寫入 %s 外部"
 
-#: src/files.c:1501
+#: src/files.c:1761
 msgid "Cannot prepend or append to a symlink with --nofollow set"
 msgstr "--nofollow 設定下，無法�引或附加至符號連�檔"
 
-#: src/files.c:1581 src/files.c:1603 src/files.c:1621 src/files.c:1632
-#: src/files.c:1640 src/files.c:1667
-#, fuzzy, c-format
+#: src/files.c:1843 src/files.c:1868 src/files.c:1886 src/files.c:1899
+#: src/files.c:1910 src/files.c:1939
+#, c-format
 msgid "Error writing backup file %s: %s"
-msgstr "寫入暫存檔案 %s 時發生錯誤"
+msgstr "寫入暫存檔案 %s 時發生錯誤：%s"
 
-#: src/files.c:1582 src/nano.c:701
+#: src/files.c:1844 src/nano.c:719
 msgid "Too many backup files?"
 msgstr "太多備份檔案？"
 
-#: src/files.c:1687 src/files.c:1744 src/files.c:1763 src/files.c:1775
-#: src/files.c:1799 src/files.c:1817 src/files.c:1827 src/files.c:1863
-#: src/files.c:1868 src/files.c:2764 src/files.c:2773
+#: src/files.c:1959 src/files.c:2016 src/files.c:2035 src/files.c:2047
+#: src/files.c:2071 src/files.c:2089 src/files.c:2099 src/files.c:2135
+#: src/files.c:2140 src/files.c:3101 src/files.c:3110 src/files.c:3133
+#: src/files.c:3145
 #, c-format
 msgid "Error writing %s: %s"
 msgstr "寫入 %s 時發生錯誤: %s"
 
-#: src/files.c:1721 src/text.c:2929 src/text.c:2941
+#: src/files.c:1993 src/text.c:2867 src/text.c:2879 src/text.c:3260
+#: src/text.c:3269
 #, c-format
 msgid "Error writing temp file: %s"
 msgstr "寫入暫存檔案 %s 時發生錯誤"
 
-#: src/files.c:1900
+#: src/files.c:2173
 #, c-format
 msgid "Wrote %lu line"
 msgid_plural "Wrote %lu lines"
 msgstr[0] "已寫入 %lu 列"
 
-#: src/files.c:2004
+#: src/files.c:2278
 msgid " [DOS Format]"
 msgstr " [DOS 格�]"
 
-#: src/files.c:2005
+#: src/files.c:2279
 msgid " [Mac Format]"
 msgstr " [Mac 格�]"
 
-#: src/files.c:2007
+#: src/files.c:2281
 msgid " [Backup]"
 msgstr " [備份]"
 
-#: src/files.c:2015
+#: src/files.c:2289
 msgid "Prepend Selection to File"
-msgstr "�引�擇部份於檔案"
+msgstr "�引�擇部分於檔案"
 
-#: src/files.c:2016
+#: src/files.c:2290
 msgid "Append Selection to File"
-msgstr "附加�擇部份至檔案"
+msgstr "附加�擇部分至檔案"
 
-#: src/files.c:2017
+#: src/files.c:2291
 msgid "Write Selection to File"
-msgstr "寫入�擇部份至檔案"
+msgstr "寫入�擇部分至檔案"
 
-#: src/files.c:2020
+#: src/files.c:2294
 msgid "File Name to Prepend to"
 msgstr "��引於的檔案�稱"
 
-#: src/files.c:2021
+#: src/files.c:2295
 msgid "File Name to Append to"
 msgstr "�附加至的檔案�稱"
 
-#: src/files.c:2022
+#: src/files.c:2296
 msgid "File Name to Write"
 msgstr "�寫入的檔案�稱"
 
-#: src/files.c:2153
+#: src/files.c:2427
 msgid "File exists, OVERWRITE ? "
 msgstr "檔案已存在，�覆寫嗎？"
 
-#: src/files.c:2162
+#: src/files.c:2436
 msgid "Save file under DIFFERENT NAME ? "
 msgstr "以��的�稱存檔？"
 
-#: src/files.c:2173
+#: src/files.c:2450
 msgid "File was modified since you opened it, continue saving ? "
-msgstr ""
+msgstr "檔案從您開啟它後已被修改，�繼續儲存？"
 
-#: src/files.c:2611
+#: src/files.c:2882
 msgid "(more)"
 msgstr "(更多)"
 
-#: src/files.c:2694 src/rcfile.c:1220
-#, fuzzy, c-format
+#: src/files.c:2974
+#, c-format
 msgid ""
 "\n"
-"Press Enter to continue starting nano.\n"
+"Press Enter to continue\n"
 msgstr ""
 "\n"
-"按下輸入�繼續啟動 nano\n"
+"按下輸入�以繼續\n"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:415 src/prompt.c:1288
-msgid "Cancel"
-msgstr "�消"
+#: src/files.c:2989
+#, fuzzy, c-format
+msgid ""
+"Unable to create directory %s: %s\n"
+"It is required for saving/loading search history or cursor positions.\n"
+msgstr ""
+"無法建立目錄 %s：%s\n"
+"�於儲存/載入�尋歷�或游標�置而言，它是必�的\n"
 
-#: src/global.c:416
-msgid "Replace"
-msgstr "置�"
+#: src/files.c:2995
+#, fuzzy, c-format
+msgid ""
+"Path %s is not a directory and needs to be.\n"
+"Nano will be unable to load or save search history or cursor positions.\n"
+msgstr ""
+"路徑 %s 並��必須是個目錄。\n"
+"Nano 將無法載入或儲存�尋或游標�置歷�\n"
 
-#: src/global.c:417
-msgid "No Replace"
-msgstr "�置�"
+#: src/files.c:3012
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I tried to move\n"
+"to the preferred location (%s) but encountered an error: %s"
+msgstr ""
+"�測到舊的 nano 歷�檔案 (%s)，我已嘗試將它移動\n"
+"到�好的�置 (%s) 但是�到了錯誤：%s"
 
-#: src/global.c:420
-msgid "Case Sens"
-msgstr "�大�寫"
+#: src/files.c:3016
+#, c-format
+msgid ""
+"Detected a legacy nano history file (%s) which I moved\n"
+"to the preferred location (%s)\n"
+"(see the nano FAQ about this change)"
+msgstr ""
+"�測到舊的 nano 歷�檔案 (%s)，我已將它移動\n"
+"到�好的�置 (%s)\n"
+"(�看關於這個變更的 nano FAQ)"
 
-#: src/global.c:421
-msgid "Backwards"
-msgstr "�後�尋"
+#. TRANSLATORS: Try to keep the next four strings at most 10 characters.
+#: src/global.c:477
+msgid "Exit"
+msgstr "離開"
 
-#: src/global.c:425
-msgid "Regexp"
-msgstr "正�表示"
+#: src/global.c:478
+msgid "Close"
+msgstr "關閉"
 
-#. TRANSLATORS: Try to keep the next five strings at most 10 characters.
-#: src/global.c:451
+#: src/global.c:479
 #, fuzzy
-msgid "PrevHstory"
-msgstr "歷�記錄"
+msgid "Uncut Text"
+msgstr "還原剪下文字"
 
-#: src/global.c:452
+#: src/global.c:481
 #, fuzzy
-msgid "NextHstory"
-msgstr "歷�記錄"
-
-#: src/global.c:453
-msgid "Go To Text"
-msgstr "跳至文字"
+msgid "Unjustify"
+msgstr "還原�齊"
 
-#. TRANSLATORS: Try to keep the next three strings at most 12 characters.
-#: src/global.c:455
-#, fuzzy
+#. TRANSLATORS: Try to keep this at most 12 characters.
+#: src/global.c:485
 msgid "WhereIs Next"
-msgstr "何處是下一個"
+msgstr "下一個�置"
 
-#: src/global.c:457
-#, fuzzy
-msgid "First File"
-msgstr "首列"
-
-#: src/global.c:458
-#, fuzzy
-msgid "Last File"
-msgstr "尾列"
-
-#. TRANSLATORS: Try to keep the next nine strings at most 16 characters.
-#: src/global.c:460
-msgid "To Files"
-msgstr "檔案�單"
-
-#: src/global.c:462
-msgid "DOS Format"
-msgstr "DOS 格�"
-
-#: src/global.c:463
-msgid "Mac Format"
-msgstr "Mac 格�"
-
-#: src/global.c:464
-msgid "Append"
-msgstr "附加"
-
-#: src/global.c:465
-msgid "Prepend"
-msgstr "�引"
-
-#: src/global.c:466
-msgid "Backup File"
-msgstr "備份檔案"
-
-#: src/global.c:467
-msgid "Execute Command"
-msgstr "執行命令"
-
-#: src/global.c:471
-msgid "Go To Dir"
-msgstr "跳至目錄"
-
-#. TRANSLATORS: Try to keep the following strings at most 10 characters.
-#: src/global.c:480
-msgid "Get Help"
-msgstr "求助"
-
-#: src/global.c:481
-msgid "Exit"
-msgstr "離開"
-
-#: src/global.c:482
+#. TRANSLATORS: Try to keep the next eight strings at most 10 characters.
+#: src/global.c:492
 msgid "Where Is"
 msgstr "�尋"
 
-#: src/global.c:483
-msgid "Prev Page"
-msgstr "上�"
-
-#: src/global.c:484
-msgid "Next Page"
-msgstr "下�"
-
-#: src/global.c:485
-msgid "First Line"
-msgstr "首列"
+#: src/global.c:493
+msgid "Replace"
+msgstr "置�"
 
-#: src/global.c:486
-msgid "Last Line"
-msgstr "尾列"
+#: src/global.c:494
+msgid "Go To Line"
+msgstr "跳列"
 
-#: src/global.c:487
-msgid "Suspend"
-msgstr "暫�"
+#: src/global.c:495
+msgid "Prev Line"
+msgstr "上列"
 
-#: src/global.c:489
-msgid "Beg of Par"
-msgstr "段�開頭"
+#: src/global.c:496
+msgid "Next Line"
+msgstr "下列"
 
-#: src/global.c:490
-msgid "End of Par"
-msgstr "段��尾"
+#: src/global.c:497
+msgid "Read File"
+msgstr "讀檔"
 
-#: src/global.c:491
+#: src/global.c:499
 msgid "FullJstify"
 msgstr "全部�齊"
 
-#: src/global.c:493
+#: src/global.c:501
 msgid "Refresh"
 msgstr "�新顯示"
 
-#: src/global.c:495
-msgid "Insert File"
-msgstr "�入檔案"
-
-#: src/global.c:497
-msgid "Go To Line"
-msgstr "跳列"
-
-#: src/global.c:500
+#. TRANSLATORS: The next long series of strings are shortcut descriptions;
+#. * they are best kept shorter than 56 characters, but may be longer.
+#: src/global.c:507
 msgid "Justify the current paragraph"
 msgstr "�齊目�段�"
 
-#. TRANSLATORS: The next long series of strings are shortcut descriptions;
-#. * they are best kept shorter than 56 characters, but may be longer.
-#: src/global.c:505
+#: src/global.c:509
 msgid "Cancel the current function"
 msgstr "�消目�功能"
 
-#: src/global.c:506
+#: src/global.c:510
 msgid "Display this help text"
-msgstr ""
+msgstr "顯示這份說明文字"
 
-#: src/global.c:509
-#, fuzzy
+#: src/global.c:513
 msgid "Close the current file buffer / Exit from nano"
-msgstr "關閉目�檔案緩��並離開 nano"
+msgstr "關閉目�檔案緩�� / 離開 nano"
 
-#: src/global.c:511
+#: src/global.c:515
 msgid "Exit from nano"
 msgstr "離開 nano"
 
-#: src/global.c:515
+#: src/global.c:519
 msgid "Write the current file to disk"
 msgstr "寫入目�檔案至�碟"
 
-#: src/global.c:517
+#: src/global.c:521
 msgid "Insert another file into the current one"
 msgstr "�入它檔至目�檔案"
 
-#: src/global.c:519
-#, fuzzy
+#: src/global.c:523
 msgid "Search for a string or a regular expression"
-msgstr "使用正�表示�"
+msgstr "使用字串或正�表示�來�尋"
 
-#: src/global.c:520
+#: src/global.c:526
 #, fuzzy
-msgid "Go to previous screen"
-msgstr "跳至�一畫�"
+msgid "Search for a string"
+msgstr "使用字串或正�表示�來�尋"
 
-#: src/global.c:521
+#: src/global.c:528
 #, fuzzy
-msgid "Go to next screen"
+msgid "Go one screenful up"
 msgstr "跳至後一畫�"
 
-#: src/global.c:523
+#: src/global.c:529
+#, fuzzy
+msgid "Go one screenful down"
+msgstr "跳至後一畫�"
+
+#: src/global.c:531
 msgid "Cut the current line and store it in the cutbuffer"
 msgstr "剪下目�這列並存至剪貼簿"
 
-#: src/global.c:525
+#: src/global.c:533
 msgid "Uncut from the cutbuffer into the current line"
 msgstr "從剪貼簿還原至目�這列"
 
-#: src/global.c:527
-#, fuzzy
+#: src/global.c:534
 msgid "Display the position of the cursor"
 msgstr "顯示游標�置"
 
-#: src/global.c:529
+#: src/global.c:536
 msgid "Invoke the spell checker, if available"
 msgstr "嘗試呼�拼字檢查"
 
-#: src/global.c:531
-#, fuzzy
+#: src/global.c:538
 msgid "Replace a string or a regular expression"
-msgstr "使用正�表示�"
+msgstr "置�字串或正�表示�"
 
-#: src/global.c:532
+#: src/global.c:539
 msgid "Go to line and column number"
 msgstr "跳至指定列與行�置"
 
-#: src/global.c:534
-msgid "Mark text at the cursor position"
+#: src/global.c:541
+#, fuzzy
+msgid "Mark text starting from the cursor position"
 msgstr "標記游標所在文字"
 
-#: src/global.c:535
-msgid "Repeat last search"
+#: src/global.c:542
+#, fuzzy
+msgid "Repeat the last search"
 msgstr "�覆上次�尋"
 
-#: src/global.c:537
-#, fuzzy
+#: src/global.c:544
 msgid "Copy the current line and store it in the cutbuffer"
 msgstr "剪下目�這列並存至剪貼簿"
 
-#: src/global.c:538
-#, fuzzy
+#: src/global.c:545
 msgid "Indent the current line"
-msgstr "附加至目�檔案"
+msgstr "縮排目�這列"
 
-#: src/global.c:539
-#, fuzzy
+#: src/global.c:546
 msgid "Unindent the current line"
-msgstr "附加至目�檔案"
+msgstr "�消目�這列的縮排"
 
-#: src/global.c:540
+#: src/global.c:547
 msgid "Undo the last operation"
-msgstr ""
+msgstr "復原上次的動作"
 
-#: src/global.c:541
+#: src/global.c:548
 msgid "Redo the last undone operation"
-msgstr ""
+msgstr "��最後一筆已復原作業"
 
-#: src/global.c:543
-#, fuzzy
+#: src/global.c:550
 msgid "Go forward one character"
 msgstr "��跳一字元"
 
-#: src/global.c:544
-#, fuzzy
+#: src/global.c:551
 msgid "Go back one character"
 msgstr "�後跳一字元"
 
-#: src/global.c:546
-#, fuzzy
+#: src/global.c:553
 msgid "Go forward one word"
-msgstr "��跳一個字"
+msgstr "��跳一字詞"
 
-#: src/global.c:547
-#, fuzzy
+#: src/global.c:554
 msgid "Go back one word"
-msgstr "�後跳一個字"
+msgstr "�後跳一字詞"
 
-#: src/global.c:549
-#, fuzzy
+#: src/global.c:556
 msgid "Go to previous line"
 msgstr "跳至�一列"
 
-#: src/global.c:550
-#, fuzzy
+#: src/global.c:557
 msgid "Go to next line"
 msgstr "跳至後一列"
 
-#: src/global.c:551
-#, fuzzy
+#: src/global.c:558
 msgid "Go to beginning of current line"
 msgstr "跳至目�列首"
 
-#: src/global.c:552
-#, fuzzy
+#: src/global.c:559
 msgid "Go to end of current line"
 msgstr "跳至目�列尾"
 
-#: src/global.c:555
-#, fuzzy
+#: src/global.c:562
 msgid "Go to beginning of paragraph; then of previous paragraph"
-msgstr "跳至目�段�開頭"
+msgstr "跳至目�段�開頭；然後是�一段�的開頭"
 
-#: src/global.c:557
-#, fuzzy
+#: src/global.c:564
 msgid "Go just beyond end of paragraph; then of next paragraph"
-msgstr "跳至目�段��尾"
+msgstr "跳至目�段��尾；然後是後一段�的�尾"
 
-#: src/global.c:560
+#: src/global.c:566
 msgid "Go to the first line of the file"
 msgstr "跳至檔案第一列"
 
-#: src/global.c:562
+#: src/global.c:567
 msgid "Go to the last line of the file"
 msgstr "跳至檔案最後一列"
 
-#: src/global.c:564
-#, fuzzy
+#: src/global.c:569
 msgid "Go to the matching bracket"
-msgstr "無�應括號"
+msgstr "跳至�應的括號"
 
-#: src/global.c:566
+#: src/global.c:571
 msgid "Scroll up one line without scrolling the cursor"
 msgstr "�上�動一列但��動游標"
 
-#: src/global.c:568
+#: src/global.c:573
 msgid "Scroll down one line without scrolling the cursor"
 msgstr "�下�動一列但��動游標"
 
-#: src/global.c:572
+#: src/global.c:576
 msgid "Switch to the previous file buffer"
 msgstr "切�至上個檔案緩��"
 
-#: src/global.c:574
+#: src/global.c:577
 msgid "Switch to the next file buffer"
 msgstr "切�至下個檔案緩��"
 
-#: src/global.c:577
-#, fuzzy
+#: src/global.c:579
 msgid "Insert the next keystroke verbatim"
-msgstr "�入字元原形"
+msgstr "�入下個按�的原形"
 
-#: src/global.c:579
-#, fuzzy
+#: src/global.c:580
 msgid "Insert a tab at the cursor position"
 msgstr "�入跳格字元於游標�置"
 
 #: src/global.c:581
-#, fuzzy
 msgid "Insert a newline at the cursor position"
 msgstr "�入�列字元於游標�置"
 
-#: src/global.c:583
+#: src/global.c:582
 msgid "Delete the character under the cursor"
 msgstr "刪除游標之下的字元"
 
-#: src/global.c:585
+#: src/global.c:584
 msgid "Delete the character to the left of the cursor"
 msgstr "刪除游標左�的字元"
 
-#: src/global.c:588
+#: src/global.c:587
 msgid "Cut from the cursor position to the end of the file"
 msgstr "從游標�置剪下至檔案�尾"
 
-#: src/global.c:591
+#: src/global.c:590
 msgid "Justify the entire file"
 msgstr "�齊整個檔案"
 
-#: src/global.c:595
+#: src/global.c:594
 msgid "Count the number of words, lines, and characters"
 msgstr "計算字數�列數與字元數"
 
-#: src/global.c:598
+#: src/global.c:597
 msgid "Refresh (redraw) the current screen"
 msgstr "�新顯示目�畫�"
 
-#: src/global.c:600
+#: src/global.c:599
 msgid "Suspend the editor (if suspend is enabled)"
-msgstr ""
+msgstr "懸置編輯器 (如果懸置已啟用)"
 
-#: src/global.c:603
+#: src/global.c:602
 msgid "Toggle the case sensitivity of the search"
-msgstr ""
+msgstr "切��尋的大�寫符�"
 
-#: src/global.c:605
-#, fuzzy
+#: src/global.c:604
 msgid "Reverse the direction of the search"
-msgstr "顯示游標�置"
+msgstr "倒轉�尋方�"
 
-#: src/global.c:609
-#, fuzzy
+#: src/global.c:608
 msgid "Toggle the use of regular expressions"
-msgstr "使用正�表示�"
+msgstr "切�使用正�表示�"
 
-#: src/global.c:613
-#, fuzzy
+#: src/global.c:612
 msgid "Recall the previous search/replace string"
-msgstr "編輯�次�尋/置�字串"
+msgstr "�用上次�尋/置�字串"
 
-#: src/global.c:615
-#, fuzzy
+#: src/global.c:614
 msgid "Recall the next search/replace string"
-msgstr "編輯�次�尋/置�字串"
+msgstr "�用下次�尋/置�字串"
 
-#: src/global.c:618
+#: src/global.c:617
 msgid "Go to file browser"
 msgstr "呼�檔案�單"
 
-#: src/global.c:621
-#, fuzzy
+#: src/global.c:620
 msgid "Toggle the use of DOS format"
-msgstr "以 DOS 格�寫入檔案"
+msgstr "切�使用 DOS 格�"
 
-#: src/global.c:622
-#, fuzzy
+#: src/global.c:621
 msgid "Toggle the use of Mac format"
-msgstr "以 Mac 格�寫入檔案"
+msgstr "切�使用 Mac 格�"
 
-#: src/global.c:624
-#, fuzzy
+#: src/global.c:622
 msgid "Toggle appending"
-msgstr "長列轉�"
+msgstr "切�附加"
 
-#: src/global.c:625
+#: src/global.c:623
 msgid "Toggle prepending"
-msgstr ""
+msgstr "切��置"
 
-#: src/global.c:628
-#, fuzzy
+#: src/global.c:624
 msgid "Toggle backing up of the original file"
-msgstr "儲存既有檔案的備份"
+msgstr "切�備份既有檔案"
 
-#: src/global.c:629
+#: src/global.c:625
 msgid "Execute external command"
 msgstr "執行外部命令"
 
-#: src/global.c:633
-#, fuzzy
+#: src/global.c:628
 msgid "Toggle the use of a new buffer"
-msgstr "無法得知管線緩��大�"
+msgstr "切�使用新緩��"
 
-#: src/global.c:636
+#: src/global.c:631
 msgid "Exit from the file browser"
 msgstr "從檔案�單離開"
 
-#: src/global.c:638
-#, fuzzy
+#: src/global.c:632
 msgid "Go to the first file in the list"
-msgstr "跳至檔案第一列"
+msgstr "跳至列表中的第一個檔案"
+
+#: src/global.c:633
+msgid "Go to the last file in the list"
+msgstr "跳至列表中的最後一個檔案"
+
+#: src/global.c:634
+msgid "Go to the previous file in the list"
+msgstr "跳至列表中的上一個檔案"
+
+#: src/global.c:635
+msgid "Go to the next file in the list"
+msgstr "跳至列表中的下一個檔案"
+
+#: src/global.c:636
+msgid "Go to directory"
+msgstr "跳至目錄"
+
+#: src/global.c:639
+#, fuzzy
+msgid "Invoke the linter, if available"
+msgstr "嘗試呼�拼字檢查"
 
 #: src/global.c:640
 #, fuzzy
-msgid "Go to the last file in the list"
-msgstr "跳至檔案最後一列"
+msgid "Go to previous linter msg"
+msgstr "跳至�一列"
 
 #: src/global.c:641
 #, fuzzy
-msgid "Go to the next file in the list"
+msgid "Go to next linter msg"
 msgstr "跳至後一列"
 
 #: src/global.c:642
 #, fuzzy
-msgid "Go to the previous file in the list"
-msgstr "跳至�一列"
+msgid "Invoke formatter, if available"
+msgstr "嘗試呼�拼字檢查"
 
-#: src/global.c:643
-msgid "Go to directory"
-msgstr "跳至目錄"
+#. TRANSLATORS: Try to keep the following strings at most 10 characters.
+#: src/global.c:662
+msgid "Get Help"
+msgstr "求助"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:670
-msgid "Close"
-msgstr "關閉"
+#: src/global.c:665 src/prompt.c:1084
+msgid "Cancel"
+msgstr "�消"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:679
-msgid "WriteOut"
+#: src/global.c:678
+#, fuzzy
+msgid "Write Out"
 msgstr "寫入"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:684
-msgid "Justify"
-msgstr "�齊"
-
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:696
-msgid "Read File"
-msgstr "讀檔"
+#: src/global.c:704
+msgid "Go To Dir"
+msgstr "跳至目錄"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:713
+#: src/global.c:719
 msgid "Cut Text"
 msgstr "剪下文字"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:718
-msgid "UnJustify"
-msgstr "還原�齊"
+#: src/global.c:728
+msgid "Justify"
+msgstr "�齊"
+
+#: src/global.c:733
+msgid "To Spell"
+msgstr "拼字檢查"
+
+#: src/global.c:738
+#, fuzzy
+msgid "To Linter"
+msgstr "跳列"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:723
+#: src/global.c:740
 #, fuzzy
-msgid "UnCut Text"
-msgstr "還原剪下"
+msgid "Formatter"
+msgstr "DOS 格�"
+
+#: src/global.c:745
+msgid "Case Sens"
+msgstr "�大�寫"
+
+#: src/global.c:750
+msgid "Regexp"
+msgstr "正�表示�"
+
+#: src/global.c:755
+msgid "Backwards"
+msgstr "�後�尋"
+
+#: src/global.c:762
+msgid "No Replace"
+msgstr "�置�"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:728 src/global.c:755
+#: src/global.c:770
 msgid "Cur Pos"
 msgstr "游標�置"
 
-#. TRANSLATORS: Try to keep this at most 10 characters.
-#: src/global.c:737
-msgid "To Spell"
-msgstr "拼字檢查"
+#: src/global.c:780
+msgid "Prev Page"
+msgstr "上�"
+
+#: src/global.c:782
+msgid "Next Page"
+msgstr "下�"
+
+#: src/global.c:785
+msgid "First Line"
+msgstr "首列"
+
+#: src/global.c:787
+msgid "Last Line"
+msgstr "尾列"
+
+#: src/global.c:794
+#, fuzzy
+msgid "To Bracket"
+msgstr "並�一個括號"
 
-#: src/global.c:771
+#: src/global.c:797
 msgid "Mark Text"
 msgstr "標記文字"
 
-#: src/global.c:777
-#, fuzzy
+#: src/global.c:800
 msgid "Copy Text"
-msgstr "剪下文字"
+msgstr "複製文字"
 
-#: src/global.c:780
-#, fuzzy
+#: src/global.c:803
 msgid "Indent Text"
-msgstr "剪下文字"
+msgstr "縮排文字"
 
-#: src/global.c:783
-#, fuzzy
+#: src/global.c:805
 msgid "Unindent Text"
-msgstr "還原剪下"
+msgstr "�消縮排文字"
 
-#: src/global.c:787
+#: src/global.c:808
 msgid "Undo"
-msgstr ""
+msgstr "復原"
 
-#: src/global.c:790
+#: src/global.c:810
 msgid "Redo"
-msgstr ""
+msgstr "��"
 
-#: src/global.c:796 src/global.c:800
-msgid "Forward"
-msgstr "��"
-
-#: src/global.c:806 src/global.c:810
+#: src/global.c:814 src/global.c:820
 msgid "Back"
 msgstr "�後"
 
-#: src/global.c:817
-msgid "Next Word"
-msgstr "後一個字"
+#: src/global.c:816 src/global.c:822
+msgid "Forward"
+msgstr "��"
 
-#: src/global.c:820
+#: src/global.c:827
 msgid "Prev Word"
 msgstr "�一個字"
 
-#: src/global.c:824
-msgid "Prev Line"
-msgstr "上列"
-
-#: src/global.c:827
-msgid "Next Line"
-msgstr "下列"
+#: src/global.c:829
+msgid "Next Word"
+msgstr "後一個字"
 
-#: src/global.c:830
+#: src/global.c:833
 msgid "Home"
 msgstr "頂端"
 
-#: src/global.c:833
+#: src/global.c:835
 msgid "End"
 msgstr "尾端"
 
-#: src/global.c:845
-msgid "Find Other Bracket"
-msgstr "尋找其他括號"
+#: src/global.c:844
+msgid "Beg of Par"
+msgstr "段�開頭"
 
-#: src/global.c:848
+#: src/global.c:846
+msgid "End of Par"
+msgstr "段��尾"
+
+#: src/global.c:851
 msgid "Scroll Up"
 msgstr "�上�動"
 
-#: src/global.c:851
+#: src/global.c:853
 msgid "Scroll Down"
 msgstr "�下�動"
 
-#: src/global.c:856
-msgid "Previous File"
+#: src/global.c:858
+#, fuzzy
+msgid "Prev File"
 msgstr "上個檔案"
 
-#: src/global.c:858
+#: src/global.c:860
 msgid "Next File"
 msgstr "下個檔案"
 
-#. TRANSLATORS: This is displayed when the next keystroke will be
-#. * inserted verbatim.
-#: src/global.c:862 src/text.c:3045
-msgid "Verbatim Input"
+#: src/global.c:869
+#, fuzzy
+msgid "Verbatim"
 msgstr "原形輸入"
 
-#: src/global.c:867
+#: src/global.c:872
 msgid "Tab"
 msgstr "跳格�"
 
-#: src/global.c:870
+#: src/global.c:874
 msgid "Enter"
 msgstr "輸入�"
 
-#: src/global.c:873
+#: src/global.c:876
 msgid "Delete"
 msgstr "刪除�"
 
-#: src/global.c:876
+#: src/global.c:878
 msgid "Backspace"
 msgstr "退格�"
 
-#: src/global.c:893
+#: src/global.c:888
 msgid "CutTillEnd"
 msgstr "刪至末端"
 
-#: src/global.c:906
+#: src/global.c:898
 msgid "Word Count"
 msgstr "計算字數"
 
-#: src/global.c:1367
+#: src/global.c:905
+msgid "Suspend"
+msgstr "懸置"
+
+#: src/global.c:910
+msgid "PrevHstory"
+msgstr "上一筆記錄"
+
+#: src/global.c:913
+msgid "NextHstory"
+msgstr "下一筆記錄"
+
+#: src/global.c:917
+msgid "Go To Text"
+msgstr "跳至文字"
+
+#: src/global.c:928
+msgid "DOS Format"
+msgstr "DOS 格�"
+
+#: src/global.c:931
+msgid "Mac Format"
+msgstr "Mac 格�"
+
+#: src/global.c:934
+msgid "Append"
+msgstr "附加"
+
+#: src/global.c:936
+msgid "Prepend"
+msgstr "�引"
+
+#: src/global.c:939
+msgid "Backup File"
+msgstr "備份檔案"
+
+#: src/global.c:946
+msgid "Execute Command"
+msgstr "執行命令"
+
+#: src/global.c:961
+msgid "To Files"
+msgstr "檔案�單"
+
+#: src/global.c:964
+msgid "First File"
+msgstr "第一個檔案"
+
+#: src/global.c:966
+msgid "Last File"
+msgstr "最後的檔案"
+
+#: src/global.c:977
+#, fuzzy
+msgid "Prev Lint Msg"
+msgstr "上列"
+
+#: src/global.c:979
+#, fuzzy
+msgid "Next Lint Msg"
+msgstr "下列"
+
+#. TRANSLATORS: The next seventeen strings are toggle descriptions;
+#. * they are best kept shorter than 40 characters, but may be longer.
+#: src/global.c:1227
 msgid "Help mode"
 msgstr "輔助模�"
 
-#: src/global.c:1369
+#: src/global.c:1229
 msgid "Constant cursor position display"
 msgstr "�續顯示游標�置"
 
-#: src/global.c:1371
-#, fuzzy
+#: src/global.c:1231
 msgid "Use of one more line for editing"
-msgstr "編輯時使用更多空間"
+msgstr "編輯時多使用一列"
 
-#: src/global.c:1373
+#: src/global.c:1233
 msgid "Smooth scrolling"
 msgstr "平滑��動畫�"
 
-#: src/global.c:1375
+#: src/global.c:1235
+#, fuzzy
+msgid "Soft wrapping of overlong lines"
+msgstr "��自動�列"
+
+#: src/global.c:1237
 msgid "Whitespace display"
 msgstr "顯示空格"
 
-#: src/global.c:1377
+#: src/global.c:1239
 msgid "Color syntax highlighting"
 msgstr "語法色彩標示"
 
-#: src/global.c:1379
+#: src/global.c:1241
 msgid "Smart home key"
 msgstr "智慧型 HOME 按�"
 
-#: src/global.c:1381
+#: src/global.c:1243
 msgid "Auto indent"
 msgstr "自動縮排"
 
-#: src/global.c:1383
+#: src/global.c:1245
 msgid "Cut to end"
 msgstr "剪下至列尾"
 
-#: src/global.c:1385
-msgid "Long line wrapping"
-msgstr "長列轉�"
+#: src/global.c:1247
+#, fuzzy
+msgid "Hard wrapping of overlong lines"
+msgstr "��自動�列"
 
-#: src/global.c:1387
+#: src/global.c:1249
 msgid "Conversion of typed tabs to spaces"
 msgstr "已輸入跳格符號至空白的轉�"
 
-#: src/global.c:1389
+#: src/global.c:1251
 msgid "Backup files"
 msgstr "備份檔案"
 
-#: src/global.c:1391
+#: src/global.c:1253
 msgid "Multiple file buffers"
 msgstr "多�檔案緩��"
 
-#: src/global.c:1393
+#: src/global.c:1255
 msgid "Mouse support"
 msgstr "滑鼠支�"
 
-#: src/global.c:1395
+#: src/global.c:1257
 msgid "No conversion from DOS/Mac format"
 msgstr "�從 DOS/Mac 格�轉檔"
 
-#: src/global.c:1397
-#, fuzzy
+#: src/global.c:1259
 msgid "Suspension"
-msgstr "暫�"
-
-#: src/global.c:1399
-#, fuzzy
-msgid "Soft line wrapping"
-msgstr "長列轉�"
+msgstr "懸置"
 
-#: src/help.c:236
+#: src/help.c:205
 msgid ""
 "Search Command Help Text\n"
 "\n"
@@ -1016,7 +1079,7 @@ msgstr ""
 " �次�尋的字串將會顯示在 �尋: �示符號後�的括號中。�輸入任何文字 而直接按"
 "下輸入�則會履行�次的�尋。"
 
-#: src/help.c:245
+#: src/help.c:214
 msgid ""
 "If you have selected text with the mark and then search to replace, only "
 "matches in the selected text will be replaced.\n"
@@ -1030,7 +1093,7 @@ msgstr ""
 " 以下的功能��用於�尋模�:\n"
 "\n"
 
-#: src/help.c:251
+#: src/help.c:220
 msgid ""
 "Go To Line Help Text\n"
 "\n"
@@ -1049,7 +1112,7 @@ msgstr ""
 " 以下的功能��用於跳列模�: \n"
 "\n"
 
-#: src/help.c:260
+#: src/help.c:229
 msgid ""
 "Insert File Help Text\n"
 "\n"
@@ -1069,7 +1132,7 @@ msgstr ""
 "multibuffer�Meta-F 開關，或者 nanorc 檔案來啟動的話，所�入的檔案 將會被載入"
 "�外的緩��中 (利用 Meta-< 和 > 在檔案緩��間切�)。 "
 
-#: src/help.c:269
+#: src/help.c:238
 msgid ""
 "If you need another blank buffer, do not enter any filename, or type in a "
 "nonexistent filename at the prompt and press Enter.\n"
@@ -1083,7 +1146,7 @@ msgstr ""
 " 以下的功能��用於�入檔案模�:\n"
 "\n"
 
-#: src/help.c:275
+#: src/help.c:244
 msgid ""
 "Write File Help Text\n"
 "\n"
@@ -1102,14 +1165,14 @@ msgstr ""
 "\n"
 " 先�入您想�以此來儲存目�檔案的�稱，並按下輸入�來儲存檔案。\n"
 "\n"
-" 如果已經用標記�擇了文字，那麼您將會被�示，�儲存標記部份到�外的檔 案。為"
-"了�低目�檔案�被其中部份覆寫的機會，在此模�下，目�的檔��會 �為�設"
+" 如果已經用標記�擇了文字，那麼您將會被�示，�儲存標記部分到�外的檔 案。為"
+"了�低目�檔案�被其中部分覆寫的機會，在此模�下，目�的檔��會 �為�設"
 "值。\n"
 "\n"
 " 以下的功能��用於寫入檔案模�: \n"
 "\n"
 
-#: src/help.c:289
+#: src/help.c:258
 msgid ""
 "File Browser Help Text\n"
 "\n"
@@ -1131,8 +1194,7 @@ msgstr ""
 " 以下的功能��用於檔案�單: \n"
 "\n"
 
-#: src/help.c:302
-#, fuzzy
+#: src/help.c:271
 msgid ""
 "Browser Search Command Help Text\n"
 "\n"
@@ -1151,15 +1213,18 @@ msgstr ""
 "輸入的文字，畫�就會更新到最�乎�尋字串的�置。\n"
 "\n"
 " �次�尋的字串將會顯示在 �尋: �示符號後�的括號中。�輸入任何文字 而直接按"
-"下輸入�則會履行�次的�尋。"
+"下輸入�則會履行�次的�尋。\n"
+"\n"
 
-#: src/help.c:311
+#: src/help.c:280
 msgid ""
 " The following function keys are available in Browser Search mode:\n"
 "\n"
 msgstr ""
+" 下列功能��用於�覽器�尋模�：\n"
+"\n"
 
-#: src/help.c:315
+#: src/help.c:284
 msgid ""
 "Browser Go To Directory Help Text\n"
 "\n"
@@ -1181,8 +1246,7 @@ msgstr ""
 " 以下的功能��用於跳至目錄模�: \n"
 "\n"
 
-#: src/help.c:328
-#, fuzzy
+#: src/help.c:297
 msgid ""
 "Spell Check Help Text\n"
 "\n"
@@ -1204,8 +1268,7 @@ msgstr ""
 " 以下的功能��用於拼字檢查模�: \n"
 "\n"
 
-#: src/help.c:343
-#, fuzzy
+#: src/help.c:312
 msgid ""
 "Execute Command Help Text\n"
 "\n"
@@ -1224,8 +1287,7 @@ msgstr ""
 " 以下的功能��用於執行命令模�: \n"
 "\n"
 
-#: src/help.c:356
-#, fuzzy
+#: src/help.c:325
 msgid ""
 "Main nano help text\n"
 "\n"
@@ -1239,14 +1301,13 @@ msgstr ""
 "nano 輔助說明\n"
 "\n"
 " nano 編輯器是設計來在功能性�易用性方�，模仿�盛頓大學的 Pico 文字 編輯器。"
-"它�有四個主�部份:頂列顯示程�版本�目�被編輯的檔案�稱， 以�是�這檔案已"
+"它�有四個主�部分:頂列顯示程�版本�目�被編輯的檔案�稱， 以�是�這檔案已"
 "經更動�。接著是主�編輯�，顯示正在編輯的檔案。狀態 列�於倒數第三列，用來顯"
-"示��的訊�。底部的兩列則顯示編輯器中最常用 到的快��。\n"
+"示��的訊�。\n"
 "\n"
 " "
 
-#: src/help.c:366
-#, fuzzy
+#: src/help.c:335
 msgid ""
 "The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
@@ -1256,12 +1317,13 @@ msgid ""
 "notated with the Meta (M-) symbol and can be entered using either the Esc, "
 "Alt, or Meta key depending on your keyboard setup.  "
 msgstr ""
+"底部的兩列顯示編輯器中最常用 到的快��。\n"
 "快��的記號定義如下：控制�組 (Control-key) �列是以一個 \"帽�\" (caret, "
 "^) 符號來表示，它�以藉由控制� (Ctrl) 或是按兩次脫離� (Esc) 來輸入。脫離�"
 "組 (Escape-key) �列是以 \"中介\" (Meta, M) 符號表示，它 �以�照您的�盤設"
 "定，利用 Esc，Alt 或 Meta 來輸入。"
 
-#: src/help.c:375
+#: src/help.c:344
 msgid ""
 "Also, pressing Esc twice and then typing a three-digit decimal number from "
 "000 to 255 will enter the character with the corresponding value.  The "
@@ -1273,16 +1335,15 @@ msgstr ""
 "�應的字 元。下列按�組��用於主�編輯�，替代按�則顯示於括弧內:\n"
 "\n"
 
-#: src/help.c:407 src/help.c:483
+#: src/help.c:376 src/help.c:448
 msgid "enable/disable"
 msgstr "開啟/關閉"
 
-#: src/nano.c:587
-#, fuzzy
+#: src/nano.c:601
 msgid "Key invalid in view mode"
 msgstr "觀看模�中此按�無效"
 
-#: src/nano.c:695
+#: src/nano.c:713
 #, c-format
 msgid ""
 "\n"
@@ -1291,7 +1352,7 @@ msgstr ""
 "\n"
 "緩��已寫入 %s\n"
 
-#: src/nano.c:697
+#: src/nano.c:715
 #, c-format
 msgid ""
 "\n"
@@ -1300,7 +1361,7 @@ msgstr ""
 "\n"
 "緩��未寫入至 %s: %s\n"
 
-#: src/nano.c:700
+#: src/nano.c:718
 #, c-format
 msgid ""
 "\n"
@@ -1309,287 +1370,273 @@ msgstr ""
 "\n"
 "緩��未寫入: %s\n"
 
-#: src/nano.c:723
+#: src/nano.c:743
 msgid "Window size is too small for nano...\n"
-msgstr "視窗尺寸� nano 來說太�了...\n"
+msgstr "視窗尺寸� nano 來說太�了…\n"
 
-#: src/nano.c:816
-#, fuzzy, c-format
+#: src/nano.c:836
+#, c-format
 msgid ""
 "Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n"
 "\n"
 msgstr ""
-"用法: nano [+列數,行數] [�項] [檔案�稱]\n"
+"用法: nano [�項] [[+列數,行數] 檔案�稱]…\n"
 "\n"
 
-#: src/nano.c:819
-#, fuzzy, c-format
+#: src/nano.c:839
+#, c-format
 msgid "Option\t\tGNU long option\t\tMeaning\n"
 msgstr "�項\t\tGNU 長�項\t\t�義\n"
 
-#: src/nano.c:821
+#: src/nano.c:841
 #, c-format
 msgid "Option\t\tMeaning\n"
 msgstr "�項\t\t�義\n"
 
-#: src/nano.c:824
-msgid "Show this message"
-msgstr "顯示此訊�"
-
-#: src/nano.c:825
+#: src/nano.c:844
 msgid "+LINE,COLUMN"
 msgstr "+列數,行數"
 
-#: src/nano.c:826
+#. TRANSLATORS: The next forty or so strings are option descriptions
+#. * for the --help output.  Try to keep them at most 40 characters.
+#: src/nano.c:847
 msgid "Start at line LINE, column COLUMN"
 msgstr "從所指列數與行數開始"
 
-#: src/nano.c:828
+#: src/nano.c:849
 msgid "Enable smart home key"
 msgstr "開啟智慧型 HOME 按�功能"
 
-#: src/nano.c:829
+#: src/nano.c:850
 msgid "Save backups of existing files"
 msgstr "儲存既有檔案的備份"
 
-#: src/nano.c:830
-#, fuzzy
+#: src/nano.c:851
 msgid "-C <dir>"
-msgstr "-C [目錄]"
+msgstr "-C <目錄>"
 
-#: src/nano.c:830
-#, fuzzy
+#: src/nano.c:851
 msgid "--backupdir=<dir>"
-msgstr "--backupdir=[目錄]"
+msgstr "--backupdir=<目錄>"
 
-#: src/nano.c:831
+#: src/nano.c:852
 msgid "Directory for saving unique backup files"
 msgstr "用以儲存�一備份檔案的目錄"
 
-#: src/nano.c:834
+#: src/nano.c:855
 msgid "Use bold instead of reverse video text"
-msgstr ""
+msgstr "使用粗體以代替�白顯示文字"
 
-#: src/nano.c:837
+#: src/nano.c:858
 msgid "Convert typed tabs to spaces"
 msgstr "將已輸入的跳格符號轉�為空白"
 
-#: src/nano.c:840
+#: src/nano.c:861
 msgid "Enable multiple file buffers"
 msgstr "開啟多�檔案緩��功能"
 
-#: src/nano.c:845
+#: src/nano.c:865
+msgid "Use (vim-style) lock files"
+msgstr "使用 (vim 形�) 鎖定檔案"
+
+#: src/nano.c:869
 msgid "Log & read search/replace string history"
 msgstr "記錄與讀� �尋/置� 的歷�字串"
 
-#: src/nano.c:848
+#: src/nano.c:873
 msgid "Don't look at nanorc files"
 msgstr "���考 nanorc 檔案"
 
-#: src/nano.c:851
+#: src/nano.c:876
 msgid "Fix numeric keypad key confusion problem"
 msgstr "修正數字��按�混淆�題"
 
-#: src/nano.c:853
+#: src/nano.c:878
 msgid "Don't add newlines to the ends of files"
 msgstr "��將�列加到檔案末端"
 
-#: src/nano.c:856
+#: src/nano.c:881
 msgid "Don't convert files from DOS/Mac format"
 msgstr "��從 DOS/Mac 格�轉檔"
 
-#: src/nano.c:858
-#, fuzzy
+#: src/nano.c:883
 msgid "Use one more line for editing"
-msgstr "編輯時使用更多空間"
+msgstr "編輯時多使用一列"
 
-#: src/nano.c:860
-#, fuzzy
+#: src/nano.c:886
+msgid "Log & read location of cursor position"
+msgstr "記錄 & 讀�游標所在�置"
+
+#: src/nano.c:889
 msgid "-Q <str>"
-msgstr "-Q [字串]"
+msgstr "-Q <字串>"
 
-#: src/nano.c:860
-#, fuzzy
+#: src/nano.c:889
 msgid "--quotestr=<str>"
-msgstr "--quotestr=[字串]"
+msgstr "--quotestr=<字串>"
 
-#: src/nano.c:861
+#: src/nano.c:890
 msgid "Quoting string"
 msgstr "引用代表字串"
 
-#: src/nano.c:863
+#: src/nano.c:892
 msgid "Restricted mode"
 msgstr "�制模�"
 
-#: src/nano.c:866
+#: src/nano.c:895
 msgid "Scroll by line instead of half-screen"
-msgstr ""
+msgstr "�列�動以代替�個畫�"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:897
 msgid "-T <#cols>"
-msgstr "-T [#行數]"
+msgstr "-T <#行數>"
 
-#: src/nano.c:868
-#, fuzzy
+#: src/nano.c:897
 msgid "--tabsize=<#cols>"
-msgstr "--tabsize=[#行數]"
+msgstr "--tabsize=<#行數>"
 
-#: src/nano.c:869
-#, fuzzy
+#: src/nano.c:898
 msgid "Set width of a tab to #cols columns"
 msgstr "設定跳格寬度為 #行數"
 
-#: src/nano.c:871
+#: src/nano.c:900
 msgid "Do quick statusbar blanking"
 msgstr "狀態列快速閃動"
 
-#: src/nano.c:874
+#: src/nano.c:903
 msgid "Print version information and exit"
 msgstr "顯示版本資訊並離開"
 
-#: src/nano.c:877
+#: src/nano.c:906
 msgid "Detect word boundaries more accurately"
 msgstr "更正確地�測單字邊界"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "-Y <str>"
-msgstr "-Y [字串]"
+msgstr "-Y <字串>"
 
-#: src/nano.c:880
-#, fuzzy
+#: src/nano.c:909
 msgid "--syntax=<str>"
-msgstr "--syntax=[字串]"
+msgstr "--syntax=<字串>"
 
-#: src/nano.c:881
-#, fuzzy
+#: src/nano.c:910
 msgid "Syntax definition to use for coloring"
-msgstr "字串�為語法定義"
+msgstr "用於�色的語法定義"
 
-#: src/nano.c:883
+#: src/nano.c:912
 msgid "Constantly show cursor position"
 msgstr "�續顯示游標�置"
 
-#: src/nano.c:885
+#: src/nano.c:914
 msgid "Fix Backspace/Delete confusion problem"
 msgstr "修正 退格�/刪除� 混淆�題"
 
-#: src/nano.c:888
+#: src/nano.c:915
+#, fuzzy
+msgid "Show this help text"
+msgstr "顯示這份說明文字"
+
+#: src/nano.c:918
 msgid "Automatically indent new lines"
 msgstr "自動縮排新列"
 
-#: src/nano.c:889
+#: src/nano.c:919
 msgid "Cut from cursor to end of line"
 msgstr "從游標剪下至列尾"
 
-#: src/nano.c:892
+#: src/nano.c:922
 msgid "Don't follow symbolic links, overwrite"
 msgstr "���照符號連�，而是覆寫"
 
-#: src/nano.c:894
-#, fuzzy
+#: src/nano.c:924
 msgid "Enable the use of the mouse"
 msgstr "開啟滑鼠功能"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:926
+msgid "Do not read the file (only write it)"
+msgstr ""
+
+#: src/nano.c:928
 msgid "-o <dir>"
-msgstr "-o [目錄]"
+msgstr "-o <目錄>"
 
-#: src/nano.c:897
-#, fuzzy
+#: src/nano.c:928
 msgid "--operatingdir=<dir>"
-msgstr "--operatingdir=[目錄]"
+msgstr "--operatingdir=<目錄>"
 
-#: src/nano.c:898
+#: src/nano.c:929
 msgid "Set operating directory"
 msgstr "設定�作目錄"
 
-#: src/nano.c:901
+#: src/nano.c:932
 msgid "Preserve XON (^Q) and XOFF (^S) keys"
 msgstr "�留 XON (^Q) 和 XOFF (^S) 按�"
 
-#: src/nano.c:903
+#: src/nano.c:935
 msgid "Silently ignore startup issues like rc file errors"
-msgstr ""
+msgstr "默默地忽略�是 rc 檔案錯誤之類的啟動�題"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:938
 msgid "-r <#cols>"
-msgstr "-r [#行數]"
+msgstr "-r <#行數>"
 
-#: src/nano.c:905
-#, fuzzy
+#: src/nano.c:938
 msgid "--fill=<#cols>"
-msgstr "--fill=[#行數]    "
+msgstr "--fill=<#行數>"
 
-#: src/nano.c:906
+#: src/nano.c:939
 #, fuzzy
-msgid "Set wrapping point at column #cols"
-msgstr "設定跳格寬度為 #行數"
+msgid "Set hard-wrapping point at column #cols"
+msgstr "設定�列點為 #行數"
 
-#: src/nano.c:909
-#, fuzzy
+#: src/nano.c:942
 msgid "-s <prog>"
-msgstr "-s [程�]"
+msgstr "-s <程�>"
 
-#: src/nano.c:909
-#, fuzzy
+#: src/nano.c:942
 msgid "--speller=<prog>"
-msgstr "--speller=[程�]"
+msgstr "--speller=<程�>"
 
-#: src/nano.c:910
+#: src/nano.c:943
 msgid "Enable alternate speller"
 msgstr "啟用替代的拼字檢查程�"
 
-#: src/nano.c:913
+#: src/nano.c:946
 msgid "Auto save on exit, don't prompt"
 msgstr "離開時自動儲存，���示"
 
-#: src/nano.c:915
-msgid "Allow generic undo [EXPERIMENTAL]"
-msgstr ""
-
-#: src/nano.c:918
-#, fuzzy
+#: src/nano.c:947
 msgid "View mode (read-only)"
-msgstr "觀看 (唯讀) 模�"
+msgstr "觀看模� (唯讀)"
 
-#: src/nano.c:920
-msgid "Don't wrap long lines"
+#: src/nano.c:949
+#, fuzzy
+msgid "Don't hard-wrap long lines"
 msgstr "��自動�列"
 
-#: src/nano.c:922
-#, fuzzy
+#: src/nano.c:951
 msgid "Don't show the two help lines"
-msgstr "��顯示輔助�"
+msgstr "��顯示兩說明列"
 
-#: src/nano.c:923
-#, fuzzy
+#: src/nano.c:952
 msgid "Enable suspension"
-msgstr "開啟暫�功能"
+msgstr "開啟懸置功能"
 
-#: src/nano.c:924
-#, fuzzy
+#: src/nano.c:954
 msgid "Enable soft line wrapping"
-msgstr "長列轉�"
-
-#: src/nano.c:928
-msgid "(ignored, for Pico compatibility)"
-msgstr "(忽略，為了與 Pico 相容)"
+msgstr "開啟長列�列"
 
-#: src/nano.c:938
-#, c-format
-msgid " GNU nano version %s (compiled %s, %s)\n"
+#: src/nano.c:963
+#, fuzzy, c-format
+msgid " GNU nano, version %s\n"
 msgstr " GNU nano 版本 %s (編譯於 %s, %s)\n"
 
-#: src/nano.c:943
+#: src/nano.c:966
 #, c-format
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org/"
 msgstr " 電�郵件: nano@nano-editor.org\t\t網�: http://www.nano-editor.org/"
 
-#: src/nano.c:944
+#: src/nano.c:967
 #, c-format
 msgid ""
 "\n"
@@ -1598,158 +1645,180 @@ msgstr ""
 "\n"
 " 編譯�項:"
 
-#: src/nano.c:1022
+#: src/nano.c:1096
 msgid "Sorry, support for this function has been disabled"
 msgstr "抱歉，已經關閉此功能的支�"
 
-#: src/nano.c:1044
+#: src/nano.c:1125
+msgid "No file name"
+msgstr ""
+
+#: src/nano.c:1136
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr "儲存更動�的緩��嗎 (回答 \"No\" 會撤銷修改)？"
 
-#: src/nano.c:1088
+#: src/nano.c:1189
 msgid "Couldn't reopen stdin from keyboard, sorry\n"
-msgstr ""
+msgstr "無法�新開啟來自�盤的標準輸入，抱歉\n"
 
-#: src/nano.c:1114
+#: src/nano.c:1213
 #, c-format
 msgid "Reading from stdin, ^C to abort\n"
-msgstr ""
+msgstr "讀�自標準輸入，^C 以放棄\n"
 
-#: src/nano.c:1182
+#: src/nano.c:1279
 msgid "Received SIGHUP or SIGTERM\n"
 msgstr "接收到 SIGHUP 或 SIGTERM\n"
 
-#: src/nano.c:1204
-#, fuzzy, c-format
+#: src/nano.c:1301
+#, c-format
 msgid "Use \"fg\" to return to nano.\n"
-msgstr "利用 \"fg\" 來回到 nano"
+msgstr "利用 \"fg\" 來回到 nano。\n"
 
-#: src/nano.c:1386
+#: src/nano.c:1481
 msgid "enabled"
 msgstr "é–‹å•Ÿ"
 
-#: src/nano.c:1387
+#: src/nano.c:1481
 msgid "disabled"
 msgstr "關閉"
 
-#: src/nano.c:1548 src/winio.c:1256
-#, fuzzy
+#: src/nano.c:1635 src/winio.c:1283
 msgid "Unknown Command"
-msgstr "旗標 %s 無法辨識"
+msgstr "�明的命令"
 
-#: src/nano.c:1674
-#, fuzzy
+#: src/nano.c:1747
 msgid "XON ignored, mumble mumble"
 msgstr "忽略 XON，嗯嗯。"
 
-#: src/nano.c:1679
-#, fuzzy
+#: src/nano.c:1752
 msgid "XOFF ignored, mumble mumble"
 msgstr "忽略 XOFF，嗯嗯。"
 
-#: src/nano.c:2209 src/rcfile.c:1100
-#, fuzzy, c-format
+#: src/nano.c:2310 src/rcfile.c:1325
+#, c-format
 msgid "Requested tab size \"%s\" is invalid"
-msgstr "所�求的跳格寬度 %s 無效"
+msgstr "所�求的跳格寬度 \"%s\" 無效"
 
-#: src/nano.c:2268 src/rcfile.c:1025
-#, fuzzy, c-format
+#: src/nano.c:2374 src/rcfile.c:1250
+#, c-format
 msgid "Requested fill size \"%s\" is invalid"
-msgstr "所�求的填滿行數 %s 無效"
+msgstr "所�求的填滿行數 \"%s\" 無效"
+
+#: src/nano.c:2415
+#, c-format
+msgid "Type '%s -h' for a list of available options.\n"
+msgstr ""
 
 #. TRANSLATORS: For the next three strings, if possible, specify
 #. * the single-byte shortcuts for both your language and English.
 #. * For example, in French: "OoYy" for "Oui".
-#: src/prompt.c:1259
+#: src/prompt.c:1055
 msgid "Yy"
 msgstr "Yy"
 
-#: src/prompt.c:1260
+#: src/prompt.c:1056
 msgid "Nn"
 msgstr "Nn"
 
-#: src/prompt.c:1261
+#: src/prompt.c:1057
 msgid "Aa"
 msgstr "Aa"
 
-#: src/prompt.c:1275
+#: src/prompt.c:1071
 msgid "Yes"
 msgstr "是"
 
-#: src/prompt.c:1280
+#: src/prompt.c:1076
 msgid "All"
 msgstr "全部"
 
-#: src/prompt.c:1285
+#: src/prompt.c:1081
 msgid "No"
 msgstr "�"
 
-#: src/rcfile.c:130
+#: src/rcfile.c:137
 #, c-format
 msgid "Error in %s on line %lu: "
 msgstr "在 %s (�於第 %lu 列) 中發生錯誤: "
 
-#: src/rcfile.c:185
-#, fuzzy, c-format
+#: src/rcfile.c:196
+#, c-format
 msgid "Argument '%s' has an unterminated \""
-msgstr "引數 %s 有未�閉的 \""
+msgstr "引數 '%s' 有未�閉的 \""
 
-#: src/rcfile.c:212 src/rcfile.c:264 src/rcfile.c:711 src/rcfile.c:768
-#: src/rcfile.c:821
+#: src/rcfile.c:223 src/rcfile.c:275 src/rcfile.c:730 src/rcfile.c:791
+#: src/rcfile.c:880 src/rcfile.c:932
 msgid "Regex strings must begin and end with a \" character"
 msgstr "正�表示�字串必須以 \" 字元開始���"
 
-#: src/rcfile.c:238 src/search.c:62
+#: src/rcfile.c:249 src/search.c:62
 #, c-format
 msgid "Bad regex \"%s\": %s"
 msgstr "�良的正�表示� \"%s\": %s"
 
-#: src/rcfile.c:258
+#: src/rcfile.c:269
 msgid "Missing syntax name"
 msgstr "缺少語法�稱"
 
-#: src/rcfile.c:316
+#: src/rcfile.c:340
 msgid "The \"none\" syntax is reserved"
 msgstr "\"none\" 語法已被�留"
 
-#: src/rcfile.c:323
+#: src/rcfile.c:347
 msgid "The \"default\" syntax must take no extensions"
 msgstr "\"default\" 語法必須��任何副檔�"
 
-#: src/rcfile.c:386 src/rcfile.c:483
-#, fuzzy
+#: src/rcfile.c:433
 msgid "Missing key name"
 msgstr "缺少語法�稱"
 
-#: src/rcfile.c:398 src/rcfile.c:499
-msgid "keybindings must begin with \"^\", \"M\", or \"F\""
+#: src/rcfile.c:442 src/rcfile.c:453
+msgid "Key name is too short"
 msgstr ""
 
-#: src/rcfile.c:407
-msgid "Must specify function to bind key to"
-msgstr ""
+#: src/rcfile.c:463
+#, fuzzy
+msgid "Key name must begin with \"^\", \"M\", or \"F\""
+msgstr "按�繫�必須以 \"^\", \"M\", 或 \"F\" 開始"
 
-#: src/rcfile.c:418 src/rcfile.c:510
-msgid "Must specify menu to bind key to (or \"all\")"
-msgstr ""
+#: src/rcfile.c:472
+#, fuzzy
+msgid "Must specify a function to bind the key to"
+msgstr "必須指定按�所繫�的功能"
 
-#: src/rcfile.c:426
-#, c-format
-msgid "Could not map name \"%s\" to a function"
+#. TRANSLATORS: Do not translate the word "all".
+#: src/rcfile.c:482
+msgid "Must specify a menu (or \"all\") in which to bind/unbind the key"
 msgstr ""
 
-#: src/rcfile.c:432 src/rcfile.c:517
-#, c-format
-msgid "Could not map name \"%s\" to a menu"
-msgstr ""
+#: src/rcfile.c:489
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a function"
+msgstr "無法映射�稱「%s�到�一功能"
+
+#: src/rcfile.c:496
+#, fuzzy, c-format
+msgid "Cannot map name \"%s\" to a menu"
+msgstr "無法映射�稱「%s�到�一�單"
 
-#: src/rcfile.c:454
+#: src/rcfile.c:528
 #, c-format
-msgid "Sorry, keystr \"%s\" is an illegal binding"
+msgid "Function '%s' does not exist in menu '%s'"
 msgstr ""
 
-#: src/rcfile.c:625
+#: src/rcfile.c:543
+#, fuzzy, c-format
+msgid "Sorry, keystroke \"%s\" may not be rebound"
+msgstr "抱歉，按�字串「%s�是��法的繫�"
+
+#: src/rcfile.c:629
 #, fuzzy, c-format
+msgid "Error expanding %s: %s"
+msgstr "讀� %s 時發生錯誤: %s"
+
+#: src/rcfile.c:672
+#, c-format
 msgid ""
 "Color \"%s\" not understood.\n"
 "Valid colors are \"green\", \"red\", \"blue\",\n"
@@ -1757,141 +1826,197 @@ msgid ""
 "\"black\", with the optional prefix \"bright\"\n"
 "for foreground colors."
 msgstr ""
-"�色 %s 無法辨識。\n"
+"�色 \"%s\" 無法辨識。\n"
 "有效的�色是 \"green\"(綠)�\"red\"(紅)�\"blue\"(�)�\n"
 "\"white\"(白)�\"yellow\"(黃)�\"cyan\"(�)�\"magenta\"(瑰) 和 \n"
-"\"black\"(黑)，�擇性的�置字 \"bright\"(明亮) \n"
+"\"black\"(黑)，加上�擇性的�置字 \"bright\"(明亮) \n"
 "�用於�景色。"
 
-#: src/rcfile.c:647
-#, fuzzy
+#: src/rcfile.c:694
 msgid "Cannot add a color command without a syntax command"
-msgstr "無法直接增加�色而沒有語法列"
+msgstr "無法增加�色命令而沒有語法命令"
 
-#: src/rcfile.c:652
+#: src/rcfile.c:699
 msgid "Missing color name"
 msgstr "缺少�色�稱"
 
-#: src/rcfile.c:672
-#, fuzzy, c-format
-msgid "Background color \"%s\" cannot be bright"
-msgstr "背景色 %s ��為明亮"
-
-#: src/rcfile.c:690 src/rcfile.c:809
+#: src/rcfile.c:709 src/rcfile.c:870
 msgid "Missing regex string"
 msgstr "缺少正�表示�字串"
 
-#: src/rcfile.c:762
+#: src/rcfile.c:785
 msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" �求�應的 \"end=\""
 
-#: src/rcfile.c:804
-#, fuzzy
+#: src/rcfile.c:837
+#, c-format
+msgid "Background color \"%s\" cannot be bright"
+msgstr "背景色 \"%s\" ��為明亮"
+
+#: src/rcfile.c:865
 msgid "Cannot add a header regex without a syntax command"
-msgstr "無法直接增加�色而沒有語法列"
+msgstr "無法增加標頭正�表示�而沒有語法命令"
 
-#: src/rcfile.c:874
-#, c-format
-msgid "Fatal error: no keys mapped for function \"%s\""
+#: src/rcfile.c:921
+msgid "Cannot add a magic string regex without a syntax command"
+msgstr "無法增加魔法正�表示�而沒有語法命令"
+
+#: src/rcfile.c:926
+msgid "Missing magic string name"
+msgstr "缺少魔法字串�稱"
+
+#: src/rcfile.c:985
+#, fuzzy
+msgid "Cannot add a linter without a syntax command"
+msgstr "無法增加標頭正�表示�而沒有語法命令"
+
+#: src/rcfile.c:990
+#, fuzzy
+msgid "Missing linter command"
+msgstr "缺少�色�稱"
+
+#: src/rcfile.c:1010
+#, fuzzy
+msgid "Cannot add formatter without a syntax command"
+msgstr "無法增加�色命令而沒有語法命令"
+
+#: src/rcfile.c:1015
+msgid "Missing formatter command"
 msgstr ""
 
-#: src/rcfile.c:876
+#: src/rcfile.c:1045
+#, fuzzy, c-format
+msgid "Fatal error: no keys mapped for function \"%s\".  Exiting.\n"
+msgstr "嚴�錯誤：沒有按�映射至功能「%s�"
+
+#: src/rcfile.c:1047
+#, fuzzy, c-format
 msgid ""
-"Exiting.  Please use nano with the -I option if needed to adjust your nanorc "
-"settings\n"
-msgstr ""
+"If needed, use nano with the -I option to adjust your nanorc settings.\n"
+msgstr "離開中。 如果需�調整您的 nanorc 設定值，請使用 nano 與 -I �項\n"
 
-#: src/rcfile.c:926 src/rcfile.c:935 src/rcfile.c:945
+#: src/rcfile.c:1108
+#, fuzzy, c-format
+msgid "Could not find syntax \"%s\" to extend"
+msgstr "無法映射�稱「%s�到�一�單"
+
+#: src/rcfile.c:1124 src/rcfile.c:1133 src/rcfile.c:1143
 #, c-format
 msgid "Command \"%s\" not allowed in included file"
-msgstr ""
+msgstr "命令「%s�在包�的檔案中��許"
 
-#: src/rcfile.c:951 src/rcfile.c:1128
+#: src/rcfile.c:1149 src/rcfile.c:1350
 #, c-format
 msgid "Syntax \"%s\" has no color commands"
-msgstr ""
+msgstr "語法「%s�沒有任何�色命令"
 
-#: src/rcfile.c:966
-#, fuzzy, c-format
+#: src/rcfile.c:1171
+#, c-format
 msgid "Command \"%s\" not understood"
-msgstr "無法辨識 %s 命令"
+msgstr "無法辨識 \"%s\" 命令"
 
-#: src/rcfile.c:972
-msgid "Missing flag"
-msgstr "缺少旗標"
+#: src/rcfile.c:1186
+#, fuzzy
+msgid "Missing option"
+msgstr "缺少�色�稱"
 
-#: src/rcfile.c:994
-#, fuzzy, c-format
+#: src/rcfile.c:1208
+#, c-format
 msgid "Option \"%s\" requires an argument"
-msgstr "�項 %s �求引數"
+msgstr "�項 \"%s\" �求引數"
 
-#: src/rcfile.c:1012
+#: src/rcfile.c:1226
 msgid "Option is not a valid multibyte string"
 msgstr "�項並�正確的多�元字串"
 
-#: src/rcfile.c:1038 src/rcfile.c:1066 src/rcfile.c:1075
+#: src/rcfile.c:1263 src/rcfile.c:1291 src/rcfile.c:1300
 msgid "Non-blank characters required"
 msgstr "需��空格字元"
 
-#: src/rcfile.c:1048
+#: src/rcfile.c:1273
 msgid "Two single-column characters required"
 msgstr "需�兩個單行字元"
 
-#: src/rcfile.c:1114
+#: src/rcfile.c:1339
 #, fuzzy, c-format
-msgid "Cannot unset flag \"%s\""
-msgstr "無法解除旗標 %s 設定"
+msgid "Cannot unset option \"%s\""
+msgstr "無法解除旗標 \"%s\" 設定"
 
-#: src/rcfile.c:1123
+#: src/rcfile.c:1345
 #, fuzzy, c-format
-msgid "Unknown flag \"%s\""
-msgstr "旗標 %s 無法辨識"
+msgid "Unknown option \"%s\""
+msgstr "旗標 \"%s\" 無法辨識"
 
-#: src/rcfile.c:1182
+#: src/rcfile.c:1404
 msgid "I can't find my home directory!  Wah!"
 msgstr "我找�到我的家目錄�哇�"
 
+#: src/rcfile.c:1442
+#, c-format
+msgid ""
+"\n"
+"Press Enter to continue starting nano.\n"
+msgstr ""
+"\n"
+"按下輸入�以繼續啟動 nano。\n"
+
 #: src/search.c:96
 #, c-format
 msgid "\"%.*s%s\" not found"
 msgstr "找�到 \"%.*s%s\""
 
-#: src/search.c:205
+#. TRANSLATORS: The next three strings are modifiers of the search prompt.
+#: src/search.c:184
+msgid " [Case Sensitive]"
+msgstr " [符�大�寫]"
+
+#: src/search.c:188
+msgid " [Regexp]"
+msgstr " [正�表示�]"
+
+#: src/search.c:192
+msgid " [Backwards]"
+msgstr " [�後�尋]"
+
+#. TRANSLATORS: The next two strings are modifiers of the search prompt.
+#: src/search.c:197
 msgid " (to replace) in selection"
 msgstr " 在標記中(置�)"
 
-#: src/search.c:207
+#: src/search.c:199
 msgid " (to replace)"
 msgstr " (置�)"
 
-#: src/search.c:784
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:769
 msgid "Replace this instance?"
 msgstr "置�這個？"
 
-#: src/search.c:962
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:945
 msgid "Replace with"
 msgstr "以此置�"
 
-#: src/search.c:1004
+#: src/search.c:986
 #, c-format
 msgid "Replaced %lu occurrence"
 msgid_plural "Replaced %lu occurrences"
 msgstr[0] "已置� %lu 處"
 
-#: src/search.c:1034
+#. TRANSLATORS: This is a prompt.
+#: src/search.c:1027
 msgid "Enter line number, column number"
 msgstr "輸入列號，行號"
 
-#: src/search.c:1061
-#, fuzzy
+#: src/search.c:1054
 msgid "Invalid line or column number"
-msgstr "輸入列號，行號"
+msgstr "無效的列號或行號"
 
-#: src/search.c:1214
+#: src/search.c:1207
 msgid "Not a bracket"
 msgstr "並�一個括號"
 
-#: src/search.c:1281
+#: src/search.c:1274
 msgid "No matching bracket"
 msgstr "無�應括號"
 
@@ -1900,279 +2025,316 @@ msgid "Mark Set"
 msgstr "標記設定"
 
 #: src/text.c:58
-#, fuzzy
 msgid "Mark Unset"
 msgstr "標記解除"
 
-#: src/text.c:443
+#: src/text.c:439
 msgid "Nothing in undo buffer!"
-msgstr ""
+msgstr "復原緩��中沒有任何�西�"
 
-#: src/text.c:455 src/text.c:593
-#, c-format
-msgid "Internal error: can't match line %d.  Please save your work"
-msgstr ""
+#: src/text.c:445 src/text.c:590
+#, fuzzy, c-format
+msgid "Internal error: can't match line %d.  Please save your work."
+msgstr "內部錯誤：無法匹�第 %d 列。 請儲存您的工作"
 
-#: src/text.c:466 src/text.c:603
+#: src/text.c:456 src/text.c:487 src/text.c:600 src/text.c:637
 msgid "text add"
-msgstr ""
+msgstr "文字加入"
 
-#: src/text.c:475 src/text.c:613
-#, fuzzy
+#: src/text.c:467 src/text.c:612
 msgid "text delete"
-msgstr "下個檔案"
+msgstr "文字刪除"
 
-#: src/text.c:489 src/text.c:628
-#, fuzzy
-msgid "line wrap"
-msgstr "長列轉�"
-
-#: src/text.c:503 src/text.c:636
+#: src/text.c:491 src/text.c:641
 msgid "line join"
-msgstr ""
+msgstr "列��"
 
-#: src/text.c:514 src/text.c:651
+#: src/text.c:505 src/text.c:657
 msgid "text cut"
-msgstr ""
+msgstr "文字剪下"
 
-#: src/text.c:518 src/text.c:655
+#: src/text.c:510 src/text.c:661
 msgid "text uncut"
-msgstr ""
+msgstr "文字�消剪下"
 
-#: src/text.c:522 src/text.c:622
+#: src/text.c:515 src/text.c:623
 msgid "line break"
-msgstr ""
+msgstr "分列符號"
 
-#: src/text.c:532 src/text.c:665
-#, fuzzy
+#: src/text.c:528 src/text.c:672
 msgid "text insert"
-msgstr "下列"
+msgstr "文字�入"
 
-#: src/text.c:550 src/text.c:659
-#, fuzzy
+#: src/text.c:549 src/text.c:665
 msgid "text replace"
-msgstr " (置�)"
+msgstr "文字置�"
 
-#: src/text.c:557 src/text.c:671
-msgid "Internal error: unknown type.  Please save your work"
-msgstr ""
+#: src/text.c:556 src/text.c:679 src/text.c:983
+msgid "Internal error: unknown type.  Please save your work."
+msgstr "內部錯誤：�明型態。 請儲存您的工作。"
 
-#: src/text.c:563
+#: src/text.c:561
 #, c-format
 msgid "Undid action (%s)"
-msgstr ""
+msgstr "已復原動作 (%s)"
 
-#: src/text.c:578
+#: src/text.c:580
 msgid "Nothing to re-do!"
-msgstr ""
+msgstr "沒有任何�西����"
 
-#: src/text.c:582
-msgid "Internal error: Redo setup failed.  Please save your work"
-msgstr ""
+#: src/text.c:584
+#, fuzzy
+msgid "Internal error: cannot set up redo.  Please save your work."
+msgstr "內部錯誤：無法設定�消剪下。 請儲存您的工作。"
 
-#: src/text.c:676
+#: src/text.c:684
 #, c-format
 msgid "Redid action (%s)"
-msgstr ""
+msgstr "已��動作 (%s)"
 
-#: src/text.c:766
-msgid "Could not pipe"
-msgstr "管線功能無效"
+#: src/text.c:785 src/text.c:2490 src/text.c:2963
+msgid "Could not create pipe"
+msgstr "無法建立管線功能"
 
-#: src/text.c:793 src/text.c:2636 src/text.c:2788
+#: src/text.c:811 src/text.c:2578 src/text.c:2732 src/text.c:3014
+#: src/text.c:3311
 msgid "Could not fork"
 msgstr "執行功能無效"
 
-#: src/text.c:941
-msgid "Internal error: can't setup uncut.  Please save your work."
-msgstr ""
-
-#: src/text.c:950
-msgid "Internal error: unknown type.  Please save your work."
-msgstr ""
+#: src/text.c:969
+#, fuzzy
+msgid "Internal error: cannot set up uncut.  Please save your work."
+msgstr "內部錯誤：無法設定�消剪下。 請儲存您的工作。"
 
-#: src/text.c:1870
+#: src/text.c:1806
 #, c-format
 msgid "Bad quote string %s: %s"
 msgstr "�良引用字串 %s: %s"
 
-#: src/text.c:2267
+#: src/text.c:2207
 msgid "Can now UnJustify!"
 msgstr "�在�以還原�齊�"
 
-#: src/text.c:2462
+#: src/text.c:2404
 msgid "Edit a replacement"
 msgstr "編輯替代文字"
 
-#: src/text.c:2548
-msgid "Could not create pipe"
-msgstr "無法建立管線功能"
-
-#: src/text.c:2550
+#: src/text.c:2492
 msgid "Creating misspelled word list, please wait..."
-msgstr "正在建立錯字列表，請�待..."
+msgstr "正在建立錯字列表，請�待…"
 
-#: src/text.c:2642
+#: src/text.c:2584 src/text.c:3022
 msgid "Could not get size of pipe buffer"
 msgstr "無法得知管線緩��大�"
 
-#: src/text.c:2693
+#: src/text.c:2635
 msgid "Error invoking \"spell\""
 msgstr "呼� \"spell\" 錯誤"
 
-#: src/text.c:2696
+#: src/text.c:2638
 msgid "Error invoking \"sort -f\""
 msgstr "呼� \"sort -f\" 錯誤"
 
-#: src/text.c:2699
+#: src/text.c:2641
 msgid "Error invoking \"uniq\""
 msgstr "呼� \"uniq\" 錯誤"
 
-#: src/text.c:2756 src/text.c:2965
+#: src/text.c:2696 src/text.c:2907
 msgid "Finished checking spelling"
 msgstr "拼字檢查��"
 
-#: src/text.c:2815
+#: src/text.c:2759 src/text.c:3340
 #, c-format
 msgid "Error invoking \"%s\""
 msgstr "呼� \"%s\" 錯誤"
 
-#: src/text.c:2960
+#: src/text.c:2885
+#, fuzzy
+msgid "Invoking spell checker, please wait"
+msgstr "嘗試呼�拼字檢查"
+
+#: src/text.c:2902
 #, c-format
 msgid "Spell checking failed: %s"
 msgstr "拼字檢查失敗: %s"
 
-#: src/text.c:2962
+#: src/text.c:2904
 #, c-format
 msgid "Spell checking failed: %s: %s"
 msgstr "拼字檢查失敗: %s: %s"
 
-#: src/text.c:3030
+#: src/text.c:2937
+#, fuzzy
+msgid "No linter defined for this type of file!"
+msgstr "��將�列加到檔案末端"
+
+#: src/text.c:2947
+msgid "Save modified buffer before linting?"
+msgstr ""
+
+#: src/text.c:2969
+msgid "Invoking linter, please wait"
+msgstr ""
+
+#: src/text.c:3125
+#, c-format
+msgid "Got 0 parsable lines from command: %s"
+msgstr ""
+
+#: src/text.c:3159
+#, c-format
+msgid "This message is for unopened file %s, open it in a new buffer?"
+msgstr ""
+
+#: src/text.c:3205
+#, fuzzy
+msgid "At last message"
+msgstr "顯示此訊�"
+
+#: src/text.c:3210
+#, fuzzy
+msgid "At first message"
+msgstr "顯示此訊�"
+
+#: src/text.c:3250
+msgid "Error: no formatter defined"
+msgstr ""
+
+#: src/text.c:3275
+msgid "Finished"
+msgstr ""
+
+#: src/text.c:3280
+msgid "Invoking formatter, please wait"
+msgstr ""
+
+#: src/text.c:3360
+msgid "Finished formatting"
+msgstr ""
+
+#: src/text.c:3438
 #, c-format
 msgid "%sWords: %lu  Lines: %ld  Chars: %lu"
 msgstr "%s字數: %lu  列數: %ld  字元數: %lu"
 
-#: src/text.c:3031
+#: src/text.c:3439
 msgid "In Selection:  "
-msgstr "於�擇部份: "
+msgstr "於�擇部分: "
 
-#: src/utils.c:405 src/utils.c:417
+#. TRANSLATORS: This is displayed when the next keystroke will be
+#. * inserted verbatim.
+#: src/text.c:3453
+msgid "Verbatim Input"
+msgstr "原形輸入"
+
+#: src/utils.c:410 src/utils.c:422
 msgid "nano is out of memory!"
 msgstr "nano 已耗盡記憶體�"
 
 #. TRANSLATORS: This is displayed during the input of a
 #. * six-digit hexadecimal Unicode character code.
-#: src/winio.c:1557
+#: src/winio.c:1583
 msgid "Unicode Input"
-msgstr ""
+msgstr "�國碼輸入"
 
-#: src/winio.c:2149 src/winio.c:2153
+#: src/winio.c:2142 src/winio.c:2146
 msgid "Modified"
 msgstr "已更動"
 
-#: src/winio.c:2150
+#: src/winio.c:2143
 msgid "View"
 msgstr "觀看"
 
-#: src/winio.c:2164
+#: src/winio.c:2157
 msgid "DIR:"
 msgstr "目錄:"
 
-#: src/winio.c:2171
+#: src/winio.c:2164
 msgid "File:"
 msgstr "檔案:"
 
-#: src/winio.c:3360
+#. TRANSLATORS: Try to keep this at most 76 characters.
+#: src/winio.c:2261
+msgid ""
+"Warning: Modifying a file which is not locked, check directory permission?"
+msgstr "警告：正在變更一個未鎖定的檔案，�檢查一下目錄權�嗎？"
+
+#: src/winio.c:3377
 #, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%lu (%d%%)"
 msgstr "列 %ld/%ld (%d%%), 行 %lu/%lu (%d%%), 字元 %lu/%lu (%d%%)"
 
-#: src/winio.c:3492
+#: src/winio.c:3507
 msgid "The nano text editor"
 msgstr "nano 文字編輯器"
 
-#: src/winio.c:3493
+#: src/winio.c:3508
 msgid "version"
 msgstr "版本"
 
-#: src/winio.c:3494
+#: src/winio.c:3509
 msgid "Brought to you by:"
 msgstr "來自於:"
 
-#: src/winio.c:3495
+#: src/winio.c:3510
 msgid "Special thanks to:"
 msgstr "特別感�:"
 
-#: src/winio.c:3496
+#: src/winio.c:3511
 msgid "The Free Software Foundation"
 msgstr "自由軟體基金會"
 
-#: src/winio.c:3497
+#: src/winio.c:3512
+msgid "the many translators and the TP"
+msgstr ""
+
+#: src/winio.c:3513
 msgid "For ncurses:"
-msgstr "ncurses 部份:"
+msgstr "ncurses 部分:"
 
-#: src/winio.c:3498
+#: src/winio.c:3514
 msgid "and anyone else we forgot..."
-msgstr "以�其他我們�記得的人..."
+msgstr "以�其他我們�記得的人…"
 
-#: src/winio.c:3499
+#: src/winio.c:3515
 msgid "Thank you for using nano!"
 msgstr "��您使用 nano﹗"
 
-#~ msgid "Prepending to %s failed: %s"
-#~ msgstr "�引於 %s 時失敗: %s"
-
-#~ msgid "Invoke the help menu"
-#~ msgstr "呼�輔助說明"
-
-#~ msgid "Search for text within the editor"
-#~ msgstr "�尋編輯器中文字"
-
-#~ msgid "Replace text within the editor"
-#~ msgstr "置�編輯器中文字"
-
-#~ msgid "Find matching bracket"
-#~ msgstr "尋找�應括號"
-
-#~ msgid "Make the current search/replace case (in)sensitive"
-#~ msgstr "使目��尋與置�(�)�分大�寫"
+#~ msgid "Insert File"
+#~ msgstr "�入檔案"
 
-#~ msgid "Make the current search/replace go backwards"
-#~ msgstr "使目��尋與置��後進行"
+#~ msgid "Go to previous screen"
+#~ msgstr "跳至�一畫�"
 
-#~ msgid "Prepend to the current file"
-#~ msgstr "�引於目�檔案"
+#~ msgid "Find Other Bracket"
+#~ msgstr "尋找其他括號"
 
-#~ msgid "Back up original file when saving"
-#~ msgstr "存檔時備份原始檔案"
+#~ msgid "Long line wrapping"
+#~ msgstr "長列轉�"
 
-#~ msgid "Insert into new buffer"
-#~ msgstr "�入新的緩��"
+#~ msgid "Soft line wrapping"
+#~ msgstr "長列�列"
 
-#~ msgid "Space"
-#~ msgstr "Space"
+#~ msgid "Allow generic undo [EXPERIMENTAL]"
+#~ msgstr "�許一般的復原 [實驗性質]"
 
-#~ msgid ""
-#~ "Usage: nano [+LINE,COLUMN] [GNU long option] [option] [file]\n"
-#~ "\n"
-#~ msgstr ""
-#~ "用法: nano [+列數,行數] [GNU 長�項] [�項] [檔案�稱]\n"
-#~ "\n"
+#~ msgid "(ignored, for Pico compatibility)"
+#~ msgstr "(忽略，為了與 Pico 相容)"
 
-#~ msgid "Use more space for editing"
-#~ msgstr "編輯時使用更多空間"
+#~ msgid "Must specify menu to bind key to (or \"all\")"
+#~ msgstr "必須指定按�所繫�的�單 (或是 \"all\")"
 
-#~ msgid "Set fill cols to (wrap lines at) #cols"
-#~ msgstr "設定行數填滿 (�列) 於 #行數"
+#~ msgid "Missing flag"
+#~ msgstr "缺少旗標"
 
-#~ msgid "Duplicate syntax name %s"
-#~ msgstr "�覆的語法�稱 %s"
+#~ msgid "line wrap"
+#~ msgstr "長列�列"
 
-#~ msgid "Come on, be reasonable"
-#~ msgstr "別這樣，�性一點"
+#~ msgid "Internal error: unknown type.  Please save your work"
+#~ msgstr "內部錯誤：�明型態。 請儲存您的工作"
 
-#~ msgid "Could not create temp file: %s"
-#~ msgstr "無法建立暫存檔案: %s"
+#~ msgid "Internal error: Redo setup failed.  Please save your work"
+#~ msgstr "內部錯誤：��設定失敗。 請儲存您的工作"
 
-#~ msgid "Refusing zero-length regex match"
-#~ msgstr "拒絕符�長度為零的正�表示�"
+#~ msgid "Could not pipe"
+#~ msgstr "管線功能無效"
diff --git a/src/Makefile.am b/src/Makefile.am
index f0b21c0..df65845 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,4 @@
-localedir = $(datadir)/locale
-INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
-
-ACLOCAL_AMFLAGS = -I m4
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
 
 bin_PROGRAMS = 	nano
 nano_SOURCES =	browser.c \
diff --git a/src/Makefile.in b/src/Makefile.in
index acb3389..1837b1b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,12 +78,13 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-target_triplet = @target@
 bin_PROGRAMS = nano$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
+	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
@@ -60,21 +105,64 @@ am_nano_OBJECTS = browser.$(OBJEXT) chars.$(OBJEXT) color.$(OBJEXT) \
 	utils.$(OBJEXT) winio.$(OBJEXT)
 nano_OBJECTS = $(am_nano_OBJECTS)
 nano_DEPENDENCIES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(nano_SOURCES)
 DIST_SOURCES = $(nano_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -120,6 +208,11 @@ MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
+NCURSESW_CFLAGS = @NCURSESW_CFLAGS@
+NCURSESW_CONFIG = @NCURSESW_CONFIG@
+NCURSESW_LIBS = @NCURSESW_LIBS@
+NCURSES_CFLAGS = @NCURSES_CFLAGS@
+NCURSES_LIBS = @NCURSES_LIBS@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -131,6 +224,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKGDATADIR = @PKGDATADIR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSUB = @POSUB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -160,6 +255,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+haveit = @haveit@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -171,7 +267,7 @@ infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
-localedir = $(datadir)/locale
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
@@ -184,16 +280,11 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-target = @target@
 target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-INCLUDES = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
-ACLOCAL_AMFLAGS = -I m4
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
 nano_SOURCES = browser.c \
 		chars.c \
 		color.c \
@@ -249,14 +340,18 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -277,16 +372,18 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-nano$(EXEEXT): $(nano_OBJECTS) $(nano_DEPENDENCIES) 
+
+nano$(EXEEXT): $(nano_OBJECTS) $(nano_DEPENDENCIES) $(EXTRA_nano_DEPENDENCIES) 
 	@rm -f nano$(EXEEXT)
-	$(LINK) $(nano_OBJECTS) $(nano_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(nano_OBJECTS) $(nano_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -311,39 +408,28 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/winio.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -355,15 +441,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -372,6 +454,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -423,10 +520,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -511,19 +613,19 @@ uninstall-am: uninstall-binPROGRAMS
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 .MAKE: install-am install-exec-am install-strip uninstall-am
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic ctags distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-exec-hook install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-hook
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-binPROGRAMS install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-exec-hook install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-binPROGRAMS uninstall-hook
 
 
 install-exec-hook:
diff --git a/src/browser.c b/src/browser.c
index c43796b..1accb98 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -1,9 +1,9 @@
-/* $Id: browser.c 4461 2009-12-09 17:09:37Z astyanax $ */
+/* $Id: browser.c 5086 2014-07-31 20:49:32Z bens $ */
 /**************************************************************************
  *   browser.c                                                            *
  *                                                                        *
- *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009   *
- *   Free Software Foundation, Inc.                                       *
+ *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,  *
+ *   2010, 2011, 2013, 2014 Free Software Foundation, Inc.                *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -50,9 +50,7 @@ char *do_browser(char *path, DIR *dir)
 {
     char *retval = NULL;
     int kbinput;
-    bool meta_key, func_key, old_const_update = ISSET(CONST_UPDATE);
-    bool abort = FALSE;
-	/* Whether we should abort the file browser. */
+    bool old_const_update = ISSET(CONST_UPDATE);
     char *prev_dir = NULL;
 	/* The directory we were in, if any, before backing up via
 	 * browsing to "..". */
@@ -60,14 +58,12 @@ char *do_browser(char *path, DIR *dir)
 	/* The last answer the user typed at the statusbar prompt. */
     size_t old_selected;
 	/* The selected file we had before the current selected file. */
-    const sc *s;
-    const subnfunc *f;
+    functionptrtype func;
+	/* The function of the key the user typed in. */
 
     curs_set(0);
     blank_statusbar();
-#if !defined(DISABLE_HELP) || !defined(DISABLE_MOUSE)
     currmenu = MBROWSER;
-#endif
     bottombars(MBROWSER);
     wnoutrefresh(bottomwin);
 
@@ -108,7 +104,7 @@ char *do_browser(char *path, DIR *dir)
 
     titlebar(path);
 
-    while (!abort) {
+    while (TRUE) {
 	struct stat st;
 	int i;
 	size_t fileline = selected / width;
@@ -124,239 +120,220 @@ char *do_browser(char *path, DIR *dir)
 
 	old_selected = selected;
 
-	kbinput = get_kbinput(edit, &meta_key, &func_key);
+	kbinput = get_kbinput(edit);
 
 #ifndef DISABLE_MOUSE
-        if (kbinput == KEY_MOUSE) {
-
-		    int mouse_x, mouse_y;
-
-		    /* We can click on the edit window to select a
-		     * filename. */
-		    if (get_mouseinput(&mouse_x, &mouse_y, TRUE) == 0 &&
-			wmouse_trafo(edit, &mouse_y, &mouse_x, FALSE)) {
-			/* longest is the width of each column.  There
-			 * are two spaces between each column. */
-			selected = (fileline / editwinrows) *
+	if (kbinput == KEY_MOUSE) {
+	    int mouse_x, mouse_y;
+
+	    /* We can click on the edit window to select a
+	     * filename. */
+	    if (get_mouseinput(&mouse_x, &mouse_y, TRUE) == 0 &&
+		wmouse_trafo(edit, &mouse_y, &mouse_x, FALSE)) {
+		/* longest is the width of each column.  There
+		 * are two spaces between each column. */
+		selected = (fileline / editwinrows) *
 				(editwinrows * width) + (mouse_y *
 				width) + (mouse_x / (longest + 2));
 
-			/* If they clicked beyond the end of a row,
-			 * select the filename at the end of that
-			 * row. */
-			if (mouse_x > width * (longest + 2))
-			    selected--;
-
-			/* If we're off the screen, select the last
-			 * filename. */
-			if (selected > filelist_len - 1)
-			    selected = filelist_len - 1;
-
-			/* If we selected the same filename as last
-			 * time, put back the Enter key so that it's
-			 * read in. */
-			if (old_selected == selected)
-			    unget_kbinput(sc_seq_or(DO_ENTER, 0), FALSE, FALSE);
-		    }
+		/* If they clicked beyond the end of a row,
+		 * select the filename at the end of that
+		 * row. */
+		if (mouse_x > width * (longest + 2))
+		    selected--;
+
+		/* If we're off the screen, select the last
+		 * filename. */
+		if (selected > filelist_len - 1)
+		    selected = filelist_len - 1;
+
+		/* If we selected the same filename as last
+		 * time, put back the Enter key so that it's
+		 * read in. */
+		if (old_selected == selected)
+		    unget_kbinput(sc_seq_or(do_enter_void, 0), FALSE, FALSE);
+	    }
 	}
 #endif /* !DISABLE_MOUSE */
 
-	parse_browser_input(&kbinput, &meta_key, &func_key);
-        s = get_shortcut(MBROWSER, &kbinput, &meta_key, &func_key);
-        if (!s)
-            continue;
-        f = sctofunc((sc *) s);
-        if (!f)
-            break;
-
-	if (f->scfunc == TOTAL_REFRESH) {
-		total_redraw();
-	} else if (f->scfunc == DO_HELP_VOID) {
+	func = parse_browser_input(&kbinput);
+
+	if (func == total_refresh) {
+	    total_redraw();
+	} else if (func == do_help_void) {
 #ifndef DISABLE_HELP
-	    do_browser_help();
+	    do_help_void();
 	    curs_set(0);
 #else
-		nano_disabled_msg();
+	    nano_disabled_msg();
 #endif
+	} else if (func == do_search) {
 	    /* Search for a filename. */
-	} else if (f->scfunc == DO_SEARCH) {
-		curs_set(1);
-		do_filesearch();
-		curs_set(0);
+	    curs_set(1);
+	    do_filesearch();
+	    curs_set(0);
+	} else if (func == do_research) {
 	    /* Search for another filename. */
-	} else if (f->scfunc == DO_RESEARCH) {
-		do_fileresearch();
-	} else if (f->scfunc == DO_PAGE_UP) {
-		if (selected >= (editwinrows + fileline % editwinrows) *
-			width)
-		    selected -= (editwinrows + fileline % editwinrows) *
-			width;
-		else
-		    selected = 0;
-	} else if (f->scfunc == DO_PAGE_DOWN) {
-		selected += (editwinrows - fileline % editwinrows) *
-			width;
-		if (selected > filelist_len - 1)
-		    selected = filelist_len - 1;
-	} else if (f->scfunc ==  FIRST_FILE_MSG) {
-		if (meta_key)
-		    selected = 0;
-	} else if (f->scfunc ==  LAST_FILE_MSG) {
-		if (meta_key)
-		    selected = filelist_len - 1;
+	    do_fileresearch();
+	} else if (func == do_page_up) {
+	    if (selected >= (editwinrows + fileline % editwinrows) * width)
+		selected -= (editwinrows + fileline % editwinrows) * width;
+	    else
+		selected = 0;
+	} else if (func == do_page_down) {
+	    selected += (editwinrows - fileline % editwinrows) * width;
+	    if (selected > filelist_len - 1)
+		selected = filelist_len - 1;
+	} else if (func == do_first_file) {
+	    selected = 0;
+	} else if (func == do_last_file) {
+	    selected = filelist_len - 1;
+	} else if (func == goto_dir_void) {
 	    /* Go to a specific directory. */
-	} else if (f->scfunc ==  GOTO_DIR_MSG) {
-		curs_set(1);
-
-		i = do_prompt(TRUE,
+	    curs_set(1);
+	    i = do_prompt(TRUE,
 #ifndef DISABLE_TABCOMP
 			FALSE,
 #endif
 			MGOTODIR, ans,
-			&meta_key, &func_key,
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
 			NULL,
 #endif
-			browser_refresh, N_("Go To Directory"));
+			/* TRANSLATORS: This is a prompt. */
+			browser_refresh, _("Go To Directory"));
 
-		curs_set(0);
-#if !defined(DISABLE_HELP) || !defined(DISABLE_MOUSE)
-		currmenu = MBROWSER;
-#endif
-		bottombars(MBROWSER);
-
-		/* If the directory begins with a newline (i.e. an
-		 * encoded null), treat it as though it's blank. */
-		if (i < 0 || *answer == '\n') {
-		    /* We canceled.  Indicate that on the statusbar, and
-		     * blank out ans, since we're done with it. */
-		    statusbar(_("Cancelled"));
-		    ans = mallocstrcpy(ans, "");
-		    continue;
-		} else if (i != 0) {
-		    /* Put back the "Go to Directory" key and save
-		     * answer in ans, so that the file list is displayed
-		     * again, the prompt is displayed again, and what we
-		     * typed before at the prompt is displayed again. */
-		    unget_kbinput(sc_seq_or(DO_GOTOLINECOLUMN_VOID, 0), FALSE, FALSE);
-		    ans = mallocstrcpy(ans, answer);
-		    continue;
-		}
-
-		/* We have a directory.  Blank out ans, since we're done
-		 * with it. */
+	    curs_set(0);
+	    currmenu = MBROWSER;
+	    bottombars(MBROWSER);
+
+	    /* If the directory begins with a newline (i.e. an
+	     * encoded null), treat it as though it's blank. */
+	    if (i < 0 || *answer == '\n') {
+		/* We canceled.  Indicate that on the statusbar, and
+		* blank out ans, since we're done with it. */
+		statusbar(_("Cancelled"));
 		ans = mallocstrcpy(ans, "");
+		continue;
+	    } else if (i != 0) {
+		/* Put back the "Go to Directory" key and save
+		 * answer in ans, so that the file list is displayed
+		 * again, the prompt is displayed again, and what we
+		 * typed before at the prompt is displayed again. */
+		unget_kbinput(sc_seq_or(do_gotolinecolumn_void, 0), FALSE, FALSE);
+		ans = mallocstrcpy(ans, answer);
+		continue;
+	    }
+
+	    /* We have a directory.  Blank out ans, since we're done
+	     * with it. */
+	    ans = mallocstrcpy(ans, "");
 
-		/* Convert newlines to nulls, just before we go to the
-		 * directory. */
-		sunder(answer);
-		align(&answer);
+	    /* Convert newlines to nulls, just before we go to the
+	     * directory. */
+	    sunder(answer);
+	    align(&answer);
 
-		new_path = real_dir_from_tilde(answer);
+	    new_path = real_dir_from_tilde(answer);
 
-		if (new_path[0] != '/') {
-		    new_path = charealloc(new_path, strlen(path) +
-			strlen(answer) + 1);
-		    sprintf(new_path, "%s%s", path, answer);
-		}
+	    if (new_path[0] != '/') {
+		new_path = charealloc(new_path, strlen(path) +
+				strlen(answer) + 1);
+		sprintf(new_path, "%s%s", path, answer);
+	    }
 
 #ifndef DISABLE_OPERATINGDIR
-		if (check_operating_dir(new_path, FALSE)) {
-		    statusbar(
-			_("Can't go outside of %s in restricted mode"),
-			operating_dir);
-		    free(new_path);
-		    continue;
-		}
+	    if (check_operating_dir(new_path, FALSE)) {
+		statusbar(_("Can't go outside of %s in restricted mode"),
+				operating_dir);
+		free(new_path);
+		continue;
+	    }
 #endif
 
-		dir = opendir(new_path);
-		if (dir == NULL) {
-		    /* We can't open this directory for some reason.
-		     * Complain. */
-		    statusbar(_("Error reading %s: %s"), answer,
-			strerror(errno));
-		    beep();
-		    free(new_path);
-		    continue;
-		}
-
-		/* Start over again with the new path value. */
-		free(path);
-		path = new_path;
-		goto change_browser_directory;
-	} else if (f->scfunc == DO_UP_VOID) {
-		if (selected >= width)
-		    selected -= width;
-	} else if (f->scfunc == DO_LEFT) {
-		if (selected > 0)
-		    selected--;
-	} else if (f->scfunc == DO_DOWN_VOID) {
-		if (selected + width <= filelist_len - 1)
-		    selected += width;
-	} else if (f->scfunc == DO_RIGHT) {
-		if (selected < filelist_len - 1)
-		    selected++;
-	} else if (f->scfunc == DO_ENTER) {
-		/* We can't move up from "/". */
-		if (strcmp(filelist[selected], "/..") == 0) {
-		    statusbar(_("Can't move up a directory"));
-		    beep();
-		    continue;
-		}
+	    dir = opendir(new_path);
+	    if (dir == NULL) {
+		/* We can't open this directory for some reason.
+		* Complain. */
+		statusbar(_("Error reading %s: %s"), answer,
+				strerror(errno));
+		beep();
+		free(new_path);
+		continue;
+	    }
+
+	    /* Start over again with the new path value. */
+	    free(path);
+	    path = new_path;
+	    goto change_browser_directory;
+	} else if (func == do_up_void) {
+	    if (selected >= width)
+		selected -= width;
+	} else if (func == do_down_void) {
+	    if (selected + width <= filelist_len - 1)
+		selected += width;
+	} else if (func == do_left) {
+	    if (selected > 0)
+		selected--;
+	} else if (func == do_right) {
+	    if (selected < filelist_len - 1)
+		selected++;
+	} else if (func == do_enter_void) {
+	    /* We can't move up from "/". */
+	    if (strcmp(filelist[selected], "/..") == 0) {
+		statusbar(_("Can't move up a directory"));
+		beep();
+		continue;
+	    }
 
 #ifndef DISABLE_OPERATINGDIR
-		/* Note: The selected file can be outside the operating
-		 * directory if it's ".." or if it's a symlink to a
-		 * directory outside the operating directory. */
-		if (check_operating_dir(filelist[selected], FALSE)) {
-		    statusbar(
-			_("Can't go outside of %s in restricted mode"),
-			operating_dir);
-		    beep();
-		    continue;
-		}
+	    /* Note: The selected file can be outside the operating
+	     * directory if it's ".." or if it's a symlink to a
+	     * directory outside the operating directory. */
+	    if (check_operating_dir(filelist[selected], FALSE)) {
+		statusbar(_("Can't go outside of %s in restricted mode"),
+				operating_dir);
+		beep();
+		continue;
+	    }
 #endif
 
-		if (stat(filelist[selected], &st) == -1) {
-		    /* We can't open this file for some reason.
-		     * Complain. */
-		    statusbar(_("Error reading %s: %s"),
-			filelist[selected], strerror(errno));
-		    beep();
-		    continue;
-		}
+	    if (stat(filelist[selected], &st) == -1) {
+		/* We can't open this file for some reason.
+		 * Complain. */
+		 statusbar(_("Error reading %s: %s"),
+				filelist[selected], strerror(errno));
+		 beep();
+		 continue;
+	    }
 
-		/* If we've successfully opened a file, we're done, so
+	    if (!S_ISDIR(st.st_mode)) {
+		/* We've successfully opened a file, we're done, so
 		 * get out. */
-		if (!S_ISDIR(st.st_mode)) {
-		    retval = mallocstrcpy(NULL, filelist[selected]);
-		    abort = TRUE;
-		    continue;
-		/* If we've successfully opened a directory, and it's
-		 * "..", save the current directory in prev_dir, so that
-		 * we can select it later. */
-		} else if (strcmp(tail(filelist[selected]), "..") == 0)
-		    prev_dir = mallocstrcpy(NULL,
-			striponedir(filelist[selected]));
-
-		dir = opendir(filelist[selected]);
-		if (dir == NULL) {
-		    /* We can't open this directory for some reason.
-		     * Complain. */
-		    statusbar(_("Error reading %s: %s"),
-			filelist[selected], strerror(errno));
-		    beep();
-		    continue;
-		}
-
-		path = mallocstrcpy(path, filelist[selected]);
-
-		/* Start over again with the new path value. */
-		goto change_browser_directory;
-	    /* Abort the file browser. */
-	} else if (f->scfunc == DO_EXIT) {
-		abort = TRUE;
+		retval = mallocstrcpy(NULL, filelist[selected]);
+		break;
+	    } else if (strcmp(tail(filelist[selected]), "..") == 0)
+		/* We've successfully opened the parent directory,
+		 * save the current directory in prev_dir, so that
+		 * we can easily return to it by hitting Enter. */
+		prev_dir = mallocstrcpy(NULL, striponedir(filelist[selected]));
+
+	    dir = opendir(filelist[selected]);
+	    if (dir == NULL) {
+		/* We can't open this directory for some reason.
+		 * Complain. */
+		statusbar(_("Error reading %s: %s"),
+				filelist[selected], strerror(errno));
+		beep();
+		continue;
+	    }
+
+	    path = mallocstrcpy(path, filelist[selected]);
+
+	    /* Start over again with the new path value. */
+	    goto change_browser_directory;
+	} else if (func == do_exit) {
+	    /* Exit from the file browser. */
+	    break;
 	}
     }
     titlebar(NULL);
@@ -460,7 +437,7 @@ void browser_init(const char *path, DIR *dir)
 
 	/* Don't show the "." entry. */
 	if (strcmp(nextdir->d_name, ".") == 0)
-	   continue;
+	    continue;
 
 	d_len = strlenpt(nextdir->d_name);
 	if (d_len > longest)
@@ -487,7 +464,7 @@ void browser_init(const char *path, DIR *dir)
     while ((nextdir = readdir(dir)) != NULL && i < filelist_len) {
 	/* Don't show the "." entry. */
 	if (strcmp(nextdir->d_name, ".") == 0)
-	   continue;
+	    continue;
 
 	filelist[i] = charalloc(path_len + strlen(nextdir->d_name) + 1);
 	sprintf(filelist[i], "%s%s", path, nextdir->d_name);
@@ -539,48 +516,33 @@ void browser_init(const char *path, DIR *dir)
 	width = longest;
 }
 
-/* Determine the shortcut key corresponding to the values of kbinput
- * (the key itself), meta_key (whether the key is a meta sequence), and
- * func_key (whether the key is a function key), if any.  In the
- * process, convert certain non-shortcut keys into their corresponding
- * shortcut keys. */
-void parse_browser_input(int *kbinput, bool *meta_key, bool *func_key)
+/* Return the function that is bound to the given key, accepting certain
+ * plain characters too, for compatibility with Pico. */
+functionptrtype parse_browser_input(int *kbinput)
 {
-    get_shortcut(MBROWSER, kbinput, meta_key, func_key);
-
-    /* Pico compatibility. */
-    if (!*meta_key) {
+    if (!meta_key) {
 	switch (*kbinput) {
 	    case ' ':
-		*kbinput = sc_seq_or(DO_PAGE_DOWN, 0);
-		break;
+		return do_page_down;
 	    case '-':
-		*kbinput = sc_seq_or(DO_PAGE_UP, 0);
-		break;
+		return do_page_up;
 	    case '?':
-#ifndef DISABLE_HELP
-		*kbinput = sc_seq_or(DO_HELP_VOID, 0);
-#endif
-		break;
-	    /* Cancel equivalent to Exit here. */
+		return do_help_void;
 	    case 'E':
 	    case 'e':
-		*kbinput = sc_seq_or(DO_EXIT, 0);
-		break;
+		return do_exit;
 	    case 'G':
 	    case 'g':
-		*kbinput = sc_seq_or(GOTO_DIR_MSG, 0);
-		break;
+		return goto_dir_void;
 	    case 'S':
 	    case 's':
-		*kbinput = sc_seq_or(DO_ENTER, 0);
-		break;
+		return do_enter_void;
 	    case 'W':
 	    case 'w':
-		*kbinput = sc_seq_or(DO_SEARCH, 0);
-		break;
+		return do_search;
 	}
     }
+    return func_from_key(kbinput);
 }
 
 /* Set width to the number of files that we can display per line, if
@@ -619,8 +581,7 @@ void browser_refresh(void)
 		/* The maximum length of the file information in
 		 * columns: seven for "--", "(dir)", or the file size,
 		 * and 12 for "(parent dir)". */
-	bool dots = (COLS >= 15 && filetaillen >= longest -
-		foomaxlen - 1);
+	bool dots = (COLS >= 15 && filetaillen >= longest - foomaxlen - 1);
 		/* Do we put an ellipsis before the filename?  Don't set
 		 * this to TRUE if we have fewer than 15 columns (i.e.
 		 * one column for padding, plus seven columns for a
@@ -635,7 +596,7 @@ void browser_refresh(void)
 	/* Start highlighting the currently selected file or
 	 * directory. */
 	if (i == selected)
-	    wattron(edit, reverse_attr);
+	    wattron(edit, hilite_attribute);
 
 	blank_line(edit, line, col, longest);
 
@@ -710,7 +671,7 @@ void browser_refresh(void)
 	/* Finish highlighting the currently selected file or
 	 * directory. */
 	if (i == selected)
-	    wattroff(edit, reverse_attr);
+	    wattroff(edit, hilite_attribute);
 
 	free(foo);
 
@@ -760,8 +721,6 @@ int filesearch_init(void)
 {
     int i = 0;
     char *buf;
-    bool meta_key, func_key;
-    const sc *s;
     static char *backupstring = NULL;
 	/* The search string we'll be using. */
 
@@ -794,29 +753,10 @@ int filesearch_init(void)
 	TRUE,
 #endif
 	MWHEREISFILE, backupstring,
-	&meta_key, &func_key, 
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
 	&search_history,
 #endif
-	browser_refresh, "%s%s%s%s%s%s", _("Search"),
-#ifndef NANO_TINY
-	/* This string is just a modifier for the search prompt; no
-	 * grammar is implied. */
-	ISSET(CASE_SENSITIVE) ? _(" [Case Sensitive]") :
-#endif
-	"",
-#ifdef HAVE_REGEX_H
-	/* This string is just a modifier for the search prompt; no
-	 * grammar is implied. */
-	ISSET(USE_REGEXP) ? _(" [Regexp]") :
-#endif
-	"",
-#ifndef NANO_TINY
-	/* This string is just a modifier for the search prompt; no
-	 * grammar is implied. */
-	ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") :
-#endif
-	"", "", buf);
+	browser_refresh, "%s%s", _("Search"), buf);
 
     /* Release buf now that we don't need it anymore. */
     free(buf);
@@ -829,36 +769,6 @@ int filesearch_init(void)
 	*answer == '\0')) {
 	statusbar(_("Cancelled"));
 	return -1;
-    } else {
-        s = get_shortcut(MBROWSER, &i, &meta_key, &func_key);
-	if (i == -2 || i == 0) {
-#ifdef HAVE_REGEX_H
-		/* Use last_search if answer is an empty string, or
-		 * answer if it isn't. */
-		if (ISSET(USE_REGEXP) && !regexp_init((i == -2) ?
-			last_search : answer))
-		    return -1;
-#endif
-	} else
-#ifndef NANO_TINY
-	if (s && s->scfunc == CASE_SENS_MSG) {
-		TOGGLE(CASE_SENSITIVE);
-		backupstring = mallocstrcpy(backupstring, answer);
-		return 1;
-	} else if (s && s->scfunc == BACKWARDS_MSG) {
-		TOGGLE(BACKWARDS_SEARCH);
-		backupstring = mallocstrcpy(backupstring, answer);
-		return 1;
-	} else
-#endif
-#ifdef HAVE_REGEX_H
-	if (s && s->scfunc ==  REGEXP_MSG) {
-		TOGGLE(USE_REGEXP);
-		backupstring = mallocstrcpy(backupstring, answer);
-		return 1;
-	} else
-#endif
-	    return -1;
     }
 
     return 0;
@@ -877,11 +787,6 @@ bool findnextfile(bool no_sameline, size_t begin, const char *needle)
 	/* The filename we display, minus the path. */
     const char *rev_start = filetail, *found = NULL;
 
-#ifndef NANO_TINY
-    if (ISSET(BACKWARDS_SEARCH))
-	rev_start += strlen(rev_start);
-#endif
-
     /* Look for needle in the current filename we're searching. */
     while (TRUE) {
 	found = strstrwrapper(filetail, needle, rev_start);
@@ -898,27 +803,14 @@ bool findnextfile(bool no_sameline, size_t begin, const char *needle)
 	    return FALSE;
 	}
 
-	/* Move to the previous or next filename in the list.  If we've
-	 * reached the start or end of the list, wrap around. */
-#ifndef NANO_TINY
-	if (ISSET(BACKWARDS_SEARCH)) {
-	    if (currselected > 0)
-		currselected--;
-	    else {
-		currselected = filelist_len - 1;
-		statusbar(_("Search Wrapped"));
-	    }
-	} else {
-#endif
-	    if (currselected < filelist_len - 1)
-		currselected++;
-	    else {
-		currselected = 0;
-		statusbar(_("Search Wrapped"));
-	    }
-#ifndef NANO_TINY
+	/* Move to the next filename in the list.  If we've reached the
+	 * end of the list, wrap around. */
+	if (currselected < filelist_len - 1)
+	    currselected++;
+	else {
+	    currselected = 0;
+	    statusbar(_("Search Wrapped"));
 	}
-#endif
 
 	/* We've reached the original starting file. */
 	if (currselected == begin)
@@ -927,10 +819,6 @@ bool findnextfile(bool no_sameline, size_t begin, const char *needle)
 	filetail = tail(filelist[currselected]);
 
 	rev_start = filetail;
-#ifndef NANO_TINY
-	if (ISSET(BACKWARDS_SEARCH))
-	    rev_start += strlen(rev_start);
-#endif
     }
 
     /* We've definitely found something. */
@@ -947,37 +835,28 @@ void findnextfile_wrap_reset(void)
 }
 
 /* Abort the current filename search.  Clean up by setting the current
- * shortcut list to the browser shortcut list, displaying it, and
- * decompiling the compiled regular expression we used in the last
- * search, if any. */
+ * shortcut list to the browser shortcut list, and displaying it. */
 void filesearch_abort(void)
 {
     currmenu = MBROWSER;
     bottombars(MBROWSER);
-#ifdef HAVE_REGEX_H
-    regexp_cleanup();
-#endif
 }
 
 /* Search for a filename. */
 void do_filesearch(void)
 {
     size_t begin = selected;
-    int i;
     bool didfind;
 
-    i = filesearch_init();
-    if (i == -1)	/* Cancel, blank search string, or regcomp()
-			 * failed. */
-	filesearch_abort();
-#if !defined(NANO_TINY) || defined(HAVE_REGEX_H)
-    else if (i == 1)	/* Case Sensitive, Backwards, or Regexp search
-			 * toggle. */
-	do_filesearch();
-#endif
+    UNSET(CASE_SENSITIVE);
+    UNSET(USE_REGEXP);
+    UNSET(BACKWARDS_SEARCH);
 
-    if (i != 0)
+    if (filesearch_init() != 0) {
+	/* Cancelled or a blank search string. */
+	filesearch_abort();
 	return;
+    }
 
     /* If answer is now "", copy last_search into answer. */
     if (*answer == '\0')
@@ -985,7 +864,7 @@ void do_filesearch(void)
     else
 	last_search = mallocstrcpy(last_search, answer);
 
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
     /* If answer is not "", add this search string to the search history
      * list. */
     if (answer[0] != '\0')
@@ -1018,12 +897,6 @@ void do_fileresearch(void)
     search_init_globals();
 
     if (last_search[0] != '\0') {
-#ifdef HAVE_REGEX_H
-	/* Since answer is "", use last_search! */
-	if (ISSET(USE_REGEXP) && !regexp_init(last_search))
-	    return;
-#endif
-
 	findnextfile_wrap_reset();
 	didfind = findnextfile(FALSE, begin, answer);
 
@@ -1070,7 +943,7 @@ char *striponedir(const char *path)
     tmp = strrchr(retval, '/');
 
     if (tmp != NULL)
- 	null_at(&retval, tmp - retval);
+	null_at(&retval, tmp - retval);
 
     return retval;
 }
diff --git a/src/chars.c b/src/chars.c
index 7d56117..088d612 100644
--- a/src/chars.c
+++ b/src/chars.c
@@ -1,9 +1,9 @@
-/* $Id: chars.c 4453 2009-12-02 03:36:22Z astyanax $ */
+/* $Id: chars.c 5147 2015-03-22 11:20:02Z bens $ */
 /**************************************************************************
  *   chars.c                                                              *
  *                                                                        *
- *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009   *
- *   Free Software Foundation, Inc.                                       *
+ *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,  *
+ *   2010, 2011, 2013, 2014 Free Software Foundation, Inc.                *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -54,7 +54,19 @@ bool using_utf8(void)
 {
     return use_utf8;
 }
-#endif
+#endif /* ENABLE_UTF8 */
+
+/* Concatenate two allocated strings. */
+char* addstrings(char* str1, size_t len1, char* str2, size_t len2)
+{
+    str1 = charealloc(str1, len1 + len2 + 1);
+    str1[len1] = '\0';
+    strncat(&str1[len1], str2, len2);
+    free(str2);
+
+    return str1;
+}
+
 
 #ifndef HAVE_ISBLANK
 /* This function is equivalent to isblank(). */
@@ -79,12 +91,12 @@ bool is_byte(int c)
     return ((unsigned int)c == (unsigned char)c);
 }
 
-static void mbtowc_reset(void)
+void mbtowc_reset(void)
 {
     IGNORE_CALL_RESULT(mbtowc(NULL, NULL, 0));
 }
 
-static void wctomb_reset(void)
+void wctomb_reset(void)
 {
     IGNORE_CALL_RESULT(wctomb(NULL, 0));
 }
@@ -184,9 +196,8 @@ bool is_punct_mbchar(const char *c)
 #ifdef ENABLE_UTF8
     if (use_utf8) {
 	wchar_t wc;
-	int c_mb_len = mbtowc(&wc, c, MB_CUR_MAX);
 
-	if (c_mb_len < 0) {
+	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
 	    mbtowc_reset();
 	    wc = bad_wchar;
 	}
@@ -473,22 +484,24 @@ int parse_mbchar(const char *buf, char *chr, size_t *col)
  * before the one at pos. */
 size_t move_mbleft(const char *buf, size_t pos)
 {
-    size_t pos_prev = pos;
+    size_t before, char_len = 0;
 
     assert(buf != NULL && pos <= strlen(buf));
 
     /* There is no library function to move backward one multibyte
-     * character.  Here is the naive, O(pos) way to do it. */
-    while (TRUE) {
-	int buf_mb_len = parse_mbchar(buf + pos - pos_prev, NULL, NULL);
-
-	if (pos_prev <= buf_mb_len)
-	    break;
+     * character.  So we just start groping for one at the farthest
+     * possible point. */
+    if (mb_cur_max() > pos)
+	before = 0;
+    else
+	before = pos - mb_cur_max();
 
-	pos_prev -= buf_mb_len;
+    while (before < pos) {
+	char_len = parse_mbchar(buf + before, NULL, NULL);
+	before += char_len;
     }
 
-    return pos - pos_prev;
+    return before - char_len;
 }
 
 /* Return the index in buf of the beginning of the multibyte character
@@ -630,7 +643,7 @@ char *mbstrcasestr(const char *haystack, const char *needle)
 	return NULL;
     } else
 #endif
-	return strcasestr(haystack, needle);
+	return (char *) strcasestr(haystack, needle);
 }
 
 #if !defined(NANO_TINY) || !defined(DISABLE_TABCOMP)
@@ -788,9 +801,8 @@ char *mbstrchr(const char *s, const char *c)
 	char *s_mb = charalloc(MB_CUR_MAX);
 	const char *q = s;
 	wchar_t ws, wc;
-	int c_mb_len = mbtowc(&wc, c, MB_CUR_MAX);
 
-	if (c_mb_len < 0) {
+	if (mbtowc(&wc, c, MB_CUR_MAX) < 0) {
 	    mbtowc_reset();
 	    wc = (unsigned char)*c;
 	    bad_c_mb = TRUE;
@@ -820,7 +832,7 @@ char *mbstrchr(const char *s, const char *c)
 	return (char *)q;
     } else
 #endif
-	return strchr(s, *c);
+	return (char *) strchr(s, *c);
 }
 #endif /* !NANO_TINY || !DISABLE_JUSTIFY */
 
@@ -840,7 +852,7 @@ char *mbstrpbrk(const char *s, const char *accept)
 	return NULL;
     } else
 #endif
-	return strpbrk(s, accept);
+	return (char *) strpbrk(s, accept);
 }
 
 /* This function is equivalent to strpbrk(), except in that it scans the
@@ -893,7 +905,7 @@ char *mbrevstrpbrk(const char *s, const char *accept, const char
 }
 #endif /* !NANO_TINY */
 
-#if defined(ENABLE_NANORC) && (!defined(NANO_TINY) || !defined(DISABLE_JUSTIFY))
+#if !defined(DISABLE_NANORC) && (!defined(NANO_TINY) || !defined(DISABLE_JUSTIFY))
 /* Return TRUE if the string s contains one or more blank characters,
  * and FALSE otherwise. */
 bool has_blank_chars(const char *s)
@@ -935,7 +947,7 @@ bool has_blank_mbchars(const char *s)
 #endif
 	return has_blank_chars(s);
 }
-#endif /* ENABLE_NANORC && (!NANO_TINY || !DISABLE_JUSTIFY) */
+#endif /* !DISABLE_NANORC && (!NANO_TINY || !DISABLE_JUSTIFY) */
 
 #ifdef ENABLE_UTF8
 /* Return TRUE if wc is valid Unicode, and FALSE otherwise. */
@@ -947,7 +959,7 @@ bool is_valid_unicode(wchar_t wc)
 }
 #endif
 
-#ifdef ENABLE_NANORC
+#ifndef DISABLE_NANORC
 /* Check if the string s is a valid multibyte string.  Return TRUE if it
  * is, and FALSE otherwise. */
 bool is_valid_mbstring(const char *s)
@@ -960,4 +972,4 @@ bool is_valid_mbstring(const char *s)
 #endif
 	TRUE;
 }
-#endif /* ENABLE_NANORC */
+#endif /* !DISABLE_NANORC */
diff --git a/src/color.c b/src/color.c
index 9d7ecff..13e2995 100644
--- a/src/color.c
+++ b/src/color.c
@@ -1,9 +1,9 @@
-/* $Id: color.c 4453 2009-12-02 03:36:22Z astyanax $ */
+/* $Id: color.c 5038 2014-06-30 17:49:53Z bens $ */
 /**************************************************************************
  *   color.c                                                              *
  *                                                                        *
- *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009   *
- *   Free Software Foundation, Inc.                                       *
+ *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,  *
+ *   2010, 2011, 2013, 2014 Free Software Foundation, Inc.                *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -25,18 +25,59 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
 
-#ifdef ENABLE_COLOR
+#ifdef HAVE_MAGIC_H
+#include <magic.h>
+#endif
+
+#ifndef DISABLE_COLOR
 
 /* For each syntax list entry, go through the list of colors and assign
  * the color pairs. */
 void set_colorpairs(void)
 {
     const syntaxtype *this_syntax = syntaxes;
+    bool defok = FALSE;
+    short fg, bg;
+    size_t i;
+
+    start_color();
+
+#ifdef HAVE_USE_DEFAULT_COLORS
+    /* Use the default colors, if available. */
+    defok = (use_default_colors() != ERR);
+#endif
+
+    for (i = 0; i < NUMBER_OF_ELEMENTS; i++) {
+	bool bright = FALSE;
+
+	if (parse_color_names(specified_color_combo[i], &fg, &bg, &bright)) {
+	    if (fg == -1 && !defok)
+		fg = COLOR_WHITE;
+	    if (bg == -1 && !defok)
+		bg = COLOR_BLACK;
+	    init_pair(i + 1, fg, bg);
+	    interface_color_pair[i].bright = bright;
+	    interface_color_pair[i].pairnum = COLOR_PAIR(i + 1);
+	}
+	else {
+	    interface_color_pair[i].bright = FALSE;
+	    if (i != FUNCTION_TAG)
+		interface_color_pair[i].pairnum = hilite_attribute;
+	    else
+		interface_color_pair[i].pairnum = A_NORMAL;
+	}
+
+	if (specified_color_combo[i] != NULL) {
+	    free(specified_color_combo[i]);
+	    specified_color_combo[i] = NULL;
+	}
+    }
 
     for (; this_syntax != NULL; this_syntax = this_syntax->next) {
 	colortype *this_color = this_syntax->color;
-	int color_pair = 1;
+	int clr_pair = NUMBER_OF_ELEMENTS + 1;
 
 	for (; this_color != NULL; this_color = this_color->next) {
 	    const colortype *beforenow = this_syntax->color;
@@ -51,8 +92,8 @@ void set_colorpairs(void)
 	    if (beforenow != this_color)
 		this_color->pairnum = beforenow->pairnum;
 	    else {
-		this_color->pairnum = color_pair;
-		color_pair++;
+		this_color->pairnum = clr_pair;
+		clr_pair++;
 	    }
 	}
     }
@@ -66,14 +107,8 @@ void color_init(void)
     if (has_colors()) {
 	const colortype *tmpcolor;
 #ifdef HAVE_USE_DEFAULT_COLORS
-	bool defok;
-#endif
-
-	start_color();
-
-#ifdef HAVE_USE_DEFAULT_COLORS
 	/* Use the default colors, if available. */
-	defok = (use_default_colors() != ERR);
+	bool defok = (use_default_colors() != ERR);
 #endif
 
 	for (tmpcolor = openfile->colorstrings; tmpcolor != NULL;
@@ -102,18 +137,33 @@ void color_init(void)
     }
 }
 
+/* Clean up a regex we previously compiled. */
+void nfreeregex(regex_t **r)
+{
+    assert(r != NULL);
+
+    regfree(*r);
+    free(*r);
+    *r = NULL;
+}
+
 /* Update the color information based on the current filename. */
 void color_update(void)
 {
     syntaxtype *tmpsyntax;
     syntaxtype *defsyntax = NULL;
     colortype *tmpcolor, *defcolor = NULL;
+    regexlisttype *e;
 
     assert(openfile != NULL);
 
     openfile->syntax = NULL;
     openfile->colorstrings = NULL;
 
+    /* If the rcfiles were not read, or contained no syntaxes, get out. */
+    if (syntaxes == NULL)
+	return;
+
     /* If we specified a syntax override string, use it. */
     if (syntaxstr != NULL) {
 	/* If the syntax override is "none", it's the same as not having
@@ -135,11 +185,10 @@ void color_update(void)
 
     /* If we didn't specify a syntax override string, or if we did and
      * there was no syntax by that name, get the syntax based on the
-     * file extension, and then look in the header. */
+     * file extension, then try the headerline, and then try magic. */
     if (openfile->colorstrings == NULL) {
 	for (tmpsyntax = syntaxes; tmpsyntax != NULL;
 		tmpsyntax = tmpsyntax->next) {
-	    exttype *e;
 
 	    /* If this is the default syntax, it has no associated
 	     * extensions, which we've checked for elsewhere.  Skip over
@@ -161,75 +210,117 @@ void color_update(void)
 		    regcomp(e->ext, fixbounds(e->ext_regex), REG_EXTENDED);
 		}
 
-		/* Set colorstrings if we matched the extension
-		 * regex. */
-		if (regexec(e->ext, openfile->filename, 0, NULL,
-			0) == 0) {
+		/* Set colorstrings if we match the extension regex. */
+		if (regexec(e->ext, openfile->filename, 0, NULL, 0) == 0) {
 		    openfile->syntax = tmpsyntax;
 		    openfile->colorstrings = tmpsyntax->color;
-		}
-
-		if (openfile->colorstrings != NULL)
 		    break;
+		}
 
 		/* Decompile e->ext_regex's specified regex if we aren't
 		 * going to use it. */
-		if (not_compiled) {
-		    regfree(e->ext);
-		    free(e->ext);
-		    e->ext = NULL;
-		}
+		if (not_compiled)
+		    nfreeregex(&e->ext);
 	    }
 	}
 
-	/* If we haven't matched anything yet, try the headers */
+	/* Check the headerline if the extension didn't match anything. */
 	if (openfile->colorstrings == NULL) {
 #ifdef DEBUG
-	    fprintf(stderr, "No match for file extensions, looking at headers...\n");
+	    fprintf(stderr, "No result from file extension, trying headerline...\n");
 #endif
 	    for (tmpsyntax = syntaxes; tmpsyntax != NULL;
 		tmpsyntax = tmpsyntax->next) {
-		exttype *e;
 
 		for (e = tmpsyntax->headers; e != NULL; e = e->next) {
 		    bool not_compiled = (e->ext == NULL);
 
-		    /* e->ext_regex has already been checked for validity
-		     * elsewhere.  Compile its specified regex if we haven't
-		     * already. */
 		    if (not_compiled) {
 			e->ext = (regex_t *)nmalloc(sizeof(regex_t));
 			regcomp(e->ext, fixbounds(e->ext_regex), REG_EXTENDED);
 		    }
-
-		    /* Set colorstrings if we matched the extension
-		     * regex. */
 #ifdef DEBUG
-		fprintf(stderr, "Comparing header regex \"%s\" to fileage \"%s\"...\n", e->ext_regex, openfile->fileage->data);
+		    fprintf(stderr, "Comparing header regex \"%s\" to fileage \"%s\"...\n",
+				    e->ext_regex, openfile->fileage->data);
 #endif
+		    /* Set colorstrings if we match the header-line regex. */
 		    if (regexec(e->ext, openfile->fileage->data, 0, NULL, 0) == 0) {
 			openfile->syntax = tmpsyntax;
 			openfile->colorstrings = tmpsyntax->color;
+			break;
 		    }
 
-		    if (openfile->colorstrings != NULL)
-			break;
+		    if (not_compiled)
+			nfreeregex(&e->ext);
+		}
+	    }
+	}
+
+#ifdef HAVE_LIBMAGIC
+	/* Check magic if we don't have an answer yet. */
+	if (openfile->colorstrings == NULL) {
+	    struct stat fileinfo;
+	    magic_t cookie = NULL;
+	    const char *magicstring = NULL;
+#ifdef DEBUG
+	    fprintf(stderr, "No result from headerline either, trying libmagic...\n");
+#endif
+	    if (stat(openfile->filename, &fileinfo) == 0) {
+		/* Open the magic database and get a diagnosis of the file. */
+		cookie = magic_open(MAGIC_SYMLINK |
+#ifdef DEBUG
+				       MAGIC_DEBUG | MAGIC_CHECK |
+#endif
+				       MAGIC_ERROR);
+		if (cookie == NULL || magic_load(cookie, NULL) < 0)
+		    statusbar(_("magic_load() failed: %s"), strerror(errno));
+		else {
+		    magicstring = magic_file(cookie, openfile->filename);
+		    if (magicstring == NULL) {
+			statusbar(_("magic_file(%s) failed: %s"),
+					openfile->filename, magic_error(cookie));
+		    }
+#ifdef DEBUG
+		    fprintf(stderr, "Returned magic string is: %s\n", magicstring);
+#endif
+		}
+	    }
+
+	    /* Now try and find a syntax that matches the magicstring. */
+	    for (tmpsyntax = syntaxes; tmpsyntax != NULL;
+		tmpsyntax = tmpsyntax->next) {
+
+		for (e = tmpsyntax->magics; e != NULL; e = e->next) {
+		    bool not_compiled = (e->ext == NULL);
 
-		    /* Decompile e->ext_regex's specified regex if we aren't
-		     * going to use it. */
 		    if (not_compiled) {
-			regfree(e->ext);
-			free(e->ext);
-			e->ext = NULL;
+			e->ext = (regex_t *)nmalloc(sizeof(regex_t));
+			regcomp(e->ext, fixbounds(e->ext_regex), REG_EXTENDED);
 		    }
+#ifdef DEBUG
+		    fprintf(stderr, "Matching regex \"%s\" against \"%s\"\n", e->ext_regex, magicstring);
+#endif
+		    /* Set colorstrings if we match the magic-string regex. */
+		    if (magicstring && regexec(e->ext, magicstring, 0, NULL, 0) == 0) {
+			openfile->syntax = tmpsyntax;
+			openfile->colorstrings = tmpsyntax->color;
+			break;
+		    }
+
+		    if (not_compiled)
+			nfreeregex(&e->ext);
 		}
+		if (openfile->syntax != NULL)
+		    break;
 	    }
+	    if (stat(openfile->filename, &fileinfo) == 0)
+		magic_close(cookie);
 	}
+#endif /* HAVE_LIBMAGIC */
     }
 
-
-    /* If we didn't get a syntax based on the file extension, and we
-     * have a default syntax, use it. */
+    /* If we didn't find any syntax yet, and we do have a default one,
+     * use it. */
     if (openfile->colorstrings == NULL && defcolor != NULL) {
 	openfile->syntax = defsyntax;
 	openfile->colorstrings = defcolor;
@@ -255,7 +346,7 @@ void color_update(void)
 }
 
 /* Reset the multicolor info cache for records for any lines which need
-   to be recalculated */
+ * to be recalculated. */
 void reset_multis_after(filestruct *fileptr, int mindex)
 {
     filestruct *oof;
@@ -301,11 +392,10 @@ void reset_multis_before(filestruct *fileptr, int mindex)
 	else
 	    break;
     }
-
     edit_refresh_needed = TRUE;
 }
 
-/* Reset one multiline regex info */
+/* Reset one multiline regex info. */
 void reset_multis_for_id(filestruct *fileptr, int num)
 {
     reset_multis_before(fileptr, num);
@@ -313,9 +403,9 @@ void reset_multis_for_id(filestruct *fileptr, int num)
     fileptr->multidata[num] = -1;
 }
 
-/* Reset multi line strings around a filestruct ptr, trying to be smart about stopping
-   force = reset everything regardless, useful when we don't know how much screen state
-           has changed  */
+/* Reset multi-line strings around a filestruct ptr, trying to be smart
+ * about stopping.  Bool force means: reset everything regardless, useful
+ * when we don't know how much screen state has changed. */
 void reset_multis(filestruct *fileptr, bool force)
 {
     int nobegin, noend;
@@ -327,7 +417,7 @@ void reset_multis(filestruct *fileptr, bool force)
 
     for (; tmpcolor != NULL; tmpcolor = tmpcolor->next) {
 
-	/* If it's not a multi-line regex, amscray */
+	/* If it's not a multi-line regex, amscray. */
 	if (tmpcolor->end == NULL)
 	    continue;
 
@@ -338,10 +428,10 @@ void reset_multis(filestruct *fileptr, bool force)
 	}
 
 	/* Figure out where the first begin and end are to determine if
-	   things changed drastically for the precalculated multi values */
-        nobegin = regexec(tmpcolor->start, fileptr->data, 1, &startmatch, 0);
-        noend = regexec(tmpcolor->end, fileptr->data, 1, &endmatch, 0);
-	if (fileptr->multidata[tmpcolor->id] ==  CWHOLELINE) {
+	 * things changed drastically for the precalculated multi values. */
+	nobegin = regexec(tmpcolor->start, fileptr->data, 1, &startmatch, 0);
+	noend = regexec(tmpcolor->end, fileptr->data, 1, &endmatch, 0);
+	if (fileptr->multidata[tmpcolor->id] == CWHOLELINE) {
 	    if (nobegin && noend)
 		continue;
 	} else if (fileptr->multidata[tmpcolor->id] == CNONE) {
@@ -353,8 +443,9 @@ void reset_multis(filestruct *fileptr, bool force)
 	    continue;
 	}
 
-	/* If we got here assume the worst */
+	/* If we got here, assume the worst. */
 	reset_multis_for_id(fileptr, tmpcolor->id);
     }
 }
-#endif /* ENABLE_COLOR */
+
+#endif /* !DISABLE_COLOR */
diff --git a/src/cut.c b/src/cut.c
index 8c21c8e..46a339c 100644
--- a/src/cut.c
+++ b/src/cut.c
@@ -1,9 +1,9 @@
-/* $Id: cut.c 4453 2009-12-02 03:36:22Z astyanax $ */
+/* $Id: cut.c 5112 2015-02-03 22:49:57Z astyanax $ */
 /**************************************************************************
  *   cut.c                                                                *
  *                                                                        *
  *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009 Free Software Foundation, Inc.                            *
+ *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -37,6 +37,12 @@ void cutbuffer_reset(void)
     keep_cutbuffer = FALSE;
 }
 
+/* Return the status of cutbuffer preservation. */
+inline bool keeping_cutbuffer(void)
+{
+    return keep_cutbuffer;
+}
+
 /* If we aren't on the last line of the file, move all the text of the
  * current line, plus the newline at the end, into the cutbuffer.  If we
  * are, move all of the text of the current line into the cutbuffer.  In
@@ -44,6 +50,11 @@ void cutbuffer_reset(void)
  * current line. */
 void cut_line(void)
 {
+#ifndef NANO_TINY
+    if (!openfile->mark_begin)
+	openfile->mark_begin = openfile->current;
+#endif
+
     if (openfile->current != openfile->filebot)
 	move_to_filestruct(&cutbuffer, &cutbottom, openfile->current, 0,
 		openfile->current->next, 0);
@@ -109,11 +120,11 @@ void cut_to_eof(void)
 
 /* Move text from the current filestruct into the cutbuffer.  If
  * copy_text is TRUE, copy the text back into the filestruct afterward.
- * If cut_till_end is TRUE, move all text from the current cursor
+ * If cut_till_eof is TRUE, move all text from the current cursor
  * position to the end of the file into the cutbuffer. */
 void do_cut_text(
 #ifndef NANO_TINY
-	bool copy_text, bool cut_till_end, bool undoing
+	bool copy_text, bool cut_till_eof, bool undoing
 #else
 	void
 #endif
@@ -125,7 +136,7 @@ void do_cut_text(
 	 * it. */
     size_t cb_save_len = 0;
 	/* The length of the string at the current end of the cutbuffer,
-	 * before we add text to it.  */
+	 * before we add text to it. */
     bool old_no_newlines = ISSET(NO_NEWLINES);
 #endif
 
@@ -162,9 +173,8 @@ void do_cut_text(
     keep_cutbuffer = TRUE;
 
 #ifndef NANO_TINY
-
-    if (cut_till_end) {
-	/* If cut_till_end is TRUE, move all text up to the end of the
+    if (cut_till_eof) {
+	/* If cut_till_eof is TRUE, move all text up to the end of the
 	 * file into the cutbuffer. */
 	cut_to_eof();
     } else if (openfile->mark_set) {
@@ -190,10 +200,10 @@ void do_cut_text(
 	if (cutbuffer != NULL) {
 	    if (cb_save != NULL) {
 		cb_save->data += cb_save_len;
-		copy_from_filestruct(cb_save, cutbottom);
+		copy_from_filestruct(cb_save);
 		cb_save->data -= cb_save_len;
 	    } else
-		copy_from_filestruct(cutbuffer, cutbottom);
+		copy_from_filestruct(cutbuffer);
 
 	    /* Set the current place we want to where the text from the
 	     * cutbuffer ends. */
@@ -205,16 +215,18 @@ void do_cut_text(
 	if (!old_no_newlines)
 	    UNSET(NO_NEWLINES);
     } else if (!undoing)
-	update_undo(CUT);
-#endif
-	/* Leave the text in the cutbuffer, and mark the file as
-	 * modified. */
+	update_undo(cut_till_eof ? CUT_EOF : CUT);
+
+    /* Leave the text in the cutbuffer, and mark the file as
+     * modified. */
+    if (!copy_text)
+#endif /* !NANO_TINY */
 	set_modified();
 
     /* Update the screen. */
     edit_refresh_needed = TRUE;
 
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     reset_multis(openfile->current, FALSE);
 #endif
 
@@ -238,18 +250,26 @@ void do_cut_text_void(void)
 
 #ifndef NANO_TINY
 /* Move text from the current filestruct into the cutbuffer, and copy it
- * back into the filestruct afterward. */
+ * back into the filestruct afterward.  If the mark is set or the cursor
+ * was moved, blow away previous contents of the cutbuffer. */
 void do_copy_text(void)
 {
+    static struct filestruct *next_contiguous_line = NULL;
+    bool mark_set = openfile->mark_set;
+
+    if (mark_set || openfile->current != next_contiguous_line)
+	cutbuffer_reset();
+
     do_cut_text(TRUE, FALSE, FALSE);
+
+    /* If the mark was set, blow away the cutbuffer on the next copy. */
+    next_contiguous_line = (mark_set ? NULL : openfile->current);
 }
 
 /* Cut from the current cursor position to the end of the file. */
-void do_cut_till_end(void)
+void do_cut_till_eof(void)
 {
-#ifndef NANO_TINY
-    add_undo(CUT);
-#endif
+    add_undo(CUT_EOF);
     do_cut_text(FALSE, TRUE, FALSE);
 }
 #endif /* !NANO_TINY */
@@ -264,12 +284,16 @@ void do_uncut_text(void)
 	return;
 
 #ifndef NANO_TINY
-     update_undo(UNCUT);
+    add_undo(PASTE);
 #endif
 
     /* Add a copy of the text in the cutbuffer to the current filestruct
      * at the current cursor position. */
-    copy_from_filestruct(cutbuffer, cutbottom);
+    copy_from_filestruct(cutbuffer);
+
+#ifndef NANO_TINY
+    update_undo(PASTE);
+#endif
 
     /* Set the current place we want to where the text from the
      * cutbuffer ends. */
@@ -281,7 +305,7 @@ void do_uncut_text(void)
     /* Update the screen. */
     edit_refresh_needed = TRUE;
 
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     reset_multis(openfile->current, FALSE);
 #endif
 
diff --git a/src/files.c b/src/files.c
index c5b9d6a..bd07597 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1,9 +1,9 @@
-/* $Id: files.c 4520 2010-11-12 06:23:14Z astyanax $ */
+/* $Id: files.c 5118 2015-02-15 16:28:08Z bens $ */
 /**************************************************************************
  *   files.c                                                              *
  *                                                                        *
  *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009 Free Software Foundation, Inc.                            *
+ *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -31,6 +31,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <pwd.h>
+#include <libgen.h>
 
 /* Add an entry to the openfile openfilestruct.  This should only be
  * called from open_buffer(). */
@@ -46,6 +47,8 @@ void make_new_buffer(void)
     } else {
 	splice_opennode(openfile, make_new_opennode(), openfile->next);
 	openfile = openfile->next;
+	/* More than one file open, show Close in help lines. */
+	exitfunc->desc = close_tag;
     }
 
     /* Initialize the new buffer. */
@@ -77,8 +80,9 @@ void initialize_buffer(void)
     openfile->current_stat = NULL;
     openfile->undotop = NULL;
     openfile->current_undo = NULL;
+    openfile->lock_filename = NULL;
 #endif
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     openfile->colorstrings = NULL;
 #endif
 }
@@ -96,19 +100,229 @@ void initialize_buffer_text(void)
     openfile->edittop = openfile->fileage;
     openfile->current = openfile->fileage;
 
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     openfile->fileage->multidata = NULL;
 #endif
 
     openfile->totsize = 0;
 }
 
+#ifndef NANO_TINY
+/* Actually write the lockfile.  This function will ALWAYS annihilate
+ * any previous version of the file.  We'll borrow INSECURE_BACKUP here
+ * to decide about lockfile paranoia here as well...
+ *
+ * Args:
+ *     lockfilename: file name for lock
+ *     origfilename: name of the file the lock is for
+ *     modified: whether to set the modified bit in the file
+ *
+ * Returns: 1 on success, 0 on failure (but continue loading), -1 on
+ * failure and abort. */
+int write_lockfile(const char *lockfilename, const char *origfilename, bool modified)
+{
+    int cflags, fd;
+    FILE *filestream;
+    pid_t mypid;
+    uid_t myuid;
+    struct passwd *mypwuid;
+    struct stat fileinfo;
+    char *lockdata = charalloc(1024);
+    char myhostname[32];
+    ssize_t lockdatalen = 1024;
+    ssize_t wroteamt;
+
+    /* Run things which might fail first before we try and blow away the
+     * old state. */
+    myuid = geteuid();
+    if ((mypwuid = getpwuid(myuid)) == NULL) {
+        statusbar(_("Couldn't determine my identity for lock file (getpwuid() failed)"));
+        return -1;
+    }
+    mypid = getpid();
+
+    if (gethostname(myhostname, 31) < 0) {
+       statusbar(_("Couldn't determine hostname for lock file: %s"), strerror(errno));
+       return -1;
+    }
+
+    /* Check if the lock exists before we try to delete it...*/
+    if (stat(lockfilename, &fileinfo) != -1)
+	if (delete_lockfile(lockfilename) < 0)
+	    return -1;
+
+    if (ISSET(INSECURE_BACKUP))
+        cflags = O_WRONLY | O_CREAT | O_APPEND;
+    else
+        cflags = O_WRONLY | O_CREAT | O_EXCL | O_APPEND;
+
+    fd = open(lockfilename, cflags,
+	    S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+
+    /* Maybe we just don't have write access.  Print an error message
+       and continue. */
+    if (fd < 0) {
+        statusbar(_("Error writing lock file %s: %s"), lockfilename,
+		    strerror(errno));
+        return 0;
+    }
+
+    /* Now we've got a safe file stream.  If the previous open() call
+     * failed, this will return NULL. */
+    filestream = fdopen(fd, "wb");
+
+    if (fd < 0 || filestream == NULL) {
+        statusbar(_("Error writing lock file %s: %s"), lockfilename,
+		    strerror(errno));
+        return -1;
+    }
+
+    /* Okay, so at the moment we're following this state for how to
+     * store the lock data:
+     *
+     * byte 0        - 0x62
+     * byte 1        - 0x30
+     * bytes 2-12    - program name which created the lock
+     * bytes 24,25   - little endian store of creator program's PID
+     *                 (b24 = 256^0 column, b25 = 256^1 column)
+     * bytes 28-44   - username of who created the lock
+     * bytes 68-100  - hostname of where the lock was created
+     * bytes 108-876 - filename the lock is for
+     * byte 1007     - 0x55 if file is modified
+     *
+     * Looks like VIM also stores undo state in this file, so we're
+     * gonna have to figure out how to slap a 'OMG don't use recover on
+     * our lockfile' message in here...
+     *
+     * This is likely very wrong, so this is a WIP. */
+    memset(lockdata, 0, lockdatalen);
+    lockdata[0] = 0x62;
+    lockdata[1] = 0x30;
+    lockdata[24] = mypid % 256;
+    lockdata[25] = mypid / 256;
+    snprintf(&lockdata[2], 11, "nano %s", VERSION);
+    strncpy(&lockdata[28], mypwuid->pw_name, 16);
+    strncpy(&lockdata[68], myhostname, 31);
+    strncpy(&lockdata[108], origfilename, 768);
+    if (modified == TRUE)
+        lockdata[1007] = 0x55;
+
+    wroteamt = fwrite(lockdata, sizeof(char), lockdatalen, filestream);
+    if (wroteamt < lockdatalen) {
+        statusbar(_("Error writing lock file %s: %s"),
+                  lockfilename, ferror(filestream));
+        return -1;
+    }
+
+#ifdef DEBUG
+    fprintf(stderr, "In write_lockfile(), write successful (wrote %lu bytes)\n", (unsigned long)wroteamt);
+#endif
+
+    if (fclose(filestream) == EOF) {
+        statusbar(_("Error writing lock file %s: %s"),
+                  lockfilename, strerror(errno));
+        return -1;
+    }
+
+    openfile->lock_filename = lockfilename;
+
+    return 1;
+}
+
+/* Less exciting, delete the lockfile.  Return -1 if unsuccessful and
+ * complain on the statusbar, 1 otherwise. */
+int delete_lockfile(const char *lockfilename)
+{
+    if (unlink(lockfilename) < 0 && errno != ENOENT) {
+	statusbar(_("Error deleting lock file %s: %s"), lockfilename,
+		  strerror(errno));
+        return -1;
+    }
+    return 1;
+}
+
+/* Deal with lockfiles.  Return -1 on refusing to override the lockfile,
+ * and 1 on successfully creating it; 0 means we were not successful in
+ * creating the lockfile but we should continue to load the file and
+ * complain to the user. */
+int do_lockfile(const char *filename)
+{
+    char *lockdir = dirname((char *) mallocstrcpy(NULL, filename));
+    char *lockbase = basename((char *) mallocstrcpy(NULL, filename));
+    size_t lockfilesize = strlen(filename) + strlen(locking_prefix)
+		+ strlen(locking_suffix) + 3;
+    char *lockfilename = charalloc(lockfilesize);
+    char *lockfiledir = NULL;
+    static char lockprog[11], lockuser[17];
+    struct stat fileinfo;
+    int lockfd, lockpid;
+
+    snprintf(lockfilename, lockfilesize, "%s/%s%s%s", lockdir,
+             locking_prefix, lockbase, locking_suffix);
+#ifdef DEBUG
+    fprintf(stderr, "lock file name is %s\n", lockfilename);
+#endif
+    if (stat(lockfilename, &fileinfo) != -1) {
+        ssize_t readtot = 0;
+        ssize_t readamt = 0;
+        char *lockbuf = charalloc(8192);
+        char *promptstr = charalloc(128);
+        int ans;
+        if ((lockfd = open(lockfilename, O_RDONLY)) < 0) {
+            statusbar(_("Error opening lock file %s: %s"),
+                      lockfilename, strerror(errno));
+            return -1;
+        }
+        do {
+            readamt = read(lockfd, &lockbuf[readtot], BUFSIZ);
+            readtot += readamt;
+        } while (readtot < 8192 && readamt > 0);
+
+        if (readtot < 48) {
+            statusbar(_("Error reading lock file %s: Not enough data read"),
+                      lockfilename);
+            return -1;
+        }
+        strncpy(lockprog, &lockbuf[2], 10);
+        lockpid = (unsigned char)lockbuf[25] * 256 + (unsigned char)lockbuf[24];
+        strncpy(lockuser, &lockbuf[28], 16);
+#ifdef DEBUG
+        fprintf(stderr, "lockpid = %d\n", lockpid);
+        fprintf(stderr, "program name which created this lock file should be %s\n",
+                lockprog);
+        fprintf(stderr, "user which created this lock file should be %s\n",
+                lockuser);
+#endif
+	/* TRANSLATORS: The second %s is the name of the user, the third that of the editor. */
+	sprintf(promptstr, _("File %s is being edited (by %s with %s, PID %d); continue?"),
+			   filename, lockuser, lockprog, lockpid);
+        ans = do_yesno_prompt(FALSE, promptstr);
+        if (ans < 1) {
+            blank_statusbar();
+            return -1;
+        }
+    } else {
+	lockfiledir = mallocstrcpy(NULL, lockfilename);
+	lockfiledir = dirname(lockfiledir);
+	if (stat(lockfiledir, &fileinfo) == -1) {
+	    statusbar(_("Error writing lock file: Directory \'%s\' doesn't exist"),
+		lockfiledir);
+	    return 0;
+	}
+    }
+
+
+    return write_lockfile(lockfilename, filename, FALSE);
+}
+#endif /* !NANO_TINY */
+
 /* If it's not "", filename is a file to open.  We make a new buffer, if
  * necessary, and then open and read the file, if applicable. */
 void open_buffer(const char *filename, bool undoable)
 {
+    bool quiet = FALSE;
     bool new_buffer = (openfile == NULL
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 	 || ISSET(MULTIBUFFER)
 #endif
 	);
@@ -128,16 +342,34 @@ void open_buffer(const char *filename, bool undoable)
     }
 #endif
 
-    /* If the filename isn't blank, open the file.  Otherwise, treat it
-     * as a new file. */
-    rc = (filename[0] != '\0') ? open_file(filename, new_buffer, &f) :
-	-2;
-
     /* If we're loading into a new buffer, add a new entry to
      * openfile. */
-    if (new_buffer)
+    if (new_buffer) {
 	make_new_buffer();
 
+#ifndef NANO_TINY
+	if (ISSET(LOCKING) && filename[0] != '\0') {
+	    int lockstatus = do_lockfile(filename);
+	    if (lockstatus < 0) {
+#ifndef DISABLE_MULTIBUFFER
+		if (openfile->next) {
+		    close_buffer(TRUE);
+		    return;
+		}
+#endif
+	    } else if (lockstatus == 0) {
+		quiet = TRUE;
+	    }
+ 	}
+#endif
+    }
+
+
+    /* If the filename isn't blank, and we are not in NOREAD_MODE,
+     * open the file.  Otherwise, treat it as a new file. */
+    rc = (filename[0] != '\0' && !ISSET(NOREAD_MODE)) ?
+		open_file(filename, new_buffer, quiet, &f) : -2;
+
     /* If we have a file, and we're loading into a new buffer, update
      * the filename. */
     if (rc != -1 && new_buffer)
@@ -164,7 +396,7 @@ void open_buffer(const char *filename, bool undoable)
 	openfile->placewewant = 0;
     }
 
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     /* If we're loading into a new buffer, update the colors to account
      * for it, if applicable. */
     if (new_buffer)
@@ -188,7 +420,7 @@ void replace_buffer(const char *filename)
 
     /* If the filename isn't blank, open the file.  Otherwise, treat it
      * as a new file. */
-    rc = (filename[0] != '\0') ? open_file(filename, TRUE, &f) : -2;
+    rc = (filename[0] != '\0') ? open_file(filename, TRUE, FALSE, &f) : -2;
 
     /* Reinitialize the text of the current buffer. */
     free_filestruct(openfile->fileage);
@@ -211,7 +443,7 @@ void display_buffer(void)
     /* Update the titlebar, since the filename may have changed. */
     titlebar(NULL);
 
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     /* Make sure we're using the buffer's associated colors, if
      * applicable. */
     color_init();
@@ -221,17 +453,18 @@ void display_buffer(void)
     edit_refresh();
 }
 
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 /* Switch to the next file buffer if next_buf is TRUE.  Otherwise,
  * switch to the previous file buffer. */
-void switch_to_prevnext_buffer(bool next_buf)
+void switch_to_prevnext_buffer(bool next_buf, bool quiet)
 {
     assert(openfile != NULL);
 
     /* If only one file buffer is open, indicate it on the statusbar and
      * get out. */
     if (openfile == openfile->next) {
-	statusbar(_("No more open file buffers"));
+	if (quiet == FALSE)
+	    statusbar(_("No more open file buffers"));
 	return;
     }
 
@@ -247,31 +480,35 @@ void switch_to_prevnext_buffer(bool next_buf)
     display_buffer();
 
     /* Indicate the switch on the statusbar. */
-    statusbar(_("Switched to %s"),
-	((openfile->filename[0] == '\0') ? _("New Buffer") :
-	openfile->filename));
+    if (quiet == FALSE)
+	statusbar(_("Switched to %s"),
+	    ((openfile->filename[0] == '\0') ? _("New Buffer") :
+	      openfile->filename));
 
 #ifdef DEBUG
     dump_filestruct(openfile->current);
 #endif
+    display_main_list();
 }
 
 /* Switch to the previous entry in the openfile filebuffer. */
 void switch_to_prev_buffer_void(void)
 {
-    switch_to_prevnext_buffer(FALSE);
+    switch_to_prevnext_buffer(FALSE, FALSE);
 }
 
 /* Switch to the next entry in the openfile filebuffer. */
 void switch_to_next_buffer_void(void)
 {
-    switch_to_prevnext_buffer(TRUE);
+    switch_to_prevnext_buffer(TRUE, FALSE);
 }
 
 /* Delete an entry from the openfile filebuffer, and switch to the one
  * after it.  Return TRUE on success, or FALSE if there are no more open
- * file buffers. */
-bool close_buffer(void)
+ * file buffers.
+ * quiet - should we print messages switching bufers
+ */
+bool close_buffer(bool quiet)
 {
     assert(openfile != NULL);
 
@@ -279,24 +516,29 @@ bool close_buffer(void)
     if (openfile == openfile->next)
 	return FALSE;
 
+#ifndef DISABLE_HISTORIES
+    update_poshistory(openfile->filename, openfile->current->lineno, xplustabs() + 1);
+#endif
+
     /* Switch to the next file buffer. */
-    switch_to_next_buffer_void();
+     switch_to_prevnext_buffer(TRUE, quiet);
 
     /* Close the file buffer we had open before. */
     unlink_opennode(openfile->prev);
 
-    display_main_list();
+    /* If only one buffer is open now, show Exit in the help lines. */
+    if (openfile == openfile->next)
+	exitfunc->desc = exit_tag;
 
     return TRUE;
 }
-#endif /* ENABLE_MULTIBUFFER */
+#endif /* !DISABLE_MULTIBUFFER */
 
-/* A bit of a copy and paste from open_file(), is_file_writable()
- * just checks whether the file is appendable as a quick
- * permissions check, and we tend to err on the side of permissiveness
- * (reporting TRUE when it might be wrong) to not fluster users
- * editing on odd filesystems by printing incorrect warnings.
- */
+/* A bit of a copy and paste from open_file(), is_file_writable() just
+ * checks whether the file is appendable as a quick permissions check,
+ * and we tend to err on the side of permissiveness (reporting TRUE when
+ * it might be wrong) to not fluster users editing on odd filesystems by
+ * printing incorrect warnings. */
 int is_file_writable(const char *filename)
 {
     struct stat fileinfo, fileinfo2;
@@ -305,7 +547,6 @@ int is_file_writable(const char *filename)
     char *full_filename;
     bool ans = TRUE;
 
-
     if (ISSET(VIEW_MODE))
 	return TRUE;
 
@@ -315,7 +556,7 @@ int is_file_writable(const char *filename)
     full_filename = get_full_path(filename);
 
     /* Okay, if we can't stat the path due to a component's
-       permissions, just try the relative one */
+       permissions, just try the relative one. */
     if (full_filename == NULL
         || (stat(full_filename, &fileinfo) == -1 && stat(filename, &fileinfo2) != -1))
         full_filename = mallocstrcpy(NULL, filename);
@@ -356,7 +597,7 @@ filestruct *read_line(char *buf, filestruct *prevnode, bool
 	fileptr->data[buf_len - 1] = '\0';
 #endif
 
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 	fileptr->multidata = NULL;
 #endif
 
@@ -389,9 +630,9 @@ filestruct *read_line(char *buf, filestruct *prevnode, bool
 
 /* Read an open file into the current buffer.  f should be set to the
  * open file, and filename should be set to the name of the file.
- * undoable  means do we want to create undo records to try and undo this.
- * Will also attempt to check file writability if fd > 0 and checkwritable == TRUE
- */
+ * undoable means do we want to create undo records to try and undo
+ * this.  Will also attempt to check file writability if fd > 0 and
+ * checkwritable == TRUE. */
 void read_file(FILE *f, int fd, const char *filename, bool undoable, bool checkwritable)
 {
     size_t num_lines = 0;
@@ -674,9 +915,9 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable, bool checkw
  * found".
  *
  * Return -2 if we say "New File", -1 if the file isn't opened, and the
- * fd opened otherwise.  The file might still have an error while reading 
+ * fd opened otherwise.  The file might still have an error while reading
  * with a 0 return value.  *f is set to the opened file. */
-int open_file(const char *filename, bool newfie, FILE **f)
+int open_file(const char *filename, bool newfie, bool quiet, FILE **f)
 {
     struct stat fileinfo, fileinfo2;
     int fd;
@@ -688,22 +929,25 @@ int open_file(const char *filename, bool newfie, FILE **f)
     full_filename = get_full_path(filename);
 
     /* Okay, if we can't stat the path due to a component's
-       permissions, just try the relative one */
-    if (full_filename == NULL 
+       permissions, just try the relative one. */
+    if (full_filename == NULL
 	|| (stat(full_filename, &fileinfo) == -1 && stat(filename, &fileinfo2) != -1))
 	full_filename = mallocstrcpy(NULL, filename);
 
+
     if (stat(full_filename, &fileinfo) == -1) {
-	/* Well, maybe we can open the file even if the OS
-	   says its not there */
+	/* Well, maybe we can open the file even if the OS says it's
+	 * not there. */
         if ((fd = open(filename, O_RDONLY)) != -1) {
-	    statusbar(_("Reading File"));
+	    if (!quiet)
+		statusbar(_("Reading File"));
 	    free(full_filename);
 	    return 0;
 	}
 
 	if (newfie) {
-	    statusbar(_("New File"));
+	    if (!quiet)
+		statusbar(_("New File"));
 	    return -2;
 	}
 	statusbar(_("\"%s\" not found"), filename);
@@ -722,7 +966,7 @@ int open_file(const char *filename, bool newfie, FILE **f)
 	statusbar(_("Error reading %s: %s"), filename,
 		strerror(errno));
 	beep();
- 	return -1;
+	return -1;
      } else {
 	/* The file is A-OK.  Open it. */
 	*f = fdopen(fd, "rb");
@@ -800,8 +1044,7 @@ void do_insertfile(
     filestruct *edittop_save = openfile->edittop;
     size_t current_x_save = openfile->current_x;
     ssize_t current_y_save = openfile->current_y;
-    bool edittop_inside = FALSE, meta_key = FALSE, func_key = FALSE;
-    const sc *s;
+    bool edittop_inside = FALSE;
 #ifndef NANO_TINY
     bool right_side_up = FALSE, single_line = FALSE;
 #endif
@@ -812,22 +1055,21 @@ void do_insertfile(
 #ifndef NANO_TINY
 	if (execute) {
 	    msg =
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 		ISSET(MULTIBUFFER) ?
 		_("Command to execute in new buffer [from %s] ") :
 #endif
 		_("Command to execute [from %s] ");
-	} else {
-#endif
+	} else
+#endif /* NANO_TINY */
+	{
 	    msg =
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 		ISSET(MULTIBUFFER) ?
 		_("File to insert into new buffer [from %s] ") :
 #endif
 		_("File to insert [from %s] ");
-#ifndef NANO_TINY
 	}
-#endif
 
 	i = do_prompt(TRUE,
 #ifndef DISABLE_TABCOMP
@@ -837,8 +1079,7 @@ void do_insertfile(
 		execute ? MEXTCMD :
 #endif
 		MINSERTFILE, ans,
-		&meta_key, &func_key,
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
 		NULL,
 #endif
 		edit_refresh, msg,
@@ -853,7 +1094,7 @@ void do_insertfile(
 	 * filename or command begins with a newline (i.e. an encoded
 	 * null), treat it as though it's blank. */
 	if (i == -1 || ((i == -2 || *answer == '\n')
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 		&& !ISSET(MULTIBUFFER)
 #endif
 		)) {
@@ -861,32 +1102,29 @@ void do_insertfile(
 	    break;
 	} else {
 	    size_t pww_save = openfile->placewewant;
+	    functionptrtype func = func_from_key(&i);
 
 	    ans = mallocstrcpy(ans, answer);
 
-	    s = get_shortcut(currmenu, &i, &meta_key, &func_key);
-
 #ifndef NANO_TINY
-#ifdef ENABLE_MULTIBUFFER
-
-	    if (s && s->scfunc == NEW_BUFFER_MSG) {
+#ifndef DISABLE_MULTIBUFFER
+	    if (func == new_buffer_void) {
 		/* Don't allow toggling if we're in view mode. */
 		if (!ISSET(VIEW_MODE))
 		    TOGGLE(MULTIBUFFER);
+		else
+		    beep();
 		continue;
-	    } else
+	    }
 #endif
-	    if (s && s->scfunc == EXT_CMD_MSG) {
+	    if (func == flip_execute_void) {
 		execute = !execute;
 		continue;
 	    }
-#ifndef DISABLE_BROWSER
-	    else
-#endif
 #endif /* !NANO_TINY */
 
 #ifndef DISABLE_BROWSER
-	    if (s && s->scfunc == TO_FILES_MSG) {
+	    if (func == to_files_void) {
 		char *tmp = do_browse_from(answer);
 
 		if (tmp == NULL)
@@ -903,28 +1141,28 @@ void do_insertfile(
 	    /* If we don't have a file yet, go back to the statusbar
 	     * prompt. */
 	    if (i != 0
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 		&& (i != -2 || !ISSET(MULTIBUFFER))
 #endif
 		)
 		continue;
 
 #ifndef NANO_TINY
-		/* Keep track of whether the mark begins inside the
-		 * partition and will need adjustment. */
-		if (openfile->mark_set) {
-		    filestruct *top, *bot;
-		    size_t top_x, bot_x;
+	    /* Keep track of whether the mark begins inside the
+	     * partition and will need adjustment. */
+	    if (openfile->mark_set) {
+		filestruct *top, *bot;
+		size_t top_x, bot_x;
 
-		    mark_order((const filestruct **)&top, &top_x,
+		mark_order((const filestruct **)&top, &top_x,
 			(const filestruct **)&bot, &bot_x,
 			&right_side_up);
 
-		    single_line = (top == bot);
-		}
+		single_line = (top == bot);
+	    }
 #endif
 
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 	    if (!ISSET(MULTIBUFFER)) {
 #endif
 		/* If we're not inserting into a new buffer, partition
@@ -937,7 +1175,7 @@ void do_insertfile(
 			openfile->current_x);
 		edittop_inside =
 			(openfile->edittop == openfile->fileage);
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 	    }
 #endif
 
@@ -948,7 +1186,7 @@ void do_insertfile(
 
 #ifndef NANO_TINY
 	    if (execute) {
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 		if (ISSET(MULTIBUFFER))
 		    /* Open a blank buffer. */
 		    open_buffer("", FALSE);
@@ -957,7 +1195,7 @@ void do_insertfile(
 		/* Save the command's output in the current buffer. */
 		execute_command(answer);
 
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 		if (ISSET(MULTIBUFFER)) {
 		    /* Move back to the beginning of the first line of
 		     * the buffer. */
@@ -980,12 +1218,20 @@ void do_insertfile(
 	    }
 #endif
 
-#ifdef ENABLE_MULTIBUFFER
-	    if (ISSET(MULTIBUFFER))
+#if !defined(DISABLE_MULTIBUFFER) && !defined(DISABLE_HISTORIES)
+	    if (ISSET(MULTIBUFFER)) {
 		/* Update the screen to account for the current
 		 * buffer. */
 		display_buffer();
-	    else
+
+		ssize_t savedposline, savedposcol;
+		if (ISSET(POS_HISTORY) &&
+#ifndef NANO_TINY
+			!execute &&
+#endif
+			check_poshistory(answer, &savedposline, &savedposcol))
+		    do_gotolinecolumn(savedposline, savedposcol, FALSE, FALSE, FALSE, FALSE);
+	    } else
 #endif
 	    {
 		filestruct *top_save = openfile->fileage;
@@ -1056,8 +1302,6 @@ void do_insertfile(
 	    break;
 	}
     }
-    shortcut_init(FALSE);
-
     free(ans);
 }
 
@@ -1066,13 +1310,12 @@ void do_insertfile(
  * allow inserting a file into a new buffer. */
 void do_insertfile_void(void)
 {
-
     if (ISSET(RESTRICTED)) {
-        nano_disabled_msg();
+	nano_disabled_msg();
 	return;
     }
 
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
     if (ISSET(VIEW_MODE) && !ISSET(MULTIBUFFER))
 	statusbar(_("Key invalid in non-multibuffer mode"));
     else
@@ -1100,7 +1343,7 @@ char *get_full_path(const char *origpath)
     bool path_only;
 
     if (origpath == NULL)
-    	return NULL;
+	return NULL;
 
     /* Get the current directory.  If it doesn't exist, back up and try
      * again until we get a directory that does, and use that as the
@@ -1366,6 +1609,22 @@ bool check_operating_dir(const char *currpath, bool allow_tabcomp)
 #endif
 
 #ifndef NANO_TINY
+/* Although this sucks, it sucks less than having a single 'my system is
+ * messed up and I'm blanket allowing insecure file writing operations'. */
+int prompt_failed_backupwrite(const char *filename)
+{
+    static int i;
+    static char *prevfile = NULL; /* What was the last file we were
+                                   * passed so we don't keep asking
+                                   * this?  Though maybe we should... */
+    if (prevfile == NULL || strcmp(filename, prevfile)) {
+	i = do_yesno_prompt(FALSE,
+                         _("Failed to write backup file, continue saving? (Say N if unsure) "));
+	prevfile = mallocstrcpy(prevfile, filename);
+    }
+    return i;
+}
+
 void init_backup_dir(void)
 {
     char *full_backup_dir;
@@ -1387,7 +1646,7 @@ void init_backup_dir(void)
 	backup_dir = full_backup_dir;
     }
 }
-#endif
+#endif /* !NANO_TINY */
 
 /* Read from inn, write to out.  We assume inn is opened for reading,
  * and out for writing.  We return 0 on success, -1 on read error, or -2
@@ -1447,12 +1706,14 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 	/* The file descriptor we use. */
     mode_t original_umask = 0;
 	/* Our umask, from when nano started. */
+#ifndef NANO_TINY
     bool realexists;
 	/* The result of stat().  TRUE if the file exists, FALSE
 	 * otherwise.  If name is a link that points nowhere, realexists
 	 * is FALSE. */
     struct stat st;
 	/* The status fields filled in by stat(). */
+#endif
     bool anyexists;
 	/* The result of lstat().  The same as realexists, unless name
 	 * is a link. */
@@ -1464,7 +1725,6 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 	/* The actual file, realname, we are writing to. */
     char *tempname = NULL;
 	/* The temp file name we write to on prepend. */
-    int backup_cflags;
 
     assert(name != NULL);
 
@@ -1502,17 +1762,18 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 	goto cleanup_and_exit;
     }
 
-    /* Save the state of the file at the end of the symlink (if there is
-     * one). */
+#ifndef NANO_TINY
+    /* Check whether the file (at the end of the symlink) exists. */
     realexists = (stat(realname, &st) != -1);
 
-#ifndef NANO_TINY
-    /* if we have not stat()d this file before (say, the user just
-     * specified it interactively), stat and save the value
-     * or else we will chase null pointers when we do
-     * modtime checks, preserve file times, etc. during backup */
-    if (openfile->current_stat == NULL && !tmp && realexists)
+    /* If we haven't stat()d this file before (say, the user just
+     * specified it interactively), stat and save the value now,
+     * or else we will chase null pointers when we do modtime checks,
+     * preserve file times, and so on, during backup. */
+    if (openfile->current_stat == NULL && !tmp && realexists) {
+	openfile->current_stat = (struct stat *)nmalloc(sizeof(struct stat));
 	stat(realname, openfile->current_stat);
+    }
 
     /* We backup only if the backup toggle is set, the file isn't
      * temporary, and the file already exists.  Furthermore, if we
@@ -1527,6 +1788,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 	char *backupname;
 	struct utimbuf filetime;
 	int copy_status;
+	int backup_cflags;
 
 	/* Save the original file's access and modification times. */
 	filetime.actime = openfile->current_stat->st_atime;
@@ -1582,10 +1844,11 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 		    _("Too many backup files?"));
 		free(backuptemp);
 		free(backupname);
-		/* If we can't write to the backup, DONT go on, since
-		   whatever caused the backup file to fail (e.g. disk
-		   full may well cause the real file write to fail, which
-		   means we could lose both the backup and the original! */
+		/* If we can't write to the backup, DON'T go on, since
+		 * whatever caused the backup file to fail (e.g. disk
+		 * full may well cause the real file write to fail,
+		 * which means we could lose both the backup and the
+		 * original! */
 		goto cleanup_and_exit;
 	    } else {
 		free(backupname);
@@ -1597,9 +1860,11 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 	}
 
 	/* First, unlink any existing backups.  Next, open the backup
-	   file with O_CREAT and O_EXCL.  If it succeeds, we
-	   have a file descriptor to a new backup file. */
+	 * file with O_CREAT and O_EXCL.  If it succeeds, we have a file
+	 * descriptor to a new backup file. */
 	if (unlink(backupname) < 0 && errno != ENOENT && !ISSET(INSECURE_BACKUP)) {
+	    if (prompt_failed_backupwrite(backupname))
+		goto skip_backup;
 	    statusbar(_("Error writing backup file %s: %s"), backupname,
 			strerror(errno));
 	    free(backupname);
@@ -1608,13 +1873,13 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 
 	if (ISSET(INSECURE_BACKUP))
 	    backup_cflags = O_WRONLY | O_CREAT | O_APPEND;
-        else
+	else
 	    backup_cflags = O_WRONLY | O_CREAT | O_EXCL | O_APPEND;
 
 	backup_fd = open(backupname, backup_cflags,
 		S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
 	/* Now we've got a safe file stream.  If the previous open()
-	   call failed, this will return NULL. */
+	 * call failed, this will return NULL. */
 	backup_file = fdopen(backup_fd, "wb");
 
 	if (backup_fd < 0 || backup_file == NULL) {
@@ -1624,11 +1889,13 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 	    goto cleanup_and_exit;
 	}
 
-        /* We shouldn't worry about chown()ing something if we're not
-	   root, since it's likely to fail! */
+	/* We shouldn't worry about chown()ing something if we're not
+	 * root, since it's likely to fail! */
 	if (geteuid() == NANO_ROOT_UID && fchown(backup_fd,
 		openfile->current_stat->st_uid, openfile->current_stat->st_gid) == -1
-                && !ISSET(INSECURE_BACKUP)) {
+		&& !ISSET(INSECURE_BACKUP)) {
+	    if (prompt_failed_backupwrite(backupname))
+		goto skip_backup;
 	    statusbar(_("Error writing backup file %s: %s"), backupname,
 		strerror(errno));
 	    free(backupname);
@@ -1636,7 +1903,10 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 	    goto cleanup_and_exit;
 	}
 
-	if (fchmod(backup_fd, openfile->current_stat->st_mode) == -1 && !ISSET(INSECURE_BACKUP)) {
+	if (fchmod(backup_fd, openfile->current_stat->st_mode) == -1
+		&& !ISSET(INSECURE_BACKUP)) {
+	    if (prompt_failed_backupwrite(backupname))
+		goto skip_backup;
 	    statusbar(_("Error writing backup file %s: %s"), backupname,
 		strerror(errno));
 	    free(backupname);
@@ -1664,12 +1934,14 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 
 	/* And set its metadata. */
 	if (utime(backupname, &filetime) == -1 && !ISSET(INSECURE_BACKUP)) {
+	    if (prompt_failed_backupwrite(backupname))
+		goto skip_backup;
 	    statusbar(_("Error writing backup file %s: %s"), backupname,
 			strerror(errno));
-	    /* If we can't write to the backup, DONT go on, since
-	       whatever caused the backup file to fail (e.g. disk
-	       full may well cause the real file write to fail, which
-	       means we could lose both the backup and the original! */
+	    /* If we can't write to the backup, DON'T go on, since
+	     * whatever caused the backup file to fail (e.g. disk full
+	     * may well cause the real file write to fail, which means
+	     * we could lose both the backup and the original! */
 	    goto cleanup_and_exit;
 	}
 
@@ -1874,7 +2146,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 	if (!nonamechange) {
 	    openfile->filename = mallocstrcpy(openfile->filename,
 		realname);
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 	    /* We might have changed the filename, so update the colors
 	     * to account for it, and then make sure we're using
 	     * them. */
@@ -1894,7 +2166,8 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
 	if (openfile->current_stat == NULL)
 	    openfile->current_stat =
 		(struct stat *)nmalloc(sizeof(struct stat));
-	stat(realname, openfile->current_stat);
+	if (!openfile->mark_set)
+	    stat(realname, openfile->current_stat);
 #endif
 
 	statusbar(P_("Wrote %lu line", "Wrote %lu lines",
@@ -1960,23 +2233,24 @@ bool write_marked_file(const char *name, FILE *f_open, bool tmp,
 
     return retval;
 }
+
 #endif /* !NANO_TINY */
 
 /* Write the current file to disk.  If the mark is on, write the current
  * marked selection to disk.  If exiting is TRUE, write the file to disk
  * regardless of whether the mark is on, and without prompting if the
- * TEMP_FILE flag is set.  Return TRUE on success or FALSE on error. */
+ * TEMP_FILE flag is set and the current file has a name.  Return TRUE
+ * on success or FALSE on error. */
 bool do_writeout(bool exiting)
 {
     int i;
     append_type append = OVERWRITE;
     char *ans;
 	/* The last answer the user typed at the statusbar prompt. */
-#ifdef NANO_EXTRA
+#ifndef DISABLE_EXTRA
     static bool did_credits = FALSE;
 #endif
-    bool retval = FALSE, meta_key = FALSE, func_key = FALSE;
-    const sc *s;
+    bool retval = FALSE;
 
     currmenu = MWRITEFILE;
 
@@ -2030,8 +2304,7 @@ bool do_writeout(bool exiting)
 		TRUE,
 #endif
 		MWRITEFILE, ans,
-		&meta_key, &func_key,
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
 		NULL,
 #endif
 		edit_refresh, "%s%s%s", msg,
@@ -2049,11 +2322,12 @@ bool do_writeout(bool exiting)
 	    retval = FALSE;
 	    break;
 	} else {
+	    functionptrtype func = func_from_key(&i);
+
 	    ans = mallocstrcpy(ans, answer);
-            s = get_shortcut(currmenu, &i, &meta_key, &func_key);
 
 #ifndef DISABLE_BROWSER
-	    if (s && s->scfunc == TO_FILES_MSG) {
+	    if (func == to_files_void) {
 		char *tmp = do_browse_from(answer);
 
 		if (tmp == NULL)
@@ -2065,26 +2339,26 @@ bool do_writeout(bool exiting)
 	    } else
 #endif /* !DISABLE_BROWSER */
 #ifndef NANO_TINY
-	    if (s && s->scfunc ==  DOS_FORMAT_MSG) {
+	    if (func == dos_format_void) {
 		openfile->fmt = (openfile->fmt == DOS_FILE) ? NIX_FILE :
 			DOS_FILE;
 		continue;
-	    } else if (s && s->scfunc ==  MAC_FORMAT_MSG) {
+	    } else if (func == mac_format_void) {
 		openfile->fmt = (openfile->fmt == MAC_FILE) ? NIX_FILE :
 			MAC_FILE;
 		continue;
-	    } else if (s && s->scfunc ==  BACKUP_FILE_MSG) {
+	    } else if (func == backup_file_void) {
 		TOGGLE(BACKUP_FILE);
 		continue;
 	    } else
 #endif /* !NANO_TINY */
-	    if (s && s->scfunc ==  PREPEND_MSG) {
+	    if (func == prepend_void) {
 		append = (append == PREPEND) ? OVERWRITE : PREPEND;
 		continue;
-	    } else if (s && s->scfunc ==  APPEND_MSG) {
+	    } else if (func == append_void) {
 		append = (append == APPEND) ? OVERWRITE : APPEND;
 		continue;
-	    } else if (s && s->scfunc == DO_HELP_VOID) {
+	    } else if (func == do_help_void) {
 		continue;
 	    }
 
@@ -2092,7 +2366,7 @@ bool do_writeout(bool exiting)
 	    fprintf(stderr, "filename is %s\n", answer);
 #endif
 
-#ifdef NANO_EXTRA
+#ifndef DISABLE_EXTRA
 	    /* If the current file has been modified, we've pressed
 	     * Ctrl-X at the edit window to exit, we've pressed "y" at
 	     * the "Save modified buffer" prompt to save, we've entered
@@ -2165,10 +2439,13 @@ bool do_writeout(bool exiting)
 		    }
 		}
 #ifndef NANO_TINY
-		/* Complain if the file exists, the name hasn't changed, and the
-		    stat information we had before does not match what we have now */
-		else if (name_exists && openfile->current_stat && (openfile->current_stat->st_mtime < st.st_mtime ||
-                    openfile->current_stat->st_dev != st.st_dev || openfile->current_stat->st_ino != st.st_ino)) {
+		/* Complain if the file exists, the name hasn't changed,
+		 * and the stat information we had before does not match
+		 * what we have now. */
+		else if (name_exists && openfile->current_stat &&
+			(openfile->current_stat->st_mtime < st.st_mtime ||
+			openfile->current_stat->st_dev != st.st_dev ||
+			openfile->current_stat->st_ino != st.st_ino)) {
 		    i = do_yesno_prompt(FALSE,
 			_("File was modified since you opened it, continue saving ? "));
 		    if (i == 0 || i == -1)
@@ -2275,7 +2552,7 @@ int diralphasort(const void *va, const void *vb)
     /* Standard function brain damage: We should be sorting
      * alphabetically and case-insensitively according to the current
      * locale, but there's no standard strcasecoll() function, so we
-     * have to use multibyte strcasecmp() instead, */
+     * have to use multibyte strcasecmp() instead. */
     return mbstrcasecmp(a, b);
 }
 
@@ -2372,9 +2649,6 @@ char **cwd_tab_completion(const char *buf, bool allow_files, size_t
 	*num_matches, size_t buf_len)
 {
     char *dirname = mallocstrcpy(NULL, buf), *filename;
-#ifndef DISABLE_OPERATINGDIR
-    size_t dirnamelen;
-#endif
     size_t filenamelen;
     char **matches = NULL;
     DIR *dir;
@@ -2413,9 +2687,6 @@ char **cwd_tab_completion(const char *buf, bool allow_files, size_t
 	return NULL;
     }
 
-#ifndef DISABLE_OPERATINGDIR
-    dirnamelen = strlen(dirname);
-#endif
     filenamelen = strlen(filename);
 
     while ((nextdir = readdir(dir)) != NULL) {
@@ -2656,29 +2927,96 @@ const char *tail(const char *foo)
     return tmp;
 }
 
-#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
-/* Return $HOME/.nano_history, or NULL if we can't find the home
+#ifndef DISABLE_HISTORIES
+/* Return the constructed dirfile path, or NULL if we can't find the home
  * directory.  The string is dynamically allocated, and should be
  * freed. */
-char *histfilename(void)
+char *construct_filename(const char *str)
 {
-    char *nanohist = NULL;
+    char *newstr = NULL;
 
     if (homedir != NULL) {
 	size_t homelen = strlen(homedir);
 
-	nanohist = charalloc(homelen + 15);
-	strcpy(nanohist, homedir);
-	strcpy(nanohist + homelen, "/.nano_history");
+	newstr = charalloc(homelen + strlen(str) + 1);
+	strcpy(newstr, homedir);
+	strcpy(newstr + homelen, str);
     }
 
-    return nanohist;
+    return newstr;
+}
+
+char *histfilename(void)
+{
+    return construct_filename("/.nano/search_history");
+}
+
+/* Construct the legacy history filename.
+ * (Deprecate in 2.5, delete later.) */
+char *legacyhistfilename(void)
+{
+    return construct_filename("/.nano_history");
+}
+
+char *poshistfilename(void)
+{
+    return construct_filename("/.nano/filepos_history");
 }
 
-/* Load histories from ~/.nano_history. */
+void history_error(const char *msg, ...)
+{
+    va_list ap;
+
+    va_start(ap, msg);
+    vfprintf(stderr, _(msg), ap);
+    va_end(ap);
+
+    fprintf(stderr, _("\nPress Enter to continue\n"));
+    while (getchar() != '\n')
+	;
+}
+
+/* Now that we have more than one history file, let's just rely on a
+ * .nano dir for this stuff.  Return 1 if the dir exists or was
+ * successfully created, and return 0 otherwise. */
+int check_dotnano(void)
+{
+    struct stat dirstat;
+    char *nanodir = construct_filename("/.nano");
+
+    if (stat(nanodir, &dirstat) == -1) {
+	if (mkdir(nanodir, S_IRWXU | S_IRWXG | S_IRWXO) == -1) {
+	    history_error(N_("Unable to create directory %s: %s\n"
+			     "It is required for saving/loading search history or cursor positions.\n"),
+				nanodir, strerror(errno));
+	    return 0;
+	}
+    } else if (!S_ISDIR(dirstat.st_mode)) {
+	history_error(N_("Path %s is not a directory and needs to be.\n"
+			 "Nano will be unable to load or save search history or cursor positions.\n"),
+				nanodir);
+	return 0;
+    }
+    return 1;
+}
+
+/* Load the search and replace histories from ~/.nano/search_history. */
 void load_history(void)
 {
     char *nanohist = histfilename();
+    char *legacyhist = legacyhistfilename();
+    struct stat hstat;
+
+    if (stat(legacyhist, &hstat) != -1 && stat(nanohist, &hstat) == -1) {
+	if (rename(legacyhist, nanohist) == -1)
+	    history_error(N_("Detected a legacy nano history file (%s) which I tried to move\n"
+			     "to the preferred location (%s) but encountered an error: %s"),
+				legacyhist, nanohist, strerror(errno));
+	else
+	    history_error(N_("Detected a legacy nano history file (%s) which I moved\n"
+			     "to the preferred location (%s)\n(see the nano FAQ about this change)"),
+				legacyhist, nanohist);
+    }
 
     /* Assume do_rcfile() has reported a missing home directory. */
     if (nanohist != NULL) {
@@ -2688,12 +3026,8 @@ void load_history(void)
 	    if (errno != ENOENT) {
 		/* Don't save history when we quit. */
 		UNSET(HISTORYLOG);
-		rcfile_error(N_("Error reading %s: %s"), nanohist,
+		history_error(N_("Error reading %s: %s"), nanohist,
 			strerror(errno));
-		fprintf(stderr,
-			_("\nPress Enter to continue starting nano.\n"));
-		while (getchar() != '\n')
-		    ;
 	    }
 	} else {
 	    /* Load a history list (first the search history, then the
@@ -2718,8 +3052,11 @@ void load_history(void)
 
 	    fclose(hist);
 	    free(line);
+	    if (search_history->prev != NULL)
+		last_search = mallocstrcpy(NULL, search_history->prev->data);
 	}
 	free(nanohist);
+	free(legacyhist);
     }
 }
 
@@ -2745,7 +3082,7 @@ bool writehist(FILE *hist, filestruct *h)
     return TRUE;
 }
 
-/* Save histories to ~/.nano_history. */
+/* Save the search and replace histories to ~/.nano/search_history. */
 void save_history(void)
 {
     char *nanohist;
@@ -2761,7 +3098,7 @@ void save_history(void)
 	FILE *hist = fopen(nanohist, "wb");
 
 	if (hist == NULL)
-	    rcfile_error(N_("Error writing %s: %s"), nanohist,
+	    history_error(N_("Error writing %s: %s"), nanohist,
 		strerror(errno));
 	else {
 	    /* Make sure no one else can read from or write to the
@@ -2770,7 +3107,7 @@ void save_history(void)
 
 	    if (!writehist(hist, searchage) || !writehist(hist,
 		replaceage))
-		rcfile_error(N_("Error writing %s: %s"), nanohist,
+		history_error(N_("Error writing %s: %s"), nanohist,
 			strerror(errno));
 
 	    fclose(hist);
@@ -2779,4 +3116,155 @@ void save_history(void)
 	free(nanohist);
     }
 }
-#endif /* !NANO_TINY && ENABLE_NANORC */
+
+/* Save the recorded last file positions to ~/.nano/filepos_history. */
+void save_poshistory(void)
+{
+    char *poshist;
+    char *statusstr = NULL;
+    poshiststruct *posptr;
+
+    poshist = poshistfilename();
+
+    if (poshist != NULL) {
+	FILE *hist = fopen(poshist, "wb");
+
+	if (hist == NULL)
+	    history_error(N_("Error writing %s: %s"), poshist,
+		strerror(errno));
+	else {
+	    /* Make sure no one else can read from or write to the
+	     * history file. */
+	    chmod(poshist, S_IRUSR | S_IWUSR);
+
+	    for (posptr = poshistory; posptr != NULL; posptr = posptr->next) {
+		statusstr = charalloc(strlen(posptr->filename) + 2 * sizeof(ssize_t) + 4);
+		sprintf(statusstr, "%s %ld %ld\n", posptr->filename, (long)posptr->lineno,
+			(long)posptr->xno);
+		if (fwrite(statusstr, sizeof(char), strlen(statusstr), hist) < strlen(statusstr))
+		    history_error(N_("Error writing %s: %s"), poshist,
+			strerror(errno));
+		free(statusstr);
+	    }
+	    fclose(hist);
+	}
+	free(poshist);
+    }
+}
+
+/* Update the recorded last file positions, given a filename, a line
+ * and a column.  If no entry is found, add a new one at the end. */
+void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos)
+{
+    poshiststruct *posptr, *posprev = NULL;
+    char *fullpath = get_full_path(filename);
+
+    if (fullpath == NULL)
+	return;
+
+    for (posptr = poshistory; posptr != NULL; posptr = posptr->next) {
+	if (!strcmp(posptr->filename, fullpath)) {
+	    posptr->lineno = lineno;
+	    posptr->xno = xpos;
+	    return;
+	}
+	posprev = posptr;
+    }
+
+    /* Didn't find it, make a new node yo! */
+    posptr = (poshiststruct *)nmalloc(sizeof(poshiststruct));
+    posptr->filename = mallocstrcpy(NULL, fullpath);
+    posptr->lineno = lineno;
+    posptr->xno = xpos;
+    posptr->next = NULL;
+
+    if (!poshistory)
+	poshistory = posptr;
+    else
+	posprev->next = posptr;
+
+    free(fullpath);
+}
+
+/* Check the recorded last file positions to see if the given file
+ * matches an existing entry.  If so, return 1 and set line and column
+ * to the retrieved values.  Otherwise, return 0. */
+int check_poshistory(const char *file, ssize_t *line, ssize_t *column)
+{
+    poshiststruct *posptr;
+    char *fullpath = get_full_path(file);
+
+    if (fullpath == NULL)
+	return 0;
+
+    for (posptr = poshistory; posptr != NULL; posptr = posptr->next) {
+	if (!strcmp(posptr->filename, fullpath)) {
+	    *line = posptr->lineno;
+	    *column = posptr->xno;
+	    free(fullpath);
+	    return 1;
+	}
+    }
+    free(fullpath);
+    return 0;
+}
+
+/* Load the recorded file positions from ~/.nano/filepos_history. */
+void load_poshistory(void)
+{
+    char *nanohist = poshistfilename();
+
+    /* Assume do_rcfile() has reported a missing home directory. */
+    if (nanohist != NULL) {
+	FILE *hist = fopen(nanohist, "rb");
+
+	if (hist == NULL) {
+	    if (errno != ENOENT) {
+		/* Don't save history when we quit. */
+		UNSET(POS_HISTORY);
+		history_error(N_("Error reading %s: %s"), nanohist,
+			strerror(errno));
+	    }
+	} else {
+	    char *line = NULL, *lineptr, *xptr;
+	    size_t buf_len = 0;
+	    ssize_t read, lineno, xno;
+	    poshiststruct *posptr;
+
+	    /* Read and parse each line, and put the data into the
+	     * positions history structure. */
+	    while ((read = getline(&line, &buf_len, hist)) >= 0) {
+		if (read > 0 && line[read - 1] == '\n') {
+		    read--;
+		    line[read] = '\0';
+		}
+		if (read > 0)
+		    unsunder(line, read);
+		lineptr = parse_next_word(line);
+		xptr = parse_next_word(lineptr);
+		lineno = atoi(lineptr);
+		xno = atoi(xptr);
+		if (poshistory == NULL) {
+		    poshistory = (poshiststruct *)nmalloc(sizeof(poshiststruct));
+		    poshistory->filename = mallocstrcpy(NULL, line);
+		    poshistory->lineno = lineno;
+		    poshistory->xno = xno;
+		    poshistory->next = NULL;
+		} else {
+		    for (posptr = poshistory; posptr->next != NULL; posptr = posptr->next)
+			;
+		    posptr->next = (poshiststruct *)nmalloc(sizeof(poshiststruct));
+		    posptr->next->filename = mallocstrcpy(NULL, line);
+		    posptr->next->lineno = lineno;
+		    posptr->next->xno = xno;
+		    posptr->next->next = NULL;
+		}
+	    }
+
+	    fclose(hist);
+	    free(line);
+	}
+	free(nanohist);
+    }
+}
+#endif /* !DISABLE_HISTORIES */
diff --git a/src/global.c b/src/global.c
index ae14a49..9e7fec8 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1,9 +1,9 @@
-/* $Id: global.c 4520 2010-11-12 06:23:14Z astyanax $ */
+/* $Id: global.c 5143 2015-03-20 12:22:49Z bens $ */
 /**************************************************************************
  *   global.c                                                             *
  *                                                                        *
  *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009 Free Software Foundation, Inc.                            *
+ *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -38,6 +38,11 @@ bool jump_buf_main = FALSE;
 	 * SIGWINCH? */
 #endif
 
+bool meta_key;
+	/* Whether the current keystroke is a Meta key. */
+bool func_key;
+	/* Whether the current keystroke is an extended keypad value. */
+
 #ifndef DISABLE_WRAPJUSTIFY
 ssize_t fill = 0;
 	/* The column where we will wrap lines. */
@@ -67,7 +72,7 @@ WINDOW *bottomwin;
 int editwinrows = 0;
 	/* How many rows does the edit window take up? */
 int maxrows = 0;
-	/* How many usable lines are there (due to soft wrapping) */
+	/* How many usable lines there are (due to soft wrapping). */
 
 filestruct *cutbuffer = NULL;
 	/* The buffer where we store cut text. */
@@ -88,7 +93,7 @@ char *matchbrackets = NULL;
 	 * searches. */
 #endif
 
-#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
+#if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
 char *whitespace = NULL;
 	/* The characters used when displaying the first characters of
 	 * tabs and spaces. */
@@ -118,7 +123,7 @@ size_t quotelen;
 #endif
 
 bool nodelay_mode = FALSE;
-	/* Are we in nodelay mode (checking for a cancel wile doing something */
+	/* Are we checking for a cancel wile doing something? */
 
 char *answer = NULL;
 	/* The answer string used by the statusbar prompt. */
@@ -130,6 +135,11 @@ ssize_t tabsize = -1;
 #ifndef NANO_TINY
 char *backup_dir = NULL;
 	/* The directory where we store backup files. */
+
+const char *locking_prefix = ".";
+        /* Prefix of how to store the vim-style lock file. */
+const char *locking_suffix = ".swp";
+        /* Suffix of the vim-style lock file. */
 #endif
 #ifndef DISABLE_OPERATINGDIR
 char *operating_dir = NULL;
@@ -144,29 +154,31 @@ char *alt_speller = NULL;
 	/* The command to use for the alternate spell checker. */
 #endif
 
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 syntaxtype *syntaxes = NULL;
 	/* The global list of color syntaxes. */
 char *syntaxstr = NULL;
 	/* The color syntax name specified on the command line. */
-
 #endif
 
-bool edit_refresh_needed = NULL;
-	/* Did a command mangle enough of the buffer refresh that we 
-	   should repaint the screen */
+bool edit_refresh_needed = FALSE;
+	/* Did a command mangle enough of the buffer refresh that we
+	 * should repaint the screen? */
 
-const shortcut *currshortcut;
-	/* The current shortcut list we're using. */
 int currmenu;
-	/* The currently loaded menu */
-
+	/* The currently loaded menu. */
 sc *sclist = NULL;
-	/* New shortcut key struct */
+	/* Pointer to the start of the shortcuts list. */
 subnfunc *allfuncs = NULL;
-	/* New struct for the function list */
-
-#ifndef NANO_TINY
+	/* Pointer to the start of the functions list. */
+subnfunc *tailfunc;
+	/* Pointer to the last function in the list. */
+subnfunc *exitfunc;
+	/* Pointer to the special Exit/Close item. */
+subnfunc *uncutfunc;
+	/* Pointer to the special Uncut/Unjustify item. */
+
+#ifndef DISABLE_HISTORIES
 filestruct *search_history = NULL;
 	/* The search string history list. */
 filestruct *searchage = NULL;
@@ -179,6 +191,8 @@ filestruct *replaceage = NULL;
 	/* The top of the replace string history list. */
 filestruct *replacebot = NULL;
 	/* The bottom of the replace string history list. */
+poshiststruct *poshistory;
+	/* The cursor position history list. */
 #endif
 
 /* Regular expressions. */
@@ -190,13 +204,19 @@ regmatch_t regmatches[10];
 	 * maximum, used in regular expression searches. */
 #endif
 
-int reverse_attr = A_REVERSE;
+int hilite_attribute = A_REVERSE;
 	/* The curses attribute we use for reverse video. */
+#ifndef DISABLE_COLOR
+char* specified_color_combo[] = {};
+	/* The color combinations as specified in the rcfile. */
+#endif
+color_pair interface_color_pair[] = {};
+	/* The processed color pairs for the interface elements. */
 
 char *homedir = NULL;
 	/* The user's home directory, from $HOME or /etc/passwd. */
 
-/* Return the number of entries in the shortcut list s for a given menu. */
+/* Return the number of entries in the shortcut list for a given menu. */
 size_t length_of_list(int menu)
 {
     subnfunc *f;
@@ -213,35 +233,70 @@ size_t length_of_list(int menu)
     return i;
 }
 
-/* Set type of function based on the string */
-function_type strtokeytype(const char *str)
+/* To make the functions and shortcuts lists clearer. */
+#define VIEW  TRUE		/* Is allowed in view mode. */
+#define NOVIEW  FALSE
+#define BLANKAFTER  TRUE	/* A blank line after this one. */
+#define TOGETHER  FALSE
+
+/* Just throw this here. */
+void case_sens_void(void)
+{
+}
+void regexp_void(void)
+{
+}
+void backwards_void(void)
+{
+}
+void gototext_void(void)
+{
+}
+#ifndef DISABLE_BROWSER
+void to_files_void(void)
+{
+}
+void goto_dir_void(void)
+{
+}
+#endif
+void dos_format_void(void)
+{
+}
+void mac_format_void(void)
+{
+}
+void append_void(void)
+{
+}
+void prepend_void(void)
+{
+}
+void backup_file_void(void)
+{
+}
+void new_buffer_void(void)
+{
+}
+void flip_replace_void(void)
+{
+}
+void flip_execute_void(void)
 {
-    if (str[0] ==  'M' || str[0] == 'm')
-        return META;
-    else if (str[0] == '^')
-        return CONTROL;
-    else if (str[0] ==  'F' || str[0] == 'F')
-        return FKEY;
-    else
-	return RAW;
 }
 
-/* Add a string to the new function list strict.
-   Does not allow updates, yet anyway */
-void add_to_funcs(short func, int menus, const char *desc, const char *help,
+/* Add a function to the function list. */
+void add_to_funcs(void (*func)(void), int menus, const char *desc, const char *help,
     bool blank_after, bool viewok)
 {
-    subnfunc *f;
+    subnfunc *f = (subnfunc *)nmalloc(sizeof(subnfunc));
+
+    if (allfuncs == NULL)
+	allfuncs = f;
+    else
+	tailfunc->next = f;
+    tailfunc = f;
 
-    if (allfuncs == NULL) {
-	allfuncs = (subnfunc *) nmalloc(sizeof(subnfunc));
-	f = allfuncs;
-    } else {
-	for (f = allfuncs; f->next != NULL; f = f->next)
-		;
-        f->next = (subnfunc *)nmalloc(sizeof(subnfunc));
-        f = f->next;
-    }
     f->next = NULL;
     f->scfunc = func;
     f->menus = menus;
@@ -253,94 +308,104 @@ void add_to_funcs(short func, int menus, const char *desc, const char *help,
 #endif
 
 #ifdef DEBUG
-    fprintf(stderr, "Added func \"%s\"", f->desc);
+    fprintf(stderr, "Added func %ld (%s) for menus %x\n", (long)func, f->desc, menus);
 #endif
 }
 
-const sc *first_sc_for(int menu, short func) {
-    const sc *s;
-    const sc *metasc = NULL;
+/* Add a key combo to the shortcut list. */
+void add_to_sclist(int menu, const char *scstring, void (*func)(void), int toggle)
+{
+    static sc *tailsc;
+    sc *s = (sc *)nmalloc(sizeof(sc));
 
-    for (s = sclist; s != NULL; s = s->next) {
-	if ((s->menu & menu) && s->scfunc == func) {
-	    /* try to use a meta sequence as a last resort.  Otherwise
-	       we will run into problems when we try and handle things like
-	       the arrow keys, home, etc, if for some reason the user bound
-	       them to a meta sequence first *shrug* */
-	    if (s->type == META) {
-		metasc = s;
-		continue;
-	    } /* otherwise it was something else, use it */
-	    return s;
-	}
-    }
+    /* Start the list, or tack on the next item. */
+    if (sclist == NULL)
+	sclist = s;
+    else
+	tailsc->next = s;
+    tailsc = s;
+    s->next = NULL;
 
-    /* If we're here we may have found only meta sequences, if so use one */
-    if (metasc)
-	return metasc;
+    /* Fill in the data. */
+    s->menu = menu;
+    s->scfunc = func;
+    s->toggle = toggle;
+    s->keystr = (char *) scstring;
+    s->type = strtokeytype(scstring);
+    assign_keyinfo(s);
 
 #ifdef DEBUG
-    fprintf(stderr, "Whoops, returning null given func %ld in menu %d\n", (long) func, menu);
+    fprintf(stderr, "Setting sequence to %d for shortcut \"%s\" in menu %x\n", s->seq, scstring, (int)s->menu);
 #endif
-    /* Otherwise... */
-    return NULL;
 }
 
-
-/* Add a string to the new shortcut list implementation
-   Allows updates to existing entries in the list */
-void add_to_sclist(int menu, const char *scstring, short func, int toggle, int execute)
+/* Assign one function's shortcuts to another function. */
+void replace_scs_for(void (*oldfunc)(void), void (*newfunc)(void))
 {
     sc *s;
 
-    if (sclist == NULL) {
-	sclist = (sc *) nmalloc(sizeof(sc));
-	s = sclist;
-        s->next = NULL;
-    } else {
-	for (s = sclist; s->next != NULL; s = s->next)
-            if (s->menu == menu && s->keystr == scstring)
-		break;
+    for (s = sclist; s != NULL; s = s->next)
+	if (s->scfunc == oldfunc)
+	    s->scfunc = newfunc;
+}
 
-        if (s->menu != menu || s->keystr != scstring) { /* i.e. this is not a replace... */
-#ifdef DEBUG
-            fprintf(stderr, "No match found...\n");
-#endif
-	    s->next = (sc *)nmalloc(sizeof(sc));
-	    s = s->next;
-            s->next = NULL;
-        }
-    }
+/* Return the first shortcut in the list of shortcuts that
+ * matches the given func in the given menu. */
+const sc *first_sc_for(int menu, void (*func)(void))
+{
+    const sc *s;
 
-    s->type = strtokeytype(scstring);
-    s->menu = menu;
-    s->toggle = toggle;
-    s->keystr = (char *) scstring;
-    s->scfunc = func;
-    s->execute = execute;
-    assign_keyinfo(s);
+    for (s = sclist; s != NULL; s = s->next)
+	if ((s->menu & menu) && s->scfunc == func)
+	    return s;
 
 #ifdef DEBUG
-    fprintf(stderr, "list val = %d\n", (int) s->menu);
-    fprintf(stderr, "Hey, set sequence to %d for shortcut \"%s\"\n", s->seq, scstring);
+    fprintf(stderr, "Whoops, returning null given func %ld in menu %x\n", (long)func, menu);
 #endif
+    /* Otherwise... */
+    return NULL;
 }
 
 /* Return the given menu's first shortcut sequence, or the default value
-  (2nd arg).  Assumes currmenu for the menu to check*/
-int sc_seq_or (short func, int defaultval) 
+ * (2nd arg).  Assumes currmenu for the menu to check. */
+int sc_seq_or(void (*func)(void), int defaultval)
 {
     const sc *s = first_sc_for(currmenu, func);
 
-    if (s)
+    if (s) {
+	meta_key = (s->type == META);
         return s->seq;
+    }
     /* else */
     return defaultval;
+}
 
+/* Return a pointer to the function that is bound to the given key. */
+functionptrtype func_from_key(int *kbinput)
+{
+    const sc *s = get_shortcut(kbinput);
+
+    if (s)
+	return s->scfunc;
+    else
+	return NULL;
+}
+
+/* Return the type of command key based on the given string. */
+key_type strtokeytype(const char *str)
+{
+    if (str[0] == '^')
+	return CONTROL;
+    else if (str[0] == 'M')
+	return META;
+    else if (str[0] == 'F')
+	return FKEY;
+    else
+	return RAWINPUT;
 }
 
-/* Assign the info to the shortcut struct 
-   Assumes keystr is already assigned, naturally */
+/* Assign the info to the shortcut struct.
+ * Assumes keystr is already assigned, naturally. */
 void assign_keyinfo(sc *s)
 {
     if (s->type == CONTROL) {
@@ -352,163 +417,102 @@ void assign_keyinfo(sc *s)
     } else if (s->type == FKEY) {
         assert(strlen(s->keystr) > 1);
         s->seq = KEY_F0 + atoi(&s->keystr[1]);
-    } else /* raw */
+    } else /* RAWINPUT */
         s->seq = (int) s->keystr[0];
 
-    /* Override some keys which don't bind as nicely as we'd like */
+    /* Override some keys which don't bind as easily as we'd like. */
     if (s->type == CONTROL && (!strcasecmp(&s->keystr[1], "space")))
 	s->seq = 0;
     else if (s->type == META && (!strcasecmp(&s->keystr[2], "space")))
 	s->seq = (int) ' ';
-    else if (s->type == RAW && (!strcasecmp(s->keystr, "kup")))
-	s->seq = KEY_UP;
-    else if (s->type == RAW && (!strcasecmp(s->keystr, "kdown")))
-	s->seq = KEY_DOWN;
-    else if (s->type == RAW && (!strcasecmp(s->keystr, "kleft")))
-	s->seq = KEY_LEFT;
-    else if (s->type == RAW && (!strcasecmp(s->keystr, "kright")))
-	s->seq = KEY_RIGHT;
-    else if (s->type == RAW && (!strcasecmp(s->keystr, "kinsert")))
-	s->seq = KEY_IC;
-    else if (s->type == RAW && (!strcasecmp(s->keystr, "kdel")))
-	s->seq = KEY_DC;
-    else if (s->type == RAW && (!strcasecmp(s->keystr, "kbsp")))
-	s->seq = KEY_BACKSPACE;
-    else if (s->type == RAW && (!strcasecmp(s->keystr, "kenter")))
-	s->seq = KEY_ENTER;
-    else if (s->type == RAW && (!strcasecmp(s->keystr, "kpup")))
-	s->seq = KEY_PPAGE;
-    else if (s->type == RAW && (!strcasecmp(s->keystr, "kpdown")))
-	s->seq = KEY_NPAGE;
+    else if (s->type == RAWINPUT) {
+	if (!strcasecmp(s->keystr, "Up"))
+	    s->seq = KEY_UP;
+	else if (!strcasecmp(s->keystr, "Down"))
+	    s->seq = KEY_DOWN;
+	else if (!strcasecmp(s->keystr, "Left"))
+	    s->seq = KEY_LEFT;
+	else if (!strcasecmp(s->keystr, "Right"))
+	    s->seq = KEY_RIGHT;
+	else if (!strcasecmp(s->keystr, "Ins"))
+	    s->seq = KEY_IC;
+	else if (!strcasecmp(s->keystr, "Del"))
+	    s->seq = KEY_DC;
+	else if (!strcasecmp(s->keystr, "Bsp"))
+	    s->seq = KEY_BACKSPACE;
+	else if (!strcasecmp(s->keystr, "Enter"))
+	    s->seq = KEY_ENTER;
+	else if (!strcasecmp(s->keystr, "PgUp"))
+	    s->seq = KEY_PPAGE;
+	else if (!strcasecmp(s->keystr, "PgDn"))
+	    s->seq = KEY_NPAGE;
 #ifdef KEY_HOME
-    else if (s->type == RAW && (!strcasecmp(s->keystr, "khome")))
-	s->seq = KEY_HOME;
+	else if (!strcasecmp(s->keystr, "Home"))
+	    s->seq = KEY_HOME;
 #endif
 #ifdef KEY_END
-    else if (s->type == RAW && (!strcasecmp(s->keystr, "kend")))
-	s->seq = KEY_END;
+	else if (!strcasecmp(s->keystr, "End"))
+	    s->seq = KEY_END;
 #endif
-
+    }
 }
 
 #ifdef DEBUG
-
 void print_sclist(void)
 {
     sc *s;
     const subnfunc *f;
 
-    for (s = sclist; s->next != NULL; s = s->next) {
+    for (s = sclist; s != NULL; s = s->next) {
 	f = sctofunc(s);
-        if (f)
-	    fprintf(stderr, "Shortcut \"%s\", function: %s, menus %d\n",  s->keystr, f->desc, f->menus);
+	if (f)
+	    fprintf(stderr, "Shortcut \"%s\", function: %s, menus %x\n", s->keystr, f->desc, f->menus);
 	else
-	    fprintf(stderr, "Hmm, didnt find a func for \"%s\"\n", s->keystr);
+	    fprintf(stderr, "Hmm, didn't find a func for \"%s\"\n", s->keystr);
     }
-
 }
 #endif
 
-
-/* Stuff we need to make at least static here so we can access it below */
-/* TRANSLATORS: Try to keep the next five strings at most 10 characters. */
-const char *cancel_msg = N_("Cancel");
-const char *replace_msg = N_("Replace");
-const char *no_replace_msg = N_("No Replace");
-
+/* TRANSLATORS: Try to keep the next four strings at most 10 characters. */
+const char *exit_tag = N_("Exit");
+const char *close_tag = N_("Close");
+const char *uncut_tag = N_("Uncut Text");
+#ifndef DISABLE_JUSITIFY
+const char *unjust_tag = N_("Unjustify");
+#endif
 #ifndef NANO_TINY
-const char *case_sens_msg = N_("Case Sens");
-const char *backwards_msg = N_("Backwards");
+/* TRANSLATORS: Try to keep this at most 12 characters. */
+const char *whereis_next_tag = N_("WhereIs Next");
 #endif
 
-#ifdef HAVE_REGEX_H
-const char *regexp_msg = N_("Regexp");
-#endif
-
-/* Stuff we want to just stun out if we're in TINY mode */
-#ifdef NANO_TINY
-const char *gototext_msg = "";
-const char *do_para_begin_msg = "";
-const char *do_para_end_msg = "";
-const char *case_sens_msg = "";
-const char *backwards_msg = "";
-const char *do_cut_till_end = "";
-const char *dos_format_msg = "";
-const char *mac_format_msg = "";
-const char *append_msg = "";
-const char *prepend_msg = "";
-const char *backup_file_msg = "";
-const char *to_files_msg = "";
-const char *first_file_msg = "";
-const char *whereis_next_msg = "";
-const char *last_file_msg = "";
-const char *new_buffer_msg = "";
-const char *goto_dir_msg;
-const char *ext_cmd_msg = "";
-
-#else
-/* TRANSLATORS: Try to keep the next five strings at most 10 characters. */
-const char *prev_history_msg = N_("PrevHstory");
-const char *next_history_msg = N_("NextHstory");
-const char *gototext_msg = N_("Go To Text");
-/* TRANSLATORS: Try to keep the next three strings at most 12 characters. */
-const char *whereis_next_msg = N_("WhereIs Next");
-#ifndef DISABLE_BROWSER
-const char *first_file_msg = N_("First File");
-const char *last_file_msg = N_("Last File");
-/* TRANSLATORS: Try to keep the next nine strings at most 16 characters. */
-const char *to_files_msg = N_("To Files");
-#endif
-const char *dos_format_msg = N_("DOS Format");
-const char *mac_format_msg = N_("Mac Format");
-const char *append_msg = N_("Append");
-const char *prepend_msg = N_("Prepend");
-const char *backup_file_msg = N_("Backup File");
-const char *ext_cmd_msg = N_("Execute Command");
-#ifdef ENABLE_MULTIBUFFER
-const char *new_buffer_msg = N_("New Buffer");
-#endif
-const char *goto_dir_msg = N_("Go To Dir");
-
-#endif /* NANO_TINY */
-
-/* Initialize all shortcut lists.  If unjustify is TRUE, replace the
- * Uncut shortcut in the main shortcut list with UnJustify. */
-void shortcut_init(bool unjustify)
+/* Initialize the list of functions and the list of shortcuts. */
+void shortcut_init(void)
 {
-    /* TRANSLATORS: Try to keep the following strings at most 10 characters. */
-    const char *get_help_msg = N_("Get Help");
-    const char *exit_msg = N_("Exit");
-    const char *whereis_msg = N_("Where Is");
-    const char *prev_page_msg = N_("Prev Page");
-    const char *next_page_msg = N_("Next Page");
-    const char *first_line_msg = N_("First Line");
-    const char *last_line_msg = N_("Last Line");
-    const char *suspend_msg = N_("Suspend");
+    /* TRANSLATORS: Try to keep the next eight strings at most 10 characters. */
+    const char *whereis_tag = N_("Where Is");
+    const char *replace_tag = N_("Replace");
+    const char *gotoline_tag = N_("Go To Line");
+    const char *prev_line_tag = N_("Prev Line");
+    const char *next_line_tag = N_("Next Line");
+    const char *read_file_tag = N_("Read File");
 #ifndef DISABLE_JUSTIFY
-    const char *beg_of_par_msg = N_("Beg of Par");
-    const char *end_of_par_msg = N_("End of Par");
-    const char *fulljstify_msg = N_("FullJstify");
-#endif
-    const char *refresh_msg = N_("Refresh");
-#ifndef NANO_TINY
-    const char *insert_file_msg =  N_("Insert File");
+    const char *fulljustify_tag = N_("FullJstify");
 #endif
-    const char *go_to_line_msg = N_("Go To Line");
+    const char *refresh_tag = N_("Refresh");
 
-#ifndef DISABLE_JUSTIFY
-    const char *nano_justify_msg = N_("Justify the current paragraph");
-#endif
 #ifndef DISABLE_HELP
+#ifndef DISABLE_JUSTIFY
     /* TRANSLATORS: The next long series of strings are shortcut descriptions;
      * they are best kept shorter than 56 characters, but may be longer. */
+    const char *nano_justify_msg = N_("Justify the current paragraph");
+#endif
     const char *nano_cancel_msg = N_("Cancel the current function");
     const char *nano_help_msg = N_("Display this help text");
     const char *nano_exit_msg =
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 	N_("Close the current file buffer / Exit from nano")
 #else
-   	N_("Exit from nano")
+	N_("Exit from nano")
 #endif
 	;
     const char *nano_writeout_msg =
@@ -517,22 +521,25 @@ void shortcut_init(bool unjustify)
 	N_("Insert another file into the current one");
     const char *nano_whereis_msg =
 	N_("Search for a string or a regular expression");
-    const char *nano_prevpage_msg = N_("Go to previous screen");
-    const char *nano_nextpage_msg = N_("Go to next screen");
+#ifndef DISABLE_BROWSER
+    const char *nano_browser_whereis_msg =
+	N_("Search for a string");
+#endif
+    const char *nano_prevpage_msg = N_("Go one screenful up");
+    const char *nano_nextpage_msg = N_("Go one screenful down");
     const char *nano_cut_msg =
 	N_("Cut the current line and store it in the cutbuffer");
     const char *nano_uncut_msg =
 	N_("Uncut from the cutbuffer into the current line");
-    const char *nano_cursorpos_msg =
-	N_("Display the position of the cursor");
-    const char *nano_spell_msg =
-	N_("Invoke the spell checker, if available");
-    const char *nano_replace_msg =
-	N_("Replace a string or a regular expression");
-     const char *nano_gotoline_msg = N_("Go to line and column number");
+    const char *nano_cursorpos_msg = N_("Display the position of the cursor");
+#ifndef DISABLE_SPELLER
+    const char *nano_spell_msg = N_("Invoke the spell checker, if available");
+#endif
+    const char *nano_replace_msg = N_("Replace a string or a regular expression");
+    const char *nano_gotoline_msg = N_("Go to line and column number");
 #ifndef NANO_TINY
-    const char *nano_mark_msg = N_("Mark text at the cursor position");
-    const char *nano_whereis_next_msg = N_("Repeat last search");
+    const char *nano_mark_msg = N_("Mark text starting from the cursor position");
+    const char *nano_whereis_next_msg = N_("Repeat the last search");
     const char *nano_copy_msg =
 	N_("Copy the current line and store it in the cutbuffer");
     const char *nano_indent_msg = N_("Indent the current line");
@@ -556,10 +563,8 @@ void shortcut_init(bool unjustify)
     const char *nano_paraend_msg =
 	N_("Go just beyond end of paragraph; then of next paragraph");
 #endif
-    const char *nano_firstline_msg =
-	N_("Go to the first line of the file");
-    const char *nano_lastline_msg =
-	N_("Go to the last line of the file");
+    const char *nano_firstline_msg = N_("Go to the first line of the file");
+    const char *nano_lastline_msg = N_("Go to the last line of the file");
 #ifndef NANO_TINY
     const char *nano_bracket_msg = N_("Go to the matching bracket");
     const char *nano_scrollup_msg =
@@ -567,24 +572,18 @@ void shortcut_init(bool unjustify)
     const char *nano_scrolldown_msg =
 	N_("Scroll down one line without scrolling the cursor");
 #endif
-#ifdef ENABLE_MULTIBUFFER
-    const char *nano_prevfile_msg =
-	N_("Switch to the previous file buffer");
-    const char *nano_nextfile_msg =
-	N_("Switch to the next file buffer");
-#endif
-    const char *nano_verbatim_msg =
-	N_("Insert the next keystroke verbatim");
-    const char *nano_tab_msg =
-	N_("Insert a tab at the cursor position");
-    const char *nano_enter_msg =
-	N_("Insert a newline at the cursor position");
-    const char *nano_delete_msg =
-	N_("Delete the character under the cursor");
+#ifndef DISABLE_MULTIBUFFER
+    const char *nano_prevfile_msg = N_("Switch to the previous file buffer");
+    const char *nano_nextfile_msg = N_("Switch to the next file buffer");
+#endif
+    const char *nano_verbatim_msg = N_("Insert the next keystroke verbatim");
+    const char *nano_tab_msg = N_("Insert a tab at the cursor position");
+    const char *nano_enter_msg = N_("Insert a newline at the cursor position");
+    const char *nano_delete_msg = N_("Delete the character under the cursor");
     const char *nano_backspace_msg =
 	N_("Delete the character to the left of the cursor");
 #ifndef NANO_TINY
-    const char *nano_cut_till_end_msg =
+    const char *nano_cut_till_eof_msg =
 	N_("Cut from the cursor position to the end of the file");
 #endif
 #ifndef DISABLE_JUSTIFY
@@ -608,7 +607,7 @@ void shortcut_init(bool unjustify)
     const char *nano_regexp_msg =
 	N_("Toggle the use of regular expressions");
 #endif
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
     const char *nano_prev_history_msg =
 	N_("Recall the previous search/replace string");
     const char *nano_next_history_msg =
@@ -620,28 +619,28 @@ void shortcut_init(bool unjustify)
 #ifndef NANO_TINY
     const char *nano_dos_msg = N_("Toggle the use of DOS format");
     const char *nano_mac_msg = N_("Toggle the use of Mac format");
-#endif
     const char *nano_append_msg = N_("Toggle appending");
     const char *nano_prepend_msg = N_("Toggle prepending");
-#ifndef NANO_TINY
-    const char *nano_backup_msg =
-	N_("Toggle backing up of the original file");
+    const char *nano_backup_msg = N_("Toggle backing up of the original file");
     const char *nano_execute_msg = N_("Execute external command");
 #endif
-#if !defined(NANO_TINY) && defined(ENABLE_MULTIBUFFER)
-    const char *nano_multibuffer_msg =
-	N_("Toggle the use of a new buffer");
+#ifndef DISABLE_MULTIBUFFER
+    const char *nano_multibuffer_msg = N_("Toggle the use of a new buffer");
 #endif
 #ifndef DISABLE_BROWSER
     const char *nano_exitbrowser_msg = N_("Exit from the file browser");
-    const char *nano_firstfile_msg =
-	N_("Go to the first file in the list");
-    const char *nano_lastfile_msg =
-	N_("Go to the last file in the list");
-    const char *nano_forwardfile_msg = N_("Go to the next file in the list");
+    const char *nano_firstfile_msg = N_("Go to the first file in the list");
+    const char *nano_lastfile_msg = N_("Go to the last file in the list");
     const char *nano_backfile_msg = N_("Go to the previous file in the list");
+    const char *nano_forwardfile_msg = N_("Go to the next file in the list");
     const char *nano_gotodir_msg = N_("Go to directory");
 #endif
+#ifndef DISABLE_COLOR
+    const char *nano_lint_msg = N_("Invoke the linter, if available");
+    const char *nano_prevlint_msg = N_("Go to previous linter msg");
+    const char *nano_nextlint_msg = N_("Go to next linter msg");
+    const char *nano_formatter_msg = N_("Invoke formatter, if available");
+#endif
 #endif /* !DISABLE_HELP */
 
 #ifndef DISABLE_HELP
@@ -652,306 +651,271 @@ void shortcut_init(bool unjustify)
 
     while (allfuncs != NULL) {
         subnfunc *f = allfuncs;
-        allfuncs = (allfuncs)->next;
+        allfuncs = allfuncs->next;
         free(f);
     }
 
-    add_to_funcs(DO_HELP_VOID,
-	(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MBROWSER|MWHEREISFILE|MGOTODIR),
-	get_help_msg, IFSCHELP(nano_help_msg), FALSE, VIEW);
+    /* Start populating the different menus with functions. */
 
-    add_to_funcs( CANCEL_MSG,
-	(MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MWHEREISFILE|MGOTODIR|MYESNO),
-	cancel_msg, IFSCHELP(nano_cancel_msg), FALSE, VIEW);
+    add_to_funcs(do_help_void, MMOST,
+	/* TRANSLATORS: Try to keep the following strings at most 10 characters. */
+	N_("Get Help"), IFSCHELP(nano_help_msg), TOGETHER, VIEW);
 
-    add_to_funcs(DO_EXIT, MMAIN,
-#ifdef ENABLE_MULTIBUFFER
-	/* TRANSLATORS: Try to keep this at most 10 characters. */
-	openfile != NULL && openfile != openfile->next ? N_("Close") :
-#endif
-	exit_msg, IFSCHELP(nano_exit_msg), FALSE, VIEW);
+    add_to_funcs(do_cancel, ((MMOST & ~MMAIN & ~MBROWSER) | MYESNO),
+	N_("Cancel"), IFSCHELP(nano_cancel_msg), TOGETHER, VIEW);
+
+    add_to_funcs(do_exit, MMAIN,
+	exit_tag, IFSCHELP(nano_exit_msg), TOGETHER, VIEW);
+    /* Remember the entry for Exit, to be able to replace it with Close. */
+    exitfunc = tailfunc;
 
 #ifndef DISABLE_BROWSER
-    add_to_funcs(DO_EXIT, MBROWSER, exit_msg, IFSCHELP(nano_exitbrowser_msg), FALSE, VIEW);
+    add_to_funcs(do_exit, MBROWSER,
+	exit_tag, IFSCHELP(nano_exitbrowser_msg), TOGETHER, VIEW);
 #endif
 
-    /* TRANSLATORS: Try to keep this at most 10 characters. */
-    add_to_funcs(DO_WRITEOUT_VOID, MMAIN, N_("WriteOut"),
-	IFSCHELP(nano_writeout_msg), FALSE, NOVIEW);
-
-#ifndef DISABLE_JUSTIFY
-    /* TRANSLATORS: Try to keep this at most 10 characters. */
-    add_to_funcs(DO_JUSTIFY_VOID, MMAIN, N_("Justify"),
-	nano_justify_msg, TRUE, NOVIEW);
-#endif
+    add_to_funcs(do_writeout_void, MMAIN,
+	N_("Write Out"), IFSCHELP(nano_writeout_msg), TOGETHER, NOVIEW);
 
     /* We allow inserting files in view mode if multibuffers are
      * available, so that we can view multiple files.  If we're using
      * restricted mode, inserting files is disabled, since it allows
      * reading from or writing to files not specified on the command
      * line. */
-
-    add_to_funcs(DO_INSERTFILE_VOID,
-	/* TRANSLATORS: Try to keep this at most 10 characters. */
-	MMAIN, N_("Read File"), IFSCHELP(nano_insert_msg), FALSE,
-#ifdef ENABLE_MULTIBUFFER
+    add_to_funcs(do_insertfile_void, MMAIN,
+	read_file_tag, IFSCHELP(nano_insert_msg), BLANKAFTER,
+#ifndef DISABLE_MULTIBUFFER
 	VIEW);
 #else
 	NOVIEW);
 #endif
 
-    add_to_funcs(DO_SEARCH, MMAIN|MBROWSER, whereis_msg,
-	IFSCHELP(nano_whereis_msg), FALSE, VIEW);
+    add_to_funcs(do_search, MMAIN,
+	whereis_tag, IFSCHELP(nano_whereis_msg), TOGETHER, VIEW);
 
-    add_to_funcs(DO_PAGE_UP, MMAIN|MHELP|MBROWSER,
-	prev_page_msg, IFSCHELP(nano_prevpage_msg), FALSE, VIEW);
-    add_to_funcs(DO_PAGE_DOWN, MMAIN|MHELP|MBROWSER,
-	next_page_msg, IFSCHELP(nano_nextpage_msg), TRUE, VIEW);
+    add_to_funcs(do_replace, MMAIN,
+	replace_tag, IFSCHELP(nano_replace_msg), TOGETHER, NOVIEW);
 
+#ifndef DISABLE_BROWSER
+    add_to_funcs(do_search, MBROWSER,
+	whereis_tag, IFSCHELP(nano_browser_whereis_msg), TOGETHER, VIEW);
 
-    /* TRANSLATORS: Try to keep this at most 10 characters. */
-    add_to_funcs(DO_CUT_TEXT_VOID, MMAIN, N_("Cut Text"), IFSCHELP(nano_cut_msg),
-	FALSE, NOVIEW);
-
-    if (unjustify)
-	/* TRANSLATORS: Try to keep this at most 10 characters. */
-	add_to_funcs(DO_UNCUT_TEXT, MMAIN, N_("UnJustify"), "",
-	    FALSE, NOVIEW);
+    add_to_funcs(goto_dir_void, MBROWSER,
+	N_("Go To Dir"), IFSCHELP(nano_gotodir_msg), BLANKAFTER, VIEW);
+#endif
 
-    else
-	/* TRANSLATORS: Try to keep this at most 10 characters. */
-	add_to_funcs(DO_UNCUT_TEXT, MMAIN, N_("UnCut Text"), IFSCHELP(nano_uncut_msg),
-	    FALSE, NOVIEW);
+#ifndef DISABLE_HELP
+    /* The description ("x") and blank_after (0) are irrelevant,
+     * because the help viewer does not have a help text. */
+    add_to_funcs(do_exit, MHELP, exit_tag, "x", 0, VIEW);
 
-#ifndef NANO_TINY
-    /* TRANSLATORS: Try to keep this at most 10 characters. */
-    add_to_funcs(DO_CURSORPOS_VOID, MMAIN, N_("Cur Pos"), IFSCHELP(nano_cursorpos_msg),
-	FALSE, VIEW);
-#endif
+    add_to_funcs(total_refresh, MHELP, refresh_tag, "x", 0, VIEW);
 
-    /* If we're using restricted mode, spell checking is disabled
-     * because it allows reading from or writing to files not specified
-     * on the command line. */
-#ifndef DISABLE_SPELLER
-	/* TRANSLATORS: Try to keep this at most 10 characters. */
-	add_to_funcs(DO_SPELL, MMAIN, N_("To Spell"), IFSCHELP(nano_spell_msg),
-	    TRUE, NOVIEW);
+    add_to_funcs(do_up_void, MHELP, prev_line_tag, "x", 0, VIEW);
+    add_to_funcs(do_down_void, MHELP, next_line_tag, "x" , 0, VIEW);
 #endif
 
-    add_to_funcs(DO_FIRST_LINE,
-	(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE),
-	first_line_msg, IFSCHELP(nano_firstline_msg), FALSE, VIEW);
+    add_to_funcs(do_cut_text_void, MMAIN,
+	N_("Cut Text"), IFSCHELP(nano_cut_msg), TOGETHER, NOVIEW);
 
-    add_to_funcs(DO_LAST_LINE,
-	(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE),
-	last_line_msg, IFSCHELP(nano_lastline_msg), TRUE, VIEW);
+    add_to_funcs(do_uncut_text, MMAIN,
+	uncut_tag, IFSCHELP(nano_uncut_msg), BLANKAFTER, NOVIEW);
+    /* Remember the entry for Uncut, to be able to replace it with Unjustify. */
+    uncutfunc = tailfunc;
 
+#ifndef DISABLE_JUSTIFY
+    add_to_funcs(do_justify_void, MMAIN,
+	N_("Justify"), IFSCHELP(nano_justify_msg), TOGETHER, NOVIEW);
+#endif
 
-    add_to_funcs(DO_GOTOLINECOLUMN_VOID, (MMAIN|MWHEREIS),
-	go_to_line_msg, IFSCHELP(nano_gotoline_msg), FALSE, VIEW);
+#ifndef DISABLE_SPELLER
+    add_to_funcs(do_spell, MMAIN,
+	N_("To Spell"), IFSCHELP(nano_spell_msg), TOGETHER, NOVIEW);
+#endif
 
-#ifdef NANO_TINY
-    /* TRANSLATORS: Try to keep this at most 10 characters. */
-    add_to_funcs(DO_CURSORPOS_VOID, MMAIN, N_("Cur Pos"), IFSCHELP(nano_cursorpos_msg),
-	FALSE, VIEW);
+#ifndef DISABLE_COLOR
+    add_to_funcs(do_linter, MMAIN,
+	N_("To Linter"), IFSCHELP(nano_lint_msg), TOGETHER, NOVIEW);
+    add_to_funcs(do_formatter, MMAIN,
+	N_("Formatter"), IFSCHELP(nano_formatter_msg), BLANKAFTER, NOVIEW);
 #endif
 
+#ifndef NANO_TINY
+    add_to_funcs(case_sens_void, MWHEREIS|MREPLACE,
+	N_("Case Sens"), IFSCHELP(nano_case_msg), TOGETHER, VIEW);
+#endif
 
-    add_to_funcs(DO_REPLACE, (MMAIN|MWHEREIS), replace_msg, IFSCHELP(nano_replace_msg),
+#ifdef HAVE_REGEX_H
+    add_to_funcs(regexp_void, MWHEREIS|MREPLACE,
+	N_("Regexp"), IFSCHELP(nano_regexp_msg), TOGETHER, VIEW);
+#endif
 
 #ifndef NANO_TINY
-	FALSE,
-#else
-	TRUE,
+    add_to_funcs(backwards_void, MWHEREIS|MREPLACE,
+	N_("Backwards"), IFSCHELP(nano_reverse_msg), TOGETHER, VIEW);
 #endif
-	NOVIEW);
 
-#ifndef NANO_TINY
+    add_to_funcs(flip_replace_void, MWHEREIS,
+	replace_tag, IFSCHELP(nano_replace_msg), TOGETHER, VIEW);
 
-    add_to_funcs(DO_MARK, MMAIN, N_("Mark Text"), 
-	IFSCHELP(nano_mark_msg), FALSE, VIEW);
+    add_to_funcs(flip_replace_void, MREPLACE,
+	N_("No Replace"), IFSCHELP(nano_whereis_msg), TOGETHER, VIEW);
 
-    add_to_funcs(DO_RESEARCH, (MMAIN|MBROWSER), whereis_next_msg,
-	IFSCHELP(nano_whereis_next_msg), TRUE, VIEW);
+#ifndef DISABLE_JUSTIFY
+    add_to_funcs(do_full_justify, MWHEREIS,
+	fulljustify_tag, IFSCHELP(nano_fulljustify_msg), TOGETHER, NOVIEW);
+#endif
 
-    add_to_funcs(DO_COPY_TEXT, MMAIN, N_("Copy Text"),
-	IFSCHELP(nano_copy_msg), FALSE, NOVIEW);
+    add_to_funcs(do_cursorpos_void, MMAIN,
+	N_("Cur Pos"), IFSCHELP(nano_cursorpos_msg), TOGETHER, VIEW);
 
-    add_to_funcs(DO_INDENT_VOID, MMAIN, N_("Indent Text"),
-	IFSCHELP(nano_indent_msg), FALSE, NOVIEW);
+#if !defined(NANO_TINY) || defined(DISABLE_COLOR)
+    /* Conditionally placing this one here or further on, to keep the
+     * help items nicely paired in most conditions. */
+    add_to_funcs(do_gotolinecolumn_void, MMAIN|MWHEREIS,
+	gotoline_tag, IFSCHELP(nano_gotoline_msg), BLANKAFTER, VIEW);
+#endif
 
-    add_to_funcs(DO_UNINDENT, MMAIN, N_("Unindent Text"),
-	IFSCHELP(nano_unindent_msg), FALSE, NOVIEW);
+    add_to_funcs(do_page_up, MMAIN|MHELP|MBROWSER,
+	N_("Prev Page"), IFSCHELP(nano_prevpage_msg), TOGETHER, VIEW);
+    add_to_funcs(do_page_down, MMAIN|MHELP|MBROWSER,
+	N_("Next Page"), IFSCHELP(nano_nextpage_msg), TOGETHER, VIEW);
 
-    if (ISSET(UNDOABLE)) {
-	add_to_funcs(DO_UNDO, MMAIN, N_("Undo"),
-	    IFSCHELP(nano_undo_msg), FALSE, NOVIEW);
+    add_to_funcs(do_first_line, MMAIN|MHELP|MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE,
+	N_("First Line"), IFSCHELP(nano_firstline_msg), TOGETHER, VIEW);
+    add_to_funcs(do_last_line, MMAIN|MHELP|MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE,
+	N_("Last Line"), IFSCHELP(nano_lastline_msg), BLANKAFTER, VIEW);
 
-	add_to_funcs(DO_REDO, MMAIN, N_("Redo"),
-	    IFSCHELP(nano_redo_msg), TRUE, NOVIEW);
-    }
+#ifndef NANO_TINY
+    add_to_funcs(do_research, MMAIN,
+	whereis_next_tag, IFSCHELP(nano_whereis_next_msg), TOGETHER, VIEW);
 
-#endif
+    add_to_funcs(do_find_bracket, MMAIN,
+	N_("To Bracket"), IFSCHELP(nano_bracket_msg), TOGETHER, VIEW);
 
-    add_to_funcs(DO_RIGHT, MMAIN, N_("Forward"), IFSCHELP(nano_forward_msg),
-	FALSE, VIEW);
+    add_to_funcs(do_mark, MMAIN,
+	N_("Mark Text"), IFSCHELP(nano_mark_msg), TOGETHER, VIEW);
 
-#ifndef DISABLE_BROWSER
-    add_to_funcs(DO_RIGHT, MBROWSER, N_("Forward"), IFSCHELP(nano_forwardfile_msg),
-	FALSE, VIEW);
-#endif
+    add_to_funcs(do_copy_text, MMAIN,
+	N_("Copy Text"), IFSCHELP(nano_copy_msg), BLANKAFTER, NOVIEW);
 
-    add_to_funcs(DO_RIGHT, MALL, "", "", FALSE, VIEW);
+    add_to_funcs(do_indent_void, MMAIN,
+	N_("Indent Text"), IFSCHELP(nano_indent_msg), TOGETHER, NOVIEW);
+    add_to_funcs(do_unindent, MMAIN,
+	N_("Unindent Text"), IFSCHELP(nano_unindent_msg), BLANKAFTER, NOVIEW);
 
-    add_to_funcs(DO_LEFT, MMAIN, N_("Back"), IFSCHELP(nano_back_msg),
-	FALSE, VIEW);
+    add_to_funcs(do_undo, MMAIN,
+	N_("Undo"), IFSCHELP(nano_undo_msg), TOGETHER, NOVIEW);
+    add_to_funcs(do_redo, MMAIN,
+	N_("Redo"), IFSCHELP(nano_redo_msg), BLANKAFTER, NOVIEW);
+#endif /* !NANO_TINY */
+
+    add_to_funcs(do_left, MMAIN,
+	N_("Back"), IFSCHELP(nano_back_msg), TOGETHER, VIEW);
+    add_to_funcs(do_right, MMAIN,
+	N_("Forward"), IFSCHELP(nano_forward_msg), TOGETHER, VIEW);
 
 #ifndef DISABLE_BROWSER
-    add_to_funcs(DO_LEFT, MBROWSER, N_("Back"), IFSCHELP(nano_backfile_msg),
-	FALSE, VIEW);
+    add_to_funcs(do_left, MBROWSER,
+	N_("Back"), IFSCHELP(nano_backfile_msg), TOGETHER, VIEW);
+    add_to_funcs(do_right, MBROWSER,
+	N_("Forward"), IFSCHELP(nano_forwardfile_msg), TOGETHER, VIEW);
 #endif
 
-    add_to_funcs(DO_LEFT, MALL, "", "", FALSE, VIEW);
-
 #ifndef NANO_TINY
-    add_to_funcs(DO_NEXT_WORD_VOID, MMAIN, N_("Next Word"),
-	IFSCHELP(nano_nextword_msg), FALSE, VIEW);
-
-    add_to_funcs(DO_PREV_WORD_VOID, MMAIN, N_("Prev Word"),
-	IFSCHELP(nano_prevword_msg), FALSE, VIEW);
+    add_to_funcs(do_prev_word_void, MMAIN,
+	N_("Prev Word"), IFSCHELP(nano_prevword_msg), TOGETHER, VIEW);
+    add_to_funcs(do_next_word_void, MMAIN,
+	N_("Next Word"), IFSCHELP(nano_nextword_msg), TOGETHER, VIEW);
 #endif
 
-    add_to_funcs(DO_UP_VOID, (MMAIN|MHELP|MBROWSER), N_("Prev Line"),
-	IFSCHELP(nano_prevline_msg), FALSE, VIEW);
-
-    add_to_funcs(DO_DOWN_VOID, (MMAIN|MHELP|MBROWSER), N_("Next Line"),
-	IFSCHELP(nano_nextline_msg), TRUE, VIEW);
-
-    add_to_funcs(DO_HOME, MMAIN, N_("Home"), IFSCHELP(nano_home_msg),
-	FALSE, VIEW);
+    add_to_funcs(do_home, MMAIN,
+	N_("Home"), IFSCHELP(nano_home_msg), TOGETHER, VIEW);
+    add_to_funcs(do_end, MMAIN,
+	N_("End"), IFSCHELP(nano_end_msg), TOGETHER, VIEW);
 
-    add_to_funcs(DO_END, MMAIN, N_("End"), IFSCHELP(nano_end_msg),
-	FALSE, VIEW);
+    add_to_funcs(do_up_void, MMAIN|MBROWSER,
+	prev_line_tag, IFSCHELP(nano_prevline_msg), TOGETHER, VIEW);
+    add_to_funcs(do_down_void, MMAIN|MBROWSER,
+	next_line_tag, IFSCHELP(nano_nextline_msg), BLANKAFTER, VIEW);
 
 #ifndef DISABLE_JUSTIFY
-    add_to_funcs(DO_PARA_BEGIN_VOID, (MMAIN|MWHEREIS), beg_of_par_msg,
-	IFSCHELP(nano_parabegin_msg), FALSE, VIEW);
-
-    add_to_funcs(DO_PARA_END_VOID, (MMAIN|MWHEREIS), end_of_par_msg,
-	IFSCHELP(nano_paraend_msg), FALSE, VIEW);
+    add_to_funcs(do_para_begin_void, MMAIN|MWHEREIS,
+	N_("Beg of Par"), IFSCHELP(nano_parabegin_msg), TOGETHER, VIEW);
+    add_to_funcs(do_para_end_void, MMAIN|MWHEREIS,
+	N_("End of Par"), IFSCHELP(nano_paraend_msg), TOGETHER, VIEW);
 #endif
 
 #ifndef NANO_TINY
-    add_to_funcs(DO_FIND_BRACKET, MMAIN, _("Find Other Bracket"),
-	IFSCHELP(nano_bracket_msg), FALSE, VIEW);
-
-    add_to_funcs(DO_SCROLL_UP, MMAIN, N_("Scroll Up"),
-	IFSCHELP(nano_scrollup_msg), FALSE, VIEW);
-
-    add_to_funcs(DO_SCROLL_DOWN, MMAIN, N_("Scroll Down"),
-	IFSCHELP(nano_scrolldown_msg), FALSE, VIEW);
-#endif
-
-#ifdef ENABLE_MULTIBUFFER
-    add_to_funcs(SWITCH_TO_PREV_BUFFER_VOID, MMAIN, _("Previous File"),
-	IFSCHELP(nano_prevfile_msg), FALSE, VIEW);
-    add_to_funcs(SWITCH_TO_NEXT_BUFFER_VOID, MMAIN, N_("Next File"),
-	IFSCHELP(nano_nextfile_msg), TRUE, VIEW);
-#endif
-
-    add_to_funcs(DO_VERBATIM_INPUT, MMAIN, N_("Verbatim Input"),
-	IFSCHELP(nano_verbatim_msg), FALSE, NOVIEW);
-    add_to_funcs(DO_VERBATIM_INPUT, MWHEREIS|MREPLACE|MREPLACE2|MEXTCMD|MSPELL,
-	"", "", FALSE, NOVIEW);
-
-    add_to_funcs(DO_TAB, MMAIN, N_("Tab"), IFSCHELP(nano_tab_msg),
-	FALSE, NOVIEW);
-    add_to_funcs(DO_TAB, MALL, "", "", FALSE, NOVIEW);
-    add_to_funcs(DO_ENTER, MMAIN, N_("Enter"), IFSCHELP(nano_enter_msg),
-	FALSE, NOVIEW);
-    add_to_funcs(DO_ENTER, MALL, "", "", FALSE, NOVIEW);
-    add_to_funcs(DO_DELETE, MMAIN, N_("Delete"), IFSCHELP(nano_delete_msg),
-	FALSE, NOVIEW);
-    add_to_funcs(DO_DELETE, MALL, "", "", FALSE, NOVIEW);
-    add_to_funcs(DO_BACKSPACE, MMAIN, N_("Backspace"), IFSCHELP(nano_backspace_msg),
-#ifndef NANO_TINY
-	FALSE,
-#else
-	TRUE,
+    add_to_funcs(do_scroll_up, MMAIN,
+	N_("Scroll Up"), IFSCHELP(nano_scrollup_msg), TOGETHER, VIEW);
+    add_to_funcs(do_scroll_down, MMAIN,
+	N_("Scroll Down"), IFSCHELP(nano_scrolldown_msg), BLANKAFTER, VIEW);
 #endif
-	NOVIEW);
 
-    add_to_funcs(DO_BACKSPACE, MALL, "", "",
-#ifndef NANO_TINY
-	FALSE,
-#else
-	TRUE,
+#ifndef DISABLE_MULTIBUFFER
+    add_to_funcs(switch_to_prev_buffer_void, MMAIN,
+	N_("Prev File"), IFSCHELP(nano_prevfile_msg), TOGETHER, VIEW);
+    add_to_funcs(switch_to_next_buffer_void, MMAIN,
+	N_("Next File"), IFSCHELP(nano_nextfile_msg), BLANKAFTER, VIEW);
 #endif
-	NOVIEW);
 
-#ifndef NANO_TINY
-    add_to_funcs(DO_CUT_TILL_END, MMAIN, N_("CutTillEnd"),
-	IFSCHELP(nano_cut_till_end_msg), TRUE, NOVIEW);
+#if defined(NANO_TINY) && !defined(DISABLE_COLOR)
+    add_to_funcs(do_gotolinecolumn_void, MMAIN|MWHEREIS,
+	gotoline_tag, IFSCHELP(nano_gotoline_msg), BLANKAFTER, VIEW);
 #endif
 
-    add_to_funcs(XON_COMPLAINT, MMAIN, "", "", FALSE, VIEW);
-    add_to_funcs(XOFF_COMPLAINT, MMAIN, "", "", FALSE, VIEW);
-
-#ifndef DISABLE_JUSTIFY
-    add_to_funcs(DO_FULL_JUSTIFY, (MMAIN|MWHEREIS), fulljstify_msg,
-	IFSCHELP(nano_fulljustify_msg), FALSE, NOVIEW);
-#endif
+    add_to_funcs(do_verbatim_input, MMAIN,
+	N_("Verbatim"), IFSCHELP(nano_verbatim_msg), TOGETHER, NOVIEW);
 
+    add_to_funcs(do_tab, MMAIN,
+	N_("Tab"), IFSCHELP(nano_tab_msg), TOGETHER, NOVIEW);
+    add_to_funcs(do_enter_void, MMAIN,
+	N_("Enter"), IFSCHELP(nano_enter_msg), TOGETHER, NOVIEW);
+    add_to_funcs(do_delete, MMAIN,
+	N_("Delete"), IFSCHELP(nano_delete_msg), TOGETHER, NOVIEW);
+    add_to_funcs(do_backspace, MMAIN,
+	N_("Backspace"), IFSCHELP(nano_backspace_msg),
 #ifndef NANO_TINY
-    add_to_funcs(DO_WORDLINECHAR_COUNT, MMAIN, N_("Word Count"),
-	IFSCHELP(nano_wordcount_msg), FALSE, VIEW);
+	TOGETHER,
+#else
+	BLANKAFTER,
 #endif
-
-    add_to_funcs(TOTAL_REFRESH, (MMAIN|MHELP), refresh_msg, 
-	IFSCHELP(nano_refresh_msg), FALSE, VIEW);
-
-    add_to_funcs(DO_SUSPEND_VOID, MMAIN, suspend_msg,
-	IFSCHELP(nano_suspend_msg), TRUE, VIEW);
+	NOVIEW);
 
 #ifndef NANO_TINY
-    add_to_funcs( CASE_SENS_MSG,
-	(MWHEREIS|MREPLACE|MWHEREISFILE),
-	case_sens_msg, IFSCHELP(nano_case_msg), FALSE, VIEW);
-
-    add_to_funcs( BACKWARDS_MSG,
-	(MWHEREIS|MREPLACE|MWHEREISFILE),
-	backwards_msg, IFSCHELP(nano_reverse_msg), FALSE, VIEW);
+    add_to_funcs(do_cut_till_eof, MMAIN,
+	N_("CutTillEnd"), IFSCHELP(nano_cut_till_eof_msg), BLANKAFTER, NOVIEW);
 #endif
 
-#ifdef HAVE_REGEX_H
-    add_to_funcs( REGEXP_MSG,
-	(MWHEREIS|MREPLACE|MWHEREISFILE),
-	regexp_msg, IFSCHELP(nano_regexp_msg), FALSE, VIEW);
+#ifndef DISABLE_JUSTIFY
+    add_to_funcs(do_full_justify, MMAIN,
+	fulljustify_tag, IFSCHELP(nano_fulljustify_msg), TOGETHER, NOVIEW);
 #endif
 
 #ifndef NANO_TINY
-    add_to_funcs( PREV_HISTORY_MSG,
-	(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE),
-	prev_history_msg, IFSCHELP(nano_prev_history_msg), FALSE, VIEW);
-
-    add_to_funcs( NEXT_HISTORY_MSG,
-	(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE),
-	next_history_msg, IFSCHELP(nano_next_history_msg), FALSE, VIEW);
+    add_to_funcs(do_wordlinechar_count, MMAIN,
+	N_("Word Count"), IFSCHELP(nano_wordcount_msg), TOGETHER, VIEW);
 #endif
 
-    add_to_funcs( NO_REPLACE_MSG, MREPLACE,
-	no_replace_msg, IFSCHELP(nano_whereis_msg), FALSE, VIEW);
+    add_to_funcs(total_refresh, MMAIN,
+	refresh_tag, IFSCHELP(nano_refresh_msg), TOGETHER, VIEW);
 
-    add_to_funcs( GOTOTEXT_MSG, MGOTOLINE,
-	gototext_msg, IFSCHELP(nano_whereis_msg), TRUE, VIEW);
+    add_to_funcs(do_suspend_void, MMAIN,
+	N_("Suspend"), IFSCHELP(nano_suspend_msg), BLANKAFTER, VIEW);
 
-#ifndef DISABLE_BROWSER
-    if (!ISSET(RESTRICTED))
-	add_to_funcs( TO_FILES_MSG,
-	    (MGOTOLINE|MINSERTFILE),
-	    to_files_msg, IFSCHELP(nano_tofiles_msg), FALSE, VIEW);
+#ifndef DISABLE_HISTORIES
+    add_to_funcs(get_history_older_void,
+	(MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE),
+	N_("PrevHstory"), IFSCHELP(nano_prev_history_msg), TOGETHER, VIEW);
+    add_to_funcs(get_history_newer_void,
+	(MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE),
+	N_("NextHstory"), IFSCHELP(nano_next_history_msg), TOGETHER, VIEW);
 #endif
 
+    add_to_funcs(gototext_void, MGOTOLINE,
+	N_("Go To Text"), IFSCHELP(nano_whereis_msg), BLANKAFTER, VIEW);
+
 #ifndef NANO_TINY
     /* If we're using restricted mode, the DOS format, Mac format,
      * append, prepend, and backup toggles are disabled.  The first and
@@ -959,393 +923,287 @@ void shortcut_init(bool unjustify)
      * and fourth are disabled because they allow writing to files not
      * specified on the command line, and the fifth is useless since
      * backups are disabled. */
-    if (!ISSET(RESTRICTED))
-        add_to_funcs( DOS_FORMAT_MSG, MWRITEFILE,
-            dos_format_msg, IFSCHELP(nano_dos_msg), FALSE, NOVIEW);
+    if (!ISSET(RESTRICTED)) {
+        add_to_funcs(dos_format_void, MWRITEFILE,
+            N_("DOS Format"), IFSCHELP(nano_dos_msg), TOGETHER, NOVIEW);
 
-    if (!ISSET(RESTRICTED))
-        add_to_funcs( MAC_FORMAT_MSG, MWRITEFILE,
-            mac_format_msg, IFSCHELP(nano_mac_msg), FALSE, NOVIEW);
+        add_to_funcs(mac_format_void, MWRITEFILE,
+            N_("Mac Format"), IFSCHELP(nano_mac_msg), TOGETHER, NOVIEW);
 
-    if (!ISSET(RESTRICTED))
-        add_to_funcs( APPEND_MSG, MWRITEFILE,
-            append_msg, IFSCHELP(nano_append_msg), FALSE, NOVIEW);
+        add_to_funcs(append_void, MWRITEFILE,
+            N_("Append"), IFSCHELP(nano_append_msg), TOGETHER, NOVIEW);
+        add_to_funcs(prepend_void, MWRITEFILE,
+            N_("Prepend"), IFSCHELP(nano_prepend_msg), TOGETHER, NOVIEW);
 
-    if (!ISSET(RESTRICTED))
-        add_to_funcs( PREPEND_MSG, MWRITEFILE,
-            prepend_msg, IFSCHELP(nano_prepend_msg), FALSE, NOVIEW);
+        add_to_funcs(backup_file_void, MWRITEFILE,
+            N_("Backup File"), IFSCHELP(nano_backup_msg), TOGETHER, NOVIEW);
+    }
 
-    if (!ISSET(RESTRICTED))
-        add_to_funcs( BACKUP_FILE_MSG, MWRITEFILE,
-            backup_file_msg, IFSCHELP(nano_backup_msg), FALSE, NOVIEW);
-#endif
+    /* If we're using restricted mode, file insertion is disabled, and
+     * thus command execution and the multibuffer toggle have no place. */
+    if (!ISSET(RESTRICTED)) {
+        add_to_funcs(flip_execute_void, MINSERTFILE,
+	    N_("Execute Command"), IFSCHELP(nano_execute_msg), TOGETHER, NOVIEW);
 
-#ifndef NANO_TINY
-    /* If we're using restricted mode, command execution is disabled.
-     * It's useless since inserting files is disabled. */
-    if (!ISSET(RESTRICTED))
-        add_to_funcs( EXT_CMD_MSG, MINSERTFILE,
-	    ext_cmd_msg, IFSCHELP(nano_execute_msg), FALSE, NOVIEW);
+        add_to_funcs(flip_execute_void, MEXTCMD,
+	    read_file_tag, IFSCHELP(nano_insert_msg), TOGETHER, NOVIEW);
 
-#ifdef ENABLE_MULTIBUFFER
-    /* If we're using restricted mode, the multibuffer toggle is
-     * disabled.  It's useless since inserting files is disabled. */
-    if (!ISSET(RESTRICTED))
-	add_to_funcs( NEW_BUFFER_MSG, MINSERTFILE,
-	new_buffer_msg, IFSCHELP(nano_multibuffer_msg), FALSE, NOVIEW);
+#ifndef DISABLE_MULTIBUFFER
+	add_to_funcs(new_buffer_void, MINSERTFILE|MEXTCMD,
+	    N_("New Buffer"), IFSCHELP(nano_multibuffer_msg), TOGETHER, NOVIEW);
 #endif
+    }
+#endif /* !NANO_TINY */
 
-    add_to_funcs(  INSERT_FILE_MSG, MEXTCMD,
-	insert_file_msg, IFSCHELP(nano_insert_msg), FALSE, VIEW);
-
-#ifdef ENABLE_MULTIBUFFER
-     add_to_funcs( NEW_BUFFER_MSG, MEXTCMD,
-	new_buffer_msg, IFSCHELP(nano_multibuffer_msg), FALSE, NOVIEW);
+#ifndef DISABLE_BROWSER
+    if (!ISSET(RESTRICTED))
+	add_to_funcs(to_files_void, MWRITEFILE|MINSERTFILE,
+	    N_("To Files"), IFSCHELP(nano_tofiles_msg), TOGETHER, VIEW);
+
+    add_to_funcs(do_first_file, (MBROWSER|MWHEREISFILE),
+	N_("First File"), IFSCHELP(nano_firstfile_msg), TOGETHER, VIEW);
+    add_to_funcs(do_last_file, (MBROWSER|MWHEREISFILE),
+	N_("Last File"), IFSCHELP(nano_lastfile_msg), TOGETHER, VIEW);
+#endif
+
+#if !defined(NANO_TINY) && !defined(DISABLE_BROWSER)
+    add_to_funcs(do_research, MBROWSER,
+	whereis_next_tag, IFSCHELP(nano_whereis_next_msg), TOGETHER, VIEW);
+#endif
+
+#ifndef DISABLE_COLOR
+    /* TRANSLATORS: Try to keep the next two strings at most 20 characters. */
+    add_to_funcs(do_page_up, MLINTER,
+	N_("Prev Lint Msg"), IFSCHELP(nano_prevlint_msg), TOGETHER, VIEW);
+    add_to_funcs(do_page_down, MLINTER,
+	N_("Next Lint Msg"), IFSCHELP(nano_nextlint_msg), TOGETHER, VIEW);
+#endif
+
+    /* Start associating key combos with functions in specific menus. */
+
+    add_to_sclist(MMOST, "^G", do_help_void, 0);
+    add_to_sclist(MMOST, "F1", do_help_void, 0);
+    add_to_sclist(MMAIN|MHELP|MBROWSER, "^X", do_exit, 0);
+    add_to_sclist(MMAIN|MHELP|MBROWSER, "F2", do_exit, 0);
+    add_to_sclist(MMAIN, "^O", do_writeout_void, 0);
+    add_to_sclist(MMAIN, "F3", do_writeout_void, 0);
+    add_to_sclist(MMAIN, "^R", do_insertfile_void, 0);
+    add_to_sclist(MMAIN, "F5", do_insertfile_void, 0);
+    add_to_sclist(MMAIN, "Ins", do_insertfile_void, 0);
+    add_to_sclist(MMAIN|MBROWSER, "^W", do_search, 0);
+    add_to_sclist(MMAIN|MBROWSER, "F6", do_search, 0);
+    add_to_sclist(MMAIN, "^\\", do_replace, 0);
+    add_to_sclist(MMAIN, "M-R", do_replace, 0);
+    add_to_sclist(MMAIN, "F14", do_replace, 0);
+    add_to_sclist(MMOST, "^K", do_cut_text_void, 0);
+    add_to_sclist(MMOST, "F9", do_cut_text_void, 0);
+    add_to_sclist(MMAIN, "^U", do_uncut_text, 0);
+    add_to_sclist(MMAIN, "F10", do_uncut_text, 0);
+#ifndef DISABLE_JUSTIFY
+    add_to_sclist(MMAIN, "^J", do_justify_void, 0);
+    add_to_sclist(MMAIN, "F4", do_justify_void, 0);
 #endif
+#ifndef DISABLE_SPELLER
+    add_to_sclist(MMAIN, "^T", do_spell, 0);
+    add_to_sclist(MMAIN, "F12", do_spell, 0);
+#else
+#ifndef DISABLE_COLOR
+    add_to_sclist(MMAIN, "^T", do_linter, 0);
+    add_to_sclist(MMAIN, "F12", do_linter, 0);
+    add_to_sclist(MMAIN, "^T", do_formatter, 0);
+    add_to_sclist(MMAIN, "F12", do_formatter, 0);
+#endif
+#endif
+    add_to_sclist(MMAIN, "^C", do_cursorpos_void, 0);
+    add_to_sclist(MMAIN, "F11", do_cursorpos_void, 0);
+    add_to_sclist(MMAIN, "^_", do_gotolinecolumn_void, 0);
+    add_to_sclist(MMAIN, "M-G", do_gotolinecolumn_void, 0);
+    add_to_sclist(MMAIN, "F13", do_gotolinecolumn_void, 0);
+    add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE|MLINTER, "^Y", do_page_up, 0);
+    add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE|MLINTER, "F7", do_page_up, 0);
+    add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE|MLINTER, "PgUp", do_page_up, 0);
+    add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE|MLINTER, "^V", do_page_down, 0);
+    add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE|MLINTER, "F8", do_page_down, 0);
+    add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE|MLINTER, "PgDn", do_page_down, 0);
+    add_to_sclist(MMAIN|MHELP, "M-\\", do_first_line, 0);
+    add_to_sclist(MMAIN|MHELP, "M-|", do_first_line, 0);
+    add_to_sclist(MMAIN|MHELP, "M-/", do_last_line, 0);
+    add_to_sclist(MMAIN|MHELP, "M-?", do_last_line, 0);
+#ifndef NANO_TINY
+    add_to_sclist(MMAIN|MBROWSER, "M-W", do_research, 0);
+    add_to_sclist(MMAIN|MBROWSER, "F16", do_research, 0);
+    add_to_sclist(MMAIN, "M-]", do_find_bracket, 0);
+    add_to_sclist(MMAIN, "^^", do_mark, 0);
+    add_to_sclist(MMAIN, "M-A", do_mark, 0);
+    add_to_sclist(MMAIN, "F15", do_mark, 0);
+    add_to_sclist(MMAIN, "M-^", do_copy_text, 0);
+    add_to_sclist(MMAIN, "M-6", do_copy_text, 0);
+    add_to_sclist(MMAIN, "M-}", do_indent_void, 0);
+    add_to_sclist(MMAIN, "M-{", do_unindent, 0);
+    add_to_sclist(MMAIN, "M-U", do_undo, 0);
+    add_to_sclist(MMAIN, "M-E", do_redo, 0);
+#endif
+    add_to_sclist(MMOST, "^B", do_left, 0);
+    add_to_sclist(MMOST, "Left", do_left, 0);
+    add_to_sclist(MMOST, "^F", do_right, 0);
+    add_to_sclist(MMOST, "Right", do_right, 0);
+#ifndef NANO_TINY
+    add_to_sclist(MMOST, "M-Space", do_prev_word_void, 0);
+    add_to_sclist(MMOST, "^Space", do_next_word_void, 0);
+#endif
+    add_to_sclist(MMOST, "^A", do_home, 0);
+    add_to_sclist(MMOST, "Home", do_home, 0);
+    add_to_sclist(MMOST, "^E", do_end, 0);
+    add_to_sclist(MMOST, "End", do_end, 0);
+    add_to_sclist(MMAIN|MHELP|MBROWSER, "^P", do_up_void, 0);
+    add_to_sclist(MMAIN|MHELP|MBROWSER, "Up", do_up_void, 0);
+    add_to_sclist(MMAIN|MHELP|MBROWSER, "^N", do_down_void, 0);
+    add_to_sclist(MMAIN|MHELP|MBROWSER, "Down", do_down_void, 0);
+#ifndef DISABLE_JUSTIFY
+    add_to_sclist(MMAIN, "M-(", do_para_begin_void, 0);
+    add_to_sclist(MMAIN, "M-9", do_para_begin_void, 0);
+    add_to_sclist(MMAIN, "M-)", do_para_end_void, 0);
+    add_to_sclist(MMAIN, "M-0", do_para_end_void, 0);
 #endif
-
-#ifndef DISABLE_HELP
-    add_to_funcs( REFRESH_MSG, MHELP,
-	refresh_msg, nano_refresh_msg, FALSE, VIEW);
-
-    add_to_funcs(DO_EXIT, MHELP, exit_msg, IFSCHELP(nano_exit_msg), FALSE, VIEW);
-
-
+#ifndef NANO_TINY
+    add_to_sclist(MMAIN, "M--", do_scroll_up, 0);
+    add_to_sclist(MMAIN, "M-_", do_scroll_up, 0);
+    add_to_sclist(MMAIN, "M-+", do_scroll_down, 0);
+    add_to_sclist(MMAIN, "M-=", do_scroll_down, 0);
+#endif
+#ifndef DISABLE_MULTIBUFFER
+    add_to_sclist(MMAIN, "M-<", switch_to_prev_buffer_void, 0);
+    add_to_sclist(MMAIN, "M-,", switch_to_prev_buffer_void, 0);
+    add_to_sclist(MMAIN, "M->", switch_to_next_buffer_void, 0);
+    add_to_sclist(MMAIN, "M-.", switch_to_next_buffer_void, 0);
+#endif
+    add_to_sclist(MMOST, "M-V", do_verbatim_input, 0);
+#ifndef NANO_TINY
+    add_to_sclist(MMAIN, "M-T", do_cut_till_eof, 0);
+    add_to_sclist(MMAIN, "M-D", do_wordlinechar_count, 0);
 #endif
+#ifndef DISABLE_JUSTIFY
+    add_to_sclist(MMAIN|MWHEREIS, "M-J", do_full_justify, 0);
+#endif
+    add_to_sclist(MMAIN|MHELP, "^L", total_refresh, 0);
+    add_to_sclist(MMAIN, "^Z", do_suspend_void, 0);
 
-#ifndef DISABLE_BROWSER
-
-    add_to_funcs( FIRST_FILE_MSG,
-	(MBROWSER|MWHEREISFILE),
-	first_file_msg, IFSCHELP(nano_firstfile_msg), FALSE, VIEW);
+#ifndef NANO_TINY
+    /* Group of "Appearance" toggles. */
+    add_to_sclist(MMAIN, "M-X", do_toggle_void, NO_HELP);
+    add_to_sclist(MMAIN, "M-C", do_toggle_void, CONST_UPDATE);
+    add_to_sclist(MMAIN, "M-O", do_toggle_void, MORE_SPACE);
+    add_to_sclist(MMAIN, "M-S", do_toggle_void, SMOOTH_SCROLL);
+    add_to_sclist(MMAIN, "M-$", do_toggle_void, SOFTWRAP);
+    add_to_sclist(MMAIN, "M-P", do_toggle_void, WHITESPACE_DISPLAY);
+#ifndef DISABLE_COLOR
+    add_to_sclist(MMAIN, "M-Y", do_toggle_void, NO_COLOR_SYNTAX);
+#endif
 
-    add_to_funcs( LAST_FILE_MSG,
-	(MBROWSER|MWHEREISFILE),
-	last_file_msg, IFSCHELP(nano_lastfile_msg), FALSE, VIEW);
+    /* Group of "Editing-behavior" toggles. */
+    add_to_sclist(MMAIN, "M-H", do_toggle_void, SMART_HOME);
+    add_to_sclist(MMAIN, "M-I", do_toggle_void, AUTOINDENT);
+    add_to_sclist(MMAIN, "M-K", do_toggle_void, CUT_TO_END);
+#ifndef DISABLE_WRAPPING
+    add_to_sclist(MMAIN, "M-L", do_toggle_void, NO_WRAP);
+#endif
+    add_to_sclist(MMAIN, "M-Q", do_toggle_void, TABS_TO_SPACES);
 
-    add_to_funcs( GOTO_DIR_MSG, MBROWSER,
-	goto_dir_msg, IFSCHELP(nano_gotodir_msg), FALSE, VIEW);
+    /* Group of "Peripheral-feature" toggles. */
+    add_to_sclist(MMAIN, "M-B", do_toggle_void, BACKUP_FILE);
+#ifndef DISABLE_MULTIBUFFER
+    add_to_sclist(MMAIN, "M-F", do_toggle_void, MULTIBUFFER);
+#endif
+#ifndef DISABLE_MOUSE
+    add_to_sclist(MMAIN, "M-M", do_toggle_void, USE_MOUSE);
 #endif
+    add_to_sclist(MMAIN, "M-N", do_toggle_void, NO_CONVERT);
+    add_to_sclist(MMAIN, "M-Z", do_toggle_void, SUSPEND);
+#endif /* !NANO_TINY */
 
-    currmenu = MMAIN;
+    add_to_sclist(MMAIN, "^Q", xon_complaint, 0);
+    add_to_sclist(MMAIN, "^S", xoff_complaint, 0);
+
+    add_to_sclist(((MMOST & ~MMAIN & ~MBROWSER) | MYESNO), "^C", do_cancel, 0);
 
-    add_to_sclist(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MBROWSER|MWHEREISFILE|MGOTODIR,
-	"^G", DO_HELP_VOID, 0, TRUE);
-    add_to_sclist(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MBROWSER|MWHEREISFILE|MGOTODIR,
-	"F1", DO_HELP_VOID, 0, TRUE);
-    add_to_sclist(MMAIN|MHELP|MBROWSER, "^X", DO_EXIT, 0, TRUE);
-    add_to_sclist(MMAIN|MHELP|MBROWSER, "F2", DO_EXIT, 0, TRUE);
-    add_to_sclist(MMAIN, "^_", DO_GOTOLINECOLUMN_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "F13", DO_GOTOLINECOLUMN_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "M-G", DO_GOTOLINECOLUMN_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "^O", DO_WRITEOUT_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "F3", DO_WRITEOUT_VOID, 0, TRUE);
-#ifndef DISABLE_JUSTIFY
-    add_to_sclist(MMAIN, "^J", DO_JUSTIFY_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "F4", DO_JUSTIFY_VOID, 0, TRUE);
-#endif
-    add_to_sclist(MMAIN, "^R", DO_INSERTFILE_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "F5", DO_INSERTFILE_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "kinsert", DO_INSERTFILE_VOID, 0, TRUE);
-    add_to_sclist(MMAIN|MBROWSER, "^W", DO_SEARCH, 0, TRUE);
-    add_to_sclist(MMAIN|MBROWSER, "F6", DO_SEARCH, 0, TRUE);
-    add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE, "^Y", DO_PAGE_UP, 0, TRUE);
-    add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE, "F7", DO_PAGE_UP, 0, TRUE);
-    add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE, "kpup", DO_PAGE_UP, 0, TRUE);
-    add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE, "^V", DO_PAGE_DOWN, 0, TRUE);
-    add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE, "F8", DO_PAGE_DOWN, 0, TRUE);
-    add_to_sclist(MMAIN|MBROWSER|MHELP|MWHEREISFILE, "kpdown", DO_PAGE_DOWN, 0, TRUE);
-    add_to_sclist(MMAIN, "^K", DO_CUT_TEXT_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "F9", DO_CUT_TEXT_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "^U", DO_UNCUT_TEXT, 0, TRUE);
-    add_to_sclist(MMAIN, "F10", DO_UNCUT_TEXT, 0, TRUE);
-    add_to_sclist(MMAIN, "^C", DO_CURSORPOS_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "F11", DO_CURSORPOS_VOID, 0, TRUE);
-#ifndef DISABLE_SPELLER
-    add_to_sclist(MMAIN, "^T", DO_SPELL, 0, TRUE);
-    add_to_sclist(MMAIN, "F12", DO_SPELL, 0, TRUE);
-#endif
-    add_to_sclist(MMAIN, "^\\", DO_REPLACE, 0, TRUE);
-    add_to_sclist(MMAIN, "F14", DO_REPLACE, 0, TRUE);
-    add_to_sclist(MMAIN, "M-R", DO_REPLACE, 0, TRUE);
-    add_to_sclist(MWHEREIS, "^R", DO_REPLACE, 0, FALSE);
-    add_to_sclist(MREPLACE, "^R", NO_REPLACE_MSG, 0, FALSE);
-    add_to_sclist(MWHEREIS, "^T", DO_GOTOLINECOLUMN_VOID, 0, FALSE);
-#ifndef NANO_TINY
-    add_to_sclist(MMAIN, "^^", DO_MARK, 0, TRUE);
-    add_to_sclist(MMAIN, "F15", DO_MARK, 0, TRUE);
-    add_to_sclist(MMAIN, "M-A", DO_MARK, 0, TRUE);
-    add_to_sclist(MMAIN|MBROWSER, "M-W", DO_RESEARCH, 0, TRUE);
-    add_to_sclist(MMAIN|MBROWSER, "F16", DO_RESEARCH, 0, TRUE);
-    add_to_sclist(MMAIN, "M-^", DO_COPY_TEXT, 0, TRUE);
-    add_to_sclist(MMAIN, "M-6", DO_COPY_TEXT, 0, TRUE);
-    add_to_sclist(MMAIN, "M-}", DO_INDENT_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "M-{", DO_UNINDENT, 0, TRUE);
-    if (ISSET(UNDOABLE)) {
-	add_to_sclist(MMAIN, "M-U", DO_UNDO, 0, TRUE);
- 	add_to_sclist(MMAIN, "M-E", DO_REDO, 0, TRUE);
-    }
-    add_to_sclist(MALL, "^F", DO_RIGHT, 0, TRUE);
-    add_to_sclist(MALL, "^B", DO_LEFT, 0, TRUE);
-    add_to_sclist(MMAIN, "^Space", DO_NEXT_WORD_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "M-Space", DO_PREV_WORD_VOID, 0, TRUE);
-#endif
-    add_to_sclist(MALL, "kright", DO_RIGHT, 0, TRUE);
-    add_to_sclist(MALL, "kleft", DO_LEFT, 0, TRUE);
-    add_to_sclist(MMAIN, "^Q", XON_COMPLAINT, 0, TRUE);
-    add_to_sclist(MMAIN, "^S", XOFF_COMPLAINT, 0, TRUE);
-    add_to_sclist(MMAIN|MHELP|MBROWSER, "^P", DO_UP_VOID, 0, TRUE);
-    add_to_sclist(MMAIN|MHELP|MBROWSER, "kup", DO_UP_VOID, 0, TRUE);
-    add_to_sclist(MMAIN|MHELP|MBROWSER, "^N", DO_DOWN_VOID, 0, TRUE);
-    add_to_sclist(MMAIN|MHELP|MBROWSER, "kdown", DO_DOWN_VOID, 0, TRUE);
-    add_to_sclist(MALL, "^A", DO_HOME, 0, TRUE);
-    add_to_sclist(MALL, "khome", DO_HOME, 0, TRUE);
-    add_to_sclist(MALL, "^E", DO_END, 0, TRUE);
-    add_to_sclist(MALL, "kend", DO_END, 0, TRUE);
 #ifndef NANO_TINY
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE, "^P",  PREV_HISTORY_MSG, 0, FALSE);
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE, "kup",  PREV_HISTORY_MSG, 0, FALSE);
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE, "^N",  NEXT_HISTORY_MSG, 0, FALSE);
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2|MWHEREISFILE, "kdown",  NEXT_HISTORY_MSG, 0, FALSE);
+    add_to_sclist(MWHEREIS|MREPLACE, "M-B", backwards_void, 0);
+    add_to_sclist(MWHEREIS|MREPLACE, "M-C", case_sens_void, 0);
 #endif
+    add_to_sclist(MWHEREIS|MREPLACE, "M-R", regexp_void, 0);
+    add_to_sclist(MWHEREIS|MREPLACE, "^R", flip_replace_void, 0);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE, "^Y", do_first_line, 0);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE, "^V", do_last_line, 0);
 #ifndef DISABLE_JUSTIFY
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2,
-	"^W", DO_PARA_BEGIN_VOID, 0, TRUE);
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2,
-	"^O", DO_PARA_END_VOID, 0, TRUE);
-    add_to_sclist(MALL, "M-(", DO_PARA_BEGIN_VOID, 0, TRUE);
-    add_to_sclist(MALL, "M-9", DO_PARA_BEGIN_VOID, 0, TRUE);
-    add_to_sclist(MALL, "M-)", DO_PARA_END_VOID, 0, TRUE);
-    add_to_sclist(MALL, "M-0", DO_PARA_END_VOID, 0, TRUE);
-#endif
-    add_to_sclist(MWHEREIS,
-	"M-C", CASE_SENS_MSG, 0, FALSE);
-    add_to_sclist(MREPLACE,
-	"M-C", CASE_SENS_MSG, 0, FALSE);
-    add_to_sclist(MREPLACE2,
-	"M-C", CASE_SENS_MSG, 0, FALSE);
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2,
-	"M-B", BACKWARDS_MSG, 0, FALSE);
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2,
-	"M-R", REGEXP_MSG, 0, FALSE);
-
-    add_to_sclist(MMAIN, "M-\\", DO_FIRST_LINE, 0, TRUE);
-    add_to_sclist(MMAIN, "M-|", DO_FIRST_LINE, 0, TRUE);
-    add_to_sclist(MMAIN, "M-/", DO_LAST_LINE, 0, TRUE);
-    add_to_sclist(MMAIN, "M-?", DO_LAST_LINE, 0, TRUE);
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MHELP,
-	"^Y", DO_FIRST_LINE, 0, TRUE);
-    add_to_sclist(MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MHELP,
-	"^V", DO_LAST_LINE, 0, TRUE);
-
-    add_to_sclist(MBROWSER|MWHEREISFILE, "M-\\",  FIRST_FILE_MSG, 0, TRUE);
-    add_to_sclist(MBROWSER|MWHEREISFILE, "M-|",  FIRST_FILE_MSG, 0, TRUE);
-    add_to_sclist(MBROWSER|MWHEREISFILE, "M-/",  LAST_FILE_MSG, 0, TRUE);
-    add_to_sclist(MBROWSER|MWHEREISFILE, "M-?",  LAST_FILE_MSG, 0, TRUE);
-    add_to_sclist(MBROWSER|MWHEREISFILE, "^_",  GOTO_DIR_MSG, 0, TRUE);
-    add_to_sclist(MBROWSER|MWHEREISFILE, "F13",  GOTO_DIR_MSG, 0, TRUE);
-    add_to_sclist(MBROWSER|MWHEREISFILE, "M-G",  GOTO_DIR_MSG, 0, TRUE);
-#ifndef NANO_TINY
-    add_to_sclist(MMAIN, "M-]", DO_FIND_BRACKET, 0, TRUE);
-    add_to_sclist(MMAIN, "M--", DO_SCROLL_UP, 0, TRUE);
-    add_to_sclist(MMAIN, "M-_", DO_SCROLL_UP, 0, TRUE);
-    add_to_sclist(MMAIN, "M-+", DO_SCROLL_DOWN, 0, TRUE);
-    add_to_sclist(MMAIN, "M-=", DO_SCROLL_DOWN, 0, TRUE);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH, "^W", do_para_begin_void, 0);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH, "^O", do_para_end_void, 0);
 #endif
-
-#ifdef ENABLE_MULTIBUFFER
-    add_to_sclist(MMAIN, "M-<", SWITCH_TO_PREV_BUFFER_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "M-,", SWITCH_TO_PREV_BUFFER_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "M->", SWITCH_TO_NEXT_BUFFER_VOID, 0, TRUE);
-    add_to_sclist(MMAIN, "M-.", SWITCH_TO_NEXT_BUFFER_VOID, 0, TRUE);
+    add_to_sclist(MWHEREIS, "^T", do_gotolinecolumn_void, 0);
+    add_to_sclist(MGOTOLINE, "^T", gototext_void, 0);
+#ifndef DISABLE_HISTORIES
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE, "^P", get_history_older_void, 0);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE, "Up", get_history_older_void, 0);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE, "^N", get_history_newer_void, 0);
+    add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE, "Down", get_history_newer_void, 0);
 #endif
-    add_to_sclist(MALL, "M-V", DO_VERBATIM_INPUT, 0, TRUE);
-#ifndef NANO_TINY
-    add_to_sclist(MALL, "M-T", DO_CUT_TILL_END, 0, TRUE);
-#ifndef DISABLE_JUSTIFY
-    add_to_sclist(MALL, "M-J", DO_FULL_JUSTIFY, 0, TRUE);
-#endif
-    add_to_sclist(MMAIN, "M-D", DO_WORDLINECHAR_COUNT, 0, TRUE);
-    add_to_sclist(MMAIN, "M-X", DO_TOGGLE, NO_HELP, TRUE);
-    add_to_sclist(MMAIN, "M-C", DO_TOGGLE, CONST_UPDATE, TRUE);
-    add_to_sclist(MMAIN, "M-O", DO_TOGGLE, MORE_SPACE, TRUE);
-    add_to_sclist(MMAIN, "M-S", DO_TOGGLE, SMOOTH_SCROLL, TRUE);
-    add_to_sclist(MMAIN, "M-P", DO_TOGGLE, WHITESPACE_DISPLAY, TRUE);
-    add_to_sclist(MMAIN, "M-Y", DO_TOGGLE, NO_COLOR_SYNTAX, TRUE);
-    add_to_sclist(MMAIN, "M-H", DO_TOGGLE, SMART_HOME, TRUE);
-    add_to_sclist(MMAIN, "M-I", DO_TOGGLE, AUTOINDENT, TRUE);
-    add_to_sclist(MMAIN, "M-K", DO_TOGGLE, CUT_TO_END, TRUE);
-    add_to_sclist(MMAIN, "M-L", DO_TOGGLE, NO_WRAP, TRUE);
-    add_to_sclist(MMAIN, "M-Q", DO_TOGGLE, TABS_TO_SPACES, TRUE);
-    add_to_sclist(MMAIN, "M-B", DO_TOGGLE, BACKUP_FILE, TRUE);
-    add_to_sclist(MMAIN, "M-F", DO_TOGGLE, MULTIBUFFER, TRUE);
-    add_to_sclist(MMAIN, "M-M", DO_TOGGLE, USE_MOUSE, TRUE);
-    add_to_sclist(MMAIN, "M-N", DO_TOGGLE, NO_CONVERT, TRUE);
-    add_to_sclist(MMAIN, "M-Z", DO_TOGGLE, SUSPEND, TRUE);
-    add_to_sclist(MMAIN, "M-$", DO_TOGGLE, SOFTWRAP, TRUE);
-#endif
-    add_to_sclist(MGOTOLINE, "^T",  GOTOTEXT_MSG, 0, FALSE);
-    add_to_sclist(MINSERTFILE|MEXTCMD, "M-F",  NEW_BUFFER_MSG, 0, FALSE);
-    add_to_sclist((MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MWHEREISFILE|MGOTODIR|MYESNO),
-	"^C", CANCEL_MSG, 0, FALSE);
-    add_to_sclist(MHELP, "^X", DO_EXIT, 0, TRUE);
-    add_to_sclist(MHELP, "F2", DO_EXIT, 0, TRUE);
-    add_to_sclist(MWRITEFILE, "M-D",  DOS_FORMAT_MSG, 0, FALSE);
-    add_to_sclist(MWRITEFILE, "M-M",  MAC_FORMAT_MSG, 0, FALSE);
-    add_to_sclist(MWRITEFILE, "M-A",  APPEND_MSG, 0, FALSE);
-    add_to_sclist(MWRITEFILE, "M-P",  PREPEND_MSG, 0, FALSE);
-    add_to_sclist(MWRITEFILE, "M-B",  BACKUP_FILE_MSG, 0, FALSE);
-    add_to_sclist(MWRITEFILE, "^T",  TO_FILES_MSG, 0, FALSE);
-    add_to_sclist(MINSERTFILE, "^T",  TO_FILES_MSG, 0, FALSE);
-    add_to_sclist(MINSERTFILE, "^X",  EXT_CMD_MSG, 0, FALSE);
-    add_to_sclist(MMAIN, "^Z", DO_SUSPEND_VOID, 0, FALSE);
-    add_to_sclist(MMAIN, "^L", TOTAL_REFRESH, 0, TRUE);
-    add_to_sclist(MALL, "^I", DO_TAB, 0, TRUE);
-    add_to_sclist(MALL, "^M", DO_ENTER, 0, TRUE);
-    add_to_sclist(MALL, "kenter", DO_ENTER, 0, TRUE);
-    add_to_sclist(MALL, "^D", DO_DELETE, 0, TRUE);
-    add_to_sclist(MALL, "kdel", DO_DELETE, 0, TRUE);
-    add_to_sclist(MALL, "^H", DO_BACKSPACE, 0, TRUE);
-    add_to_sclist(MALL, "kbsp", DO_BACKSPACE, 0, TRUE);
+#ifndef DISABLE_BROWSER
+    add_to_sclist(MBROWSER|MWHEREISFILE, "M-\\", do_first_file, 0);
+    add_to_sclist(MBROWSER|MWHEREISFILE, "M-|", do_first_file, 0);
+    add_to_sclist(MBROWSER|MWHEREISFILE, "M-/", do_last_file, 0);
+    add_to_sclist(MBROWSER|MWHEREISFILE, "M-?", do_last_file, 0);
+    add_to_sclist(MBROWSER|MWHEREISFILE, "^_", goto_dir_void, 0);
+    add_to_sclist(MBROWSER|MWHEREISFILE, "M-G", goto_dir_void, 0);
+    add_to_sclist(MBROWSER|MWHEREISFILE, "F13", goto_dir_void, 0);
+#endif
+    add_to_sclist(MWRITEFILE, "M-D", dos_format_void, 0);
+    add_to_sclist(MWRITEFILE, "M-M", mac_format_void, 0);
+    add_to_sclist(MWRITEFILE, "M-A", append_void, 0);
+    add_to_sclist(MWRITEFILE, "M-P", prepend_void, 0);
+    add_to_sclist(MWRITEFILE, "M-B", backup_file_void, 0);
+#ifndef DISABLE_BROWSER
+    add_to_sclist(MWRITEFILE|MINSERTFILE, "^T", to_files_void, 0);
+#endif
+    add_to_sclist(MINSERTFILE|MEXTCMD, "^X", flip_execute_void, 0);
+    add_to_sclist(MINSERTFILE|MEXTCMD, "M-F", new_buffer_void, 0);
+    add_to_sclist(MHELP|MBROWSER, "^C", do_exit, 0);
+#ifndef DISABLE_HELP
+    add_to_sclist(MHELP, "^G", do_exit, 0);
+#endif
+    add_to_sclist(MMOST, "^I", do_tab, 0);
+    add_to_sclist(MMOST, "^M", do_enter_void, 0);
+    add_to_sclist(MMOST, "Enter", do_enter_void, 0);
+    add_to_sclist(MMOST, "^D", do_delete, 0);
+    add_to_sclist(MMOST, "Del", do_delete, 0);
+    add_to_sclist(MMOST, "^H", do_backspace, 0);
+    add_to_sclist(MMOST, "Bsp", do_backspace, 0);
 
 #ifdef DEBUG
     print_sclist();
 #endif
-
 }
 
-/* Given a function alias, execute the proper
-   function, and then me */
-void iso_me_harder_funcmap(short func)
+#ifndef DISABLE_COLOR
+void set_lint_or_format_shortcuts(void)
 {
-    if (func == TOTAL_REFRESH)
-	total_refresh();
-    else if (func == DO_HELP_VOID)
-	do_help_void();
-    else if (func == DO_SEARCH)
-	do_search();
-    else if (func == DO_PAGE_UP)
-	do_page_up();
-    else if (func == DO_PAGE_DOWN)
-	do_page_down();
-    else if (func == DO_UP_VOID)
-	do_up_void();
-    else if (func == DO_LEFT)
-	do_left();
-    else if (func == DO_DOWN_VOID)
-	do_down_void();
-    else if (func == DO_RIGHT)
-	do_right();
-    else if (func == DO_ENTER)
-	do_enter(FALSE);
-    else if (func == DO_EXIT)
-	do_exit();
-    else if (func == DO_FIRST_LINE)
-	do_first_line();
-    else if (func == DO_LAST_LINE)
-	do_last_line();
-    else if (func == DO_BACKSPACE)
-	do_backspace();
-    else if (func == DO_DELETE)
-	do_delete();
-    else if (func == DO_TAB)
-	do_tab();
-    else if (func == DO_VERBATIM_INPUT)
-	do_verbatim_input();
-#ifdef ENABLE_MULTIBUFFER
-    else if (func == SWITCH_TO_NEXT_BUFFER_VOID)
-	switch_to_next_buffer_void();
-    else if (func == SWITCH_TO_PREV_BUFFER_VOID)
-	switch_to_prev_buffer_void();
-#endif
-    else if (func == DO_END)
-	do_end();
-    else if (func == DO_HOME)
-	do_home();
-    else if (func == DO_SUSPEND_VOID)
-	do_suspend_void();
-    else if (func == DO_WRITEOUT_VOID)
-	do_writeout_void();
-    else if (func == DO_INSERTFILE_VOID)
-	do_insertfile_void();
-    else if (func == DO_CUT_TEXT_VOID)
-	do_cut_text_void();
-    else if (func == DO_UNCUT_TEXT)
-	do_uncut_text();
-    else if (func == DO_CURSORPOS_VOID)
-	do_cursorpos_void();
-    else if (func == DO_GOTOLINECOLUMN_VOID)
-	do_gotolinecolumn_void();
-    else if (func == DO_REPLACE)
-	do_replace();
-    else if (func == XOFF_COMPLAINT)
-	xoff_complaint();
-    else if (func == XON_COMPLAINT)
-	xon_complaint();
-    else if (func == DO_CUT_TEXT)
-	do_cut_text_void();
-#ifndef NANO_TINY
-    else if (func == DO_CUT_TILL_END)
-	do_cut_till_end();
-    else if (func == DO_REDO)
-	do_redo();
-    else if (func == DO_UNDO)
-	do_undo();
-    else if (func == DO_WORDLINECHAR_COUNT)
-	do_wordlinechar_count();
-    else if (func == DO_FIND_BRACKET)
-	do_find_bracket();
-    else if (func == DO_PREV_WORD_VOID)
-	do_prev_word_void();
-#ifndef DISABLE_JUSTIFY
-    else if (func == DO_JUSTIFY_VOID)
-	do_justify_void();
-    else if (func == DO_PARA_BEGIN_VOID)
-	do_para_begin_void();
-    else if (func == DO_PARA_END_VOID)
-	do_para_end_void();
-    else if (func == DO_FULL_JUSTIFY)
-	do_full_justify();
-#endif
-    else if (func == DO_MARK)
-	do_mark();
-    else if (func == DO_RESEARCH)
-	do_research();
-    else if (func == DO_COPY_TEXT)
-	do_copy_text();
-    else if (func == DO_INDENT_VOID)
-	do_indent_void();
-    else if (func == DO_UNINDENT)
-	do_unindent();
-    else if (func == DO_SCROLL_UP)
-	do_scroll_up();
-    else if (func == DO_SCROLL_DOWN)
-	do_scroll_down();
-    else if (func == DO_NEXT_WORD_VOID)
-	do_next_word_void();
 #ifndef DISABLE_SPELLER
-    else if (func == DO_SPELL)
-	do_spell();
-#endif
-    else if (func == DO_NEXT_WORD)
-	do_next_word_void();
-    else if (func == DO_PREV_WORD)
-	do_prev_word_void();
+    if (openfile->syntax->formatter) {
+	replace_scs_for(do_spell, do_formatter);
+	replace_scs_for(do_linter, do_formatter);
+    } else {
+	replace_scs_for(do_spell, do_linter);
+	replace_scs_for(do_formatter, do_linter);
+    }
 #endif
 }
 
-
-/* Free the given shortcut. */
-void free_shortcutage(shortcut **shortcutage)
+void set_spell_shortcuts(void)
 {
-    assert(shortcutage != NULL);
-
-    while (*shortcutage != NULL) {
-	shortcut *ps = *shortcutage;
-	*shortcutage = (*shortcutage)->next;
-	free(ps);
-    }
+#ifndef DISABLE_SPELLER
+	replace_scs_for(do_formatter, do_spell);
+	replace_scs_for(do_linter, do_spell);
+#endif
 }
+#endif
 
 const subnfunc *sctofunc(sc *s)
 {
@@ -1358,12 +1216,14 @@ const subnfunc *sctofunc(sc *s)
 }
 
 #ifndef NANO_TINY
-/* Now lets come up with a single (hopefully)
-   function to get a string for each flag */
+/* Now let's come up with a single (hopefully) function to get a string
+ * for each flag. */
 const char *flagtostr(int flag)
 {
-   switch (flag) {
+    switch (flag) {
         case NO_HELP:
+            /* TRANSLATORS: The next seventeen strings are toggle descriptions;
+             * they are best kept shorter than 40 characters, but may be longer. */
             return N_("Help mode");
         case CONST_UPDATE:
             return N_("Constant cursor position display");
@@ -1371,6 +1231,8 @@ const char *flagtostr(int flag)
             return N_("Use of one more line for editing");
         case SMOOTH_SCROLL:
             return N_("Smooth scrolling");
+        case SOFTWRAP:
+            return N_("Soft wrapping of overlong lines");
         case WHITESPACE_DISPLAY:
             return N_("Whitespace display");
         case NO_COLOR_SYNTAX:
@@ -1382,7 +1244,7 @@ const char *flagtostr(int flag)
         case CUT_TO_END:
             return N_("Cut to end");
         case NO_WRAP:
-            return N_("Long line wrapping");
+            return N_("Hard wrapping of overlong lines");
         case TABS_TO_SPACES:
             return N_("Conversion of typed tabs to spaces");
         case BACKUP_FILE:
@@ -1395,270 +1257,254 @@ const char *flagtostr(int flag)
             return N_("No conversion from DOS/Mac format");
         case SUSPEND:
             return N_("Suspension");
-        case SOFTWRAP:
-            return N_("Soft line wrapping");
         default:
             return "?????";
     }
 }
-#endif /* NANO_TINY */
+#endif /* !NANO_TINY */
 
-/* Interpret the string given by the rc file and return a
-    shortcut struct, complete with proper value for execute */
-sc *strtosc(int menu, char *input)
+#ifndef DISABLE_NANORC
+/* Interpret a function string given in the rc file, and return a
+ * shortcut struct with the corresponding function filled in. */
+sc *strtosc(char *input)
 {
-     sc *s;
+    sc *s;
 
     s = (sc *)nmalloc(sizeof(sc));
-    s->execute = TRUE; /* overridden as needed below */
-
 
 #ifndef DISABLE_HELP
     if (!strcasecmp(input, "help"))
-	s->scfunc = DO_HELP_VOID;
-    else 
-#endif
-    if (!strcasecmp(input, "cancel")) {
-	s->scfunc =  CANCEL_MSG;
-	s->execute = FALSE;
-    } else if (!strcasecmp(input, "exit"))
-	s->scfunc = DO_EXIT;
+	s->scfunc = do_help_void;
+    else
+#endif
+    if (!strcasecmp(input, "cancel"))
+	s->scfunc = do_cancel;
+    else if (!strcasecmp(input, "exit"))
+	s->scfunc = do_exit;
     else if (!strcasecmp(input, "writeout"))
-	s->scfunc = DO_WRITEOUT_VOID;
+	s->scfunc = do_writeout_void;
     else if (!strcasecmp(input, "insert"))
-	s->scfunc = DO_INSERTFILE_VOID;
+	s->scfunc = do_insertfile_void;
     else if (!strcasecmp(input, "whereis"))
-	s->scfunc = DO_SEARCH;
-    else if (!strcasecmp(input, "up"))
-	s->scfunc = DO_UP_VOID;
-    else if (!strcasecmp(input, "down"))
-	s->scfunc = DO_DOWN_VOID;
-    else if (!strcasecmp(input, "pageup")
-	|| !strcasecmp(input, "prevpage"))
-	s->scfunc = DO_PAGE_UP;
-    else if (!strcasecmp(input, "pagedown")
-	|| !strcasecmp(input, "nextpage"))
-	s->scfunc = DO_PAGE_DOWN;
+	s->scfunc = do_search;
+#ifndef NANO_TINY
+    else if (!strcasecmp(input, "searchagain") ||
+	     !strcasecmp(input, "research"))
+	s->scfunc = do_research;
+#endif
+    else if (!strcasecmp(input, "replace"))
+	s->scfunc = do_replace;
     else if (!strcasecmp(input, "cut"))
-	s->scfunc = DO_CUT_TEXT_VOID;
+	s->scfunc = do_cut_text_void;
     else if (!strcasecmp(input, "uncut"))
-	s->scfunc = DO_UNCUT_TEXT;
+	s->scfunc = do_uncut_text;
+#ifndef NANO_TINY
+    else if (!strcasecmp(input, "cutrestoffile"))
+	s->scfunc = do_cut_till_eof;
+    else if (!strcasecmp(input, "copytext"))
+	s->scfunc = do_copy_text;
+    else if (!strcasecmp(input, "mark"))
+	s->scfunc = do_mark;
+#endif
+#ifndef DISABLE_SPELLER
+    else if (!strcasecmp(input, "tospell") ||
+	     !strcasecmp(input, "speller"))
+	s->scfunc = do_spell;
+#endif
     else if (!strcasecmp(input, "curpos") ||
-	!strcasecmp(input, "cursorpos"))
-	s->scfunc = DO_CURSORPOS_VOID;
-    else if (!strcasecmp(input, "firstline"))
-	s->scfunc = DO_FIRST_LINE;
-    else if (!strcasecmp(input, "lastline"))
-	s->scfunc = DO_LAST_LINE;
+	     !strcasecmp(input, "cursorpos"))
+	s->scfunc = do_cursorpos_void;
     else if (!strcasecmp(input, "gotoline"))
-	s->scfunc = DO_GOTOLINECOLUMN_VOID;
-    else if (!strcasecmp(input, "replace"))
-	s->scfunc = DO_REPLACE;
+	s->scfunc = do_gotolinecolumn_void;
 #ifndef DISABLE_JUSTIFY
     else if (!strcasecmp(input, "justify"))
-	s->scfunc = DO_JUSTIFY_VOID;
+	s->scfunc = do_justify_void;
+    else if (!strcasecmp(input, "fulljustify"))
+	s->scfunc = do_full_justify;
     else if (!strcasecmp(input, "beginpara"))
-	s->scfunc = DO_PARA_BEGIN_VOID;
+	s->scfunc = do_para_begin_void;
     else if (!strcasecmp(input, "endpara"))
-	s->scfunc = DO_PARA_END_VOID;
-    else if (!strcasecmp(input, "fulljustify"))
-	s->scfunc = DO_FULL_JUSTIFY;
+	s->scfunc = do_para_end_void;
 #endif
 #ifndef NANO_TINY
-    else if (!strcasecmp(input, "mark"))
-	s->scfunc = DO_MARK;
-    else if (!strcasecmp(input, "searchagain") ||
-		!strcasecmp(input, "research"))
-	s->scfunc = DO_RESEARCH;
-    else if (!strcasecmp(input, "copytext"))
-	s->scfunc = DO_COPY_TEXT;
     else if (!strcasecmp(input, "indent"))
-	s->scfunc = DO_INDENT_VOID;
+	s->scfunc = do_indent_void;
     else if (!strcasecmp(input, "unindent"))
-	s->scfunc = DO_UNINDENT;
+	s->scfunc = do_unindent;
     else if (!strcasecmp(input, "scrollup"))
-	s->scfunc = DO_SCROLL_UP;
+	s->scfunc = do_scroll_up;
     else if (!strcasecmp(input, "scrolldown"))
-	s->scfunc = DO_SCROLL_DOWN;
-    else if (!strcasecmp(input, "nextword"))
-	s->scfunc = DO_NEXT_WORD_VOID;
-    else if (!strcasecmp(input, "suspend"))
-	s->scfunc = DO_SUSPEND_VOID;
+	s->scfunc = do_scroll_down;
     else if (!strcasecmp(input, "prevword"))
-	s->scfunc = DO_PREV_WORD_VOID;
+	s->scfunc = do_prev_word_void;
+    else if (!strcasecmp(input, "nextword"))
+	s->scfunc = do_next_word_void;
     else if (!strcasecmp(input, "findbracket"))
-	s->scfunc = DO_FIND_BRACKET;
+	s->scfunc = do_find_bracket;
     else if (!strcasecmp(input, "wordcount"))
-	s->scfunc = DO_WORDLINECHAR_COUNT;
+	s->scfunc = do_wordlinechar_count;
     else if (!strcasecmp(input, "undo"))
-	s->scfunc = DO_UNDO;
+	s->scfunc = do_undo;
     else if (!strcasecmp(input, "redo"))
-	s->scfunc = DO_REDO;
-    else if (!strcasecmp(input, "prevhistory")) {
-	s->scfunc =  PREV_HISTORY_MSG;
-	s->execute = FALSE;
-    } else if (!strcasecmp(input, "nexthistory")) {
-	s->scfunc =  NEXT_HISTORY_MSG;
-	s->execute = FALSE;
-    } else if (!strcasecmp(input, "nohelp") ||
-		!strcasecmp(input, "nohelp")) {
-	s->scfunc =  DO_TOGGLE;
-	s->execute = FALSE;
-	s->toggle = NO_HELP;
-    } else if (!strcasecmp(input, "constupdate")) {
-	s->scfunc =  DO_TOGGLE;
-	s->execute = FALSE;
-	s->toggle = CONST_UPDATE;
-    } else if (!strcasecmp(input, "morespace")) {
-	s->scfunc =  DO_TOGGLE;
-	s->execute = FALSE;
-	s->toggle = MORE_SPACE;
-    } else if (!strcasecmp(input, "smoothscroll")) {
-	s->scfunc =  DO_TOGGLE;
-	s->execute = FALSE;
-	s->toggle = SMOOTH_SCROLL;
-    } else if (!strcasecmp(input, "whitespacedisplay")) {
-	s->scfunc =  DO_TOGGLE;
-	s->execute = FALSE;
-	s->toggle = WHITESPACE_DISPLAY;
-    } else if (!strcasecmp(input, "nosyntax")) {
-	s->scfunc =  DO_TOGGLE;
-	s->execute = FALSE;
-	s->toggle = NO_COLOR_SYNTAX;
-    } else if (!strcasecmp(input, "smarthome")) {
-	s->scfunc =  DO_TOGGLE;
-	s->execute = FALSE;
-	s->toggle = SMART_HOME;
-    } else if (!strcasecmp(input, "autoindent")) {
-	s->scfunc =  DO_TOGGLE;
-	s->execute = FALSE;
-	s->toggle = AUTOINDENT;
-    } else if (!strcasecmp(input, "cuttoend")) {
-	s->scfunc =  DO_TOGGLE;
-	s->execute = FALSE;
-	s->toggle = CUT_TO_END;
-    } else if (!strcasecmp(input, "nowrap")) {
-	s->scfunc =  DO_TOGGLE;
-	s->execute = FALSE;
-	s->toggle = NO_WRAP;
-    } else if (!strcasecmp(input, "tabstospaces")) {
-	s->scfunc =  DO_TOGGLE;
-	s->execute = FALSE;
-	s->toggle = TABS_TO_SPACES;
-    } else if (!strcasecmp(input, "backupfile")) {
-	s->scfunc =  DO_TOGGLE;
-	s->execute = FALSE;
-	s->toggle = BACKUP_FILE;
-    } else if (!strcasecmp(input, "mutlibuffer")) {
-	s->scfunc =  DO_TOGGLE;
-	s->execute = FALSE;
-	s->toggle = MULTIBUFFER;
-    } else if (!strcasecmp(input, "mouse")) {
-	s->scfunc =  DO_TOGGLE;
-	s->execute = FALSE;
-	s->toggle = USE_MOUSE;
-    } else if (!strcasecmp(input, "noconvert")) {
-	s->scfunc =  DO_TOGGLE;
-	s->execute = FALSE;
-	s->toggle = NO_CONVERT;
-    } else if (!strcasecmp(input, "suspendenable")) {
-	s->scfunc =  DO_TOGGLE;
-	s->execute = FALSE;
-	s->toggle = SUSPEND;
-    }
-#endif /* NANO_TINY */
-    else if (!strcasecmp(input, "right") ||
-		!strcasecmp(input, "forward"))
-	s->scfunc = DO_RIGHT;
+	s->scfunc = do_redo;
+#endif
     else if (!strcasecmp(input, "left") ||
-		!strcasecmp(input, "back"))
-	s->scfunc = DO_LEFT;
+	     !strcasecmp(input, "back"))
+	s->scfunc = do_left;
+    else if (!strcasecmp(input, "right") ||
+	     !strcasecmp(input, "forward"))
+	s->scfunc = do_right;
     else if (!strcasecmp(input, "up") ||
-		!strcasecmp(input, "prevline"))
-	s->scfunc = DO_UP_VOID;
+	     !strcasecmp(input, "prevline"))
+	s->scfunc = do_up_void;
     else if (!strcasecmp(input, "down") ||
-		!strcasecmp(input, "nextline"))
-	s->scfunc = DO_DOWN_VOID;
+	     !strcasecmp(input, "nextline"))
+	s->scfunc = do_down_void;
     else if (!strcasecmp(input, "home"))
-	s->scfunc = DO_HOME;
+	s->scfunc = do_home;
     else if (!strcasecmp(input, "end"))
-	s->scfunc = DO_END;
-#ifdef ENABLE_MULTIBUFFER
+	s->scfunc = do_end;
+    else if (!strcasecmp(input, "pageup") ||
+	     !strcasecmp(input, "prevpage"))
+	s->scfunc = do_page_up;
+    else if (!strcasecmp(input, "pagedown") ||
+	     !strcasecmp(input, "nextpage"))
+	s->scfunc = do_page_down;
+    else if (!strcasecmp(input, "firstline"))
+	s->scfunc = do_first_line;
+    else if (!strcasecmp(input, "lastline"))
+	s->scfunc = do_last_line;
+#ifndef DISABLE_MULTIBUFFER
     else if (!strcasecmp(input, "prevbuf"))
-	s->scfunc = SWITCH_TO_PREV_BUFFER_VOID;
+	s->scfunc = switch_to_prev_buffer_void;
     else if (!strcasecmp(input, "nextbuf"))
-	s->scfunc = SWITCH_TO_NEXT_BUFFER_VOID;
+	s->scfunc = switch_to_next_buffer_void;
 #endif
     else if (!strcasecmp(input, "verbatim"))
-	s->scfunc = DO_VERBATIM_INPUT;
+	s->scfunc = do_verbatim_input;
     else if (!strcasecmp(input, "tab"))
-	s->scfunc = DO_TAB;
+	s->scfunc = do_tab;
     else if (!strcasecmp(input, "enter"))
-	s->scfunc = DO_ENTER;
+	s->scfunc = do_enter_void;
     else if (!strcasecmp(input, "delete"))
-	s->scfunc = DO_DELETE;
+	s->scfunc = do_delete;
     else if (!strcasecmp(input, "backspace"))
-	s->scfunc = DO_BACKSPACE;
+	s->scfunc = do_backspace;
     else if (!strcasecmp(input, "refresh"))
-	s->scfunc = TOTAL_REFRESH;
-    else if (!strcasecmp(input, "casesens")) {
-	s->scfunc =  CASE_SENS_MSG;
-	s->execute = FALSE;
-    } else if (!strcasecmp(input, "regexp") ||
-		!strcasecmp(input, "regex")) {
-	s->scfunc =  REGEXP_MSG;
-	s->execute = FALSE;
-    } else if (!strcasecmp(input, "dontreplace")) {
-	s->scfunc =  NO_REPLACE_MSG;
-	s->execute = FALSE;
-    } else if (!strcasecmp(input, "gototext")) {
-	s->scfunc =  GOTOTEXT_MSG;
-	s->execute = FALSE;
-    } else if (!strcasecmp(input, "browser") ||
-		!strcasecmp(input, "tofiles")) {
-	s->scfunc =  TO_FILES_MSG;
-	s->execute = FALSE;
-    } else if (!strcasecmp(input, "dosformat")) {
-	s->scfunc =  DOS_FORMAT_MSG;
-	s->execute = FALSE;
-    } else if (!strcasecmp(input, "macformat")) {
-	s->scfunc =  MAC_FORMAT_MSG;
-	s->execute = FALSE;
-    } else if (!strcasecmp(input, "append")) {
-	s->scfunc =  APPEND_MSG;
-	s->execute = FALSE;
-    } else if (!strcasecmp(input, "prepend")) {
-	s->scfunc =  PREPEND_MSG;
-	s->execute = FALSE;
-    } else if (!strcasecmp(input, "backup")) {
-	s->scfunc =  BACKUP_FILE_MSG;
-	s->execute = FALSE;
-#ifdef ENABLE_MULTIBUFFER
-    } else if (!strcasecmp(input, "newbuffer")) {
-	s->scfunc =  NEW_BUFFER_MSG;
-	s->execute = FALSE;
-#endif
-    } else if (!strcasecmp(input, "firstfile")) {
-	s->scfunc =  FIRST_FILE_MSG;
-	s->execute = FALSE;
-    } else if (!strcasecmp(input, "lastfile")) {
-	s->scfunc =  LAST_FILE_MSG;
-	s->execute = FALSE;
-    } else {
-	free(s);
-	return NULL;
+	s->scfunc = total_refresh;
+    else if (!strcasecmp(input, "suspend"))
+	s->scfunc = do_suspend_void;
+    else if (!strcasecmp(input, "casesens"))
+	s->scfunc = case_sens_void;
+#ifndef NANO_TINY
+    else if (!strcasecmp(input, "regexp") ||
+	     !strcasecmp(input, "regex"))
+	s->scfunc = regexp_void;
+    else if (!strcasecmp(input, "backwards"))
+	s->scfunc = backwards_void;
+#endif
+    else if (!strcasecmp(input, "flipreplace") ||
+	     !strcasecmp(input, "dontreplace"))
+	s->scfunc = flip_replace_void;
+    else if (!strcasecmp(input, "gototext"))
+	s->scfunc = gototext_void;
+#ifndef DISABLE_HISTORIES
+    else if (!strcasecmp(input, "prevhistory"))
+	s->scfunc = get_history_older_void;
+    else if (!strcasecmp(input, "nexthistory"))
+	s->scfunc = get_history_newer_void;
+#endif
+    else if (!strcasecmp(input, "dosformat"))
+	s->scfunc = dos_format_void;
+    else if (!strcasecmp(input, "macformat"))
+	s->scfunc = mac_format_void;
+    else if (!strcasecmp(input, "append"))
+	s->scfunc = append_void;
+    else if (!strcasecmp(input, "prepend"))
+	s->scfunc = prepend_void;
+    else if (!strcasecmp(input, "backup"))
+	s->scfunc = backup_file_void;
+#ifndef ENABLE_TINY
+    else if (!strcasecmp(input, "flipexecute"))
+	s->scfunc = flip_execute_void;
+#endif
+#ifndef DISABLE_MULTIBUFFER
+    else if (!strcasecmp(input, "flipnewbuffer") ||
+	     !strcasecmp(input, "newbuffer"))
+	s->scfunc = new_buffer_void;
+#endif
+#ifndef DISABLE_BROWSER
+    else if (!strcasecmp(input, "tofiles") ||
+	     !strcasecmp(input, "browser"))
+	s->scfunc = to_files_void;
+    else if (!strcasecmp(input, "gotodir"))
+	s->scfunc = goto_dir_void;
+    else if (!strcasecmp(input, "firstfile"))
+	s->scfunc = do_first_file;
+    else if (!strcasecmp(input, "lastfile"))
+	s->scfunc = do_last_file;
+#endif
+#ifndef NANO_TINY
+    else {
+	s->scfunc = do_toggle_void;
+	if (!strcasecmp(input, "nohelp"))
+	    s->toggle = NO_HELP;
+	else if (!strcasecmp(input, "constupdate"))
+	    s->toggle = CONST_UPDATE;
+	else if (!strcasecmp(input, "morespace"))
+	    s->toggle = MORE_SPACE;
+	else if (!strcasecmp(input, "smoothscroll"))
+	    s->toggle = SMOOTH_SCROLL;
+	else if (!strcasecmp(input, "softwrap"))
+	    s->toggle = SOFTWRAP;
+	else if (!strcasecmp(input, "whitespacedisplay"))
+	    s->toggle = WHITESPACE_DISPLAY;
+#ifndef DISABLE_COLOR
+	else if (!strcasecmp(input, "nosyntax"))
+	    s->toggle = NO_COLOR_SYNTAX;
+#endif
+	else if (!strcasecmp(input, "smarthome"))
+	    s->toggle = SMART_HOME;
+	else if (!strcasecmp(input, "autoindent"))
+	    s->toggle = AUTOINDENT;
+	else if (!strcasecmp(input, "cuttoend"))
+	    s->toggle = CUT_TO_END;
+#ifndef DISABLE_WRAPPING
+	else if (!strcasecmp(input, "nowrap"))
+	    s->toggle = NO_WRAP;
+#endif
+	else if (!strcasecmp(input, "tabstospaces"))
+	    s->toggle = TABS_TO_SPACES;
+	else if (!strcasecmp(input, "backupfile"))
+	    s->toggle = BACKUP_FILE;
+#ifndef DISABLE_MULTIBUFFER
+	else if (!strcasecmp(input, "multibuffer"))
+	    s->toggle = MULTIBUFFER;
+#endif
+#ifndef DISABLE_MOUSE
+	else if (!strcasecmp(input, "mouse"))
+	    s->toggle = USE_MOUSE;
+#endif
+	else if (!strcasecmp(input, "noconvert"))
+	    s->toggle = NO_CONVERT;
+	else if (!strcasecmp(input, "suspendenable"))
+	    s->toggle = SUSPEND;
+#endif /* !NANO_TINY */
+	else {
+	    free(s);
+	    return NULL;
+	}
+#ifndef NANO_TINY
     }
-
+#endif
     return s;
-
 }
 
-#ifdef ENABLE_NANORC
-/* Same thing as abnove but for the menu */
+/* Interpret a menu name and return the corresponding menu flag. */
 int strtomenu(char *input)
 {
     if (!strcasecmp(input, "all"))
-	return MALL;
+	return (MMOST|MHELP|MYESNO);
     else if (!strcasecmp(input, "main"))
 	return MMAIN;
     else if (!strcasecmp(input, "search"))
@@ -1666,8 +1512,8 @@ int strtomenu(char *input)
     else if (!strcasecmp(input, "replace"))
 	return MREPLACE;
     else if (!strcasecmp(input, "replace2") ||
-		!strcasecmp(input, "replacewith"))
-	return MREPLACE2;
+	     !strcasecmp(input, "replacewith"))
+	return MREPLACEWITH;
     else if (!strcasecmp(input, "gotoline"))
 	return MGOTOLINE;
     else if (!strcasecmp(input, "writeout"))
@@ -1675,22 +1521,29 @@ int strtomenu(char *input)
     else if (!strcasecmp(input, "insert"))
 	return MINSERTFILE;
     else if (!strcasecmp(input, "externalcmd") ||
-		!strcasecmp(input, "extcmd"))
+	     !strcasecmp(input, "extcmd"))
 	return MEXTCMD;
+#ifndef DISABLE_HELP
     else if (!strcasecmp(input, "help"))
 	return MHELP;
-    else if (!strcasecmp(input, "spell"))
+#endif
+#ifndef DISABLE_SPELLER
+    else if (!strcasecmp(input, "spell") || !strcasecmp(input, "formatter"))
 	return MSPELL;
+#endif
+    else if (!strcasecmp(input, "linter"))
+	return MLINTER;
+#ifndef DISABLE_BROWSER
     else if (!strcasecmp(input, "browser"))
 	return MBROWSER;
     else if (!strcasecmp(input, "whereisfile"))
 	return MWHEREISFILE;
     else if (!strcasecmp(input, "gotodir"))
 	return MGOTODIR;
-
+#endif
     return -1;
 }
-#endif
+#endif /* !DISABLE_NANORC */
 
 
 #ifdef DEBUG
@@ -1740,12 +1593,10 @@ void thanks_for_all_the_fish(void)
     if (jusbuffer != NULL)
 	free_filestruct(jusbuffer);
 #endif
-#ifdef DEBUG
     /* Free the memory associated with each open file buffer. */
     if (openfile != NULL)
 	free_openfilestruct(openfile);
-#endif
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     if (syntaxstr != NULL)
 	free(syntaxstr);
     while (syntaxes != NULL) {
@@ -1753,8 +1604,7 @@ void thanks_for_all_the_fish(void)
 
 	free(syntaxes->desc);
 	while (syntaxes->extensions != NULL) {
-	    exttype *bob = syntaxes->extensions;
-
+	    regexlisttype *bob = syntaxes->extensions;
 	    syntaxes->extensions = bob->next;
 	    free(bob->ext_regex);
 	    if (bob->ext != NULL) {
@@ -1763,6 +1613,26 @@ void thanks_for_all_the_fish(void)
 	    }
 	    free(bob);
 	}
+	while (syntaxes->headers != NULL) {
+	    regexlisttype *bob = syntaxes->headers;
+	    syntaxes->headers = bob->next;
+	    free(bob->ext_regex);
+	    if (bob->ext != NULL) {
+		regfree(bob->ext);
+		free(bob->ext);
+	    }
+	    free(bob);
+	}
+	while (syntaxes->magics != NULL) {
+	    regexlisttype *bob = syntaxes->magics;
+	    syntaxes->magics = bob->next;
+	    free(bob->ext_regex);
+	    if (bob->ext != NULL) {
+		regfree(bob->ext);
+		free(bob->ext);
+	    }
+	    free(bob);
+	}
 	while (syntaxes->color != NULL) {
 	    colortype *bob = syntaxes->color;
 
@@ -1783,18 +1653,29 @@ void thanks_for_all_the_fish(void)
 	syntaxes = syntaxes->next;
 	free(bill);
     }
-#endif /* ENABLE_COLOR */
-#ifndef NANO_TINY
+#endif /* !DISABLE_COLOR */
+#ifndef DISABLE_HISTORIES
     /* Free the search and replace history lists. */
     if (searchage != NULL)
 	free_filestruct(searchage);
     if (replaceage != NULL)
 	free_filestruct(replaceage);
 #endif
-#ifdef ENABLE_NANORC
+    /* Free the functions and shortcuts lists. */
+    while (allfuncs != NULL) {
+        subnfunc *f = allfuncs;
+        allfuncs = allfuncs->next;
+        free(f);
+    }
+    while (sclist != NULL) {
+        sc *s = sclist;
+        sclist = sclist->next;
+        free(s);
+    }
+#ifndef DISABLE_NANORC
     if (homedir != NULL)
 	free(homedir);
 #endif
 }
-#endif /* DEBUG */
 
+#endif /* DEBUG */
diff --git a/src/help.c b/src/help.c
index 0eede72..6b00fa2 100644
--- a/src/help.c
+++ b/src/help.c
@@ -1,9 +1,9 @@
-/* $Id: help.c 4453 2009-12-02 03:36:22Z astyanax $ */
+/* $Id: help.c 5051 2014-07-02 09:29:05Z bens $ */
 /**************************************************************************
  *   help.c                                                               *
  *                                                                        *
  *   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,  *
- *   2009 Free Software Foundation, Inc.                                  *
+ *   2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.          *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -37,29 +37,24 @@ static char *help_text = NULL;
 void do_help(void (*refresh_func)(void))
 {
     int kbinput = ERR;
-    bool meta_key, func_key, old_no_help = ISSET(NO_HELP);
-    bool abort = FALSE;
-	/* Whether we should abort the help browser. */
+    bool old_no_help = ISSET(NO_HELP);
     size_t line = 0;
 	/* The line number in help_text of the first displayed help
 	 * line.  This variable is zero-based. */
     size_t last_line = 0;
 	/* The line number in help_text of the last help line.  This
 	 * variable is zero-based. */
-#ifndef DISABLE_MOUSE
-	/* The current shortcut list. */
     int oldmenu = currmenu;
-#endif
+	/* The menu we were called from. */
     const char *ptr;
 	/* The current line of the help text. */
     size_t old_line = (size_t)-1;
 	/* The line we were on before the current line. */
-    const sc *s;
-    const subnfunc *f;
+    functionptrtype func;
+	/* The function of the key the user typed in. */
 
     curs_set(0);
     blank_edit();
-    wattroff(bottomwin, reverse_attr);
     blank_statusbar();
 
     /* Set help_text as the string to display. */
@@ -67,11 +62,9 @@ void do_help(void (*refresh_func)(void))
 
     assert(help_text != NULL);
 
-#ifndef DISABLE_MOUSE
     /* Set currmenu to allow clicking on the help screen's shortcut
      * list, after help_init() is called. */
     currmenu = MHELP;
-#endif
 
     if (ISSET(NO_HELP)) {
 	/* Make sure that the help screen's shortcut list will actually
@@ -94,7 +87,7 @@ void do_help(void (*refresh_func)(void))
     if (last_line > 0)
 	last_line--;
 
-    while (!abort) {
+    while (TRUE) {
 	size_t i;
 
 	/* Display the help text if we don't have a key, or if the help
@@ -126,62 +119,46 @@ void do_help(void (*refresh_func)(void))
 
 	old_line = line;
 
-	kbinput = get_kbinput(edit, &meta_key, &func_key);
+	kbinput = get_kbinput(edit);
 
 #ifndef DISABLE_MOUSE
-        if (kbinput == KEY_MOUSE) {
-		int mouse_x, mouse_y;
-		get_mouseinput(&mouse_x, &mouse_y, TRUE);
-		continue;
-	    /* Redraw the screen. */
+	if (kbinput == KEY_MOUSE) {
+	    int mouse_x, mouse_y;
+	    get_mouseinput(&mouse_x, &mouse_y, TRUE);
+	    continue;    /* Redraw the screen. */
 	}
 #endif
 
-	parse_help_input(&kbinput, &meta_key, &func_key);
-        s = get_shortcut(MHELP, &kbinput, &meta_key, &func_key);
-	if (!s)
-	    continue;
-        f = sctofunc((sc *) s);
-	if (!f)
-	    continue;
-
-	  if (f->scfunc == TOTAL_REFRESH) {
-		total_redraw();
-		break;
-	} else if (f->scfunc == DO_PAGE_UP) {
-		if (line > editwinrows - 2)
-		    line -= editwinrows - 2;
-		else
-		    line = 0;
-	} else if (f->scfunc == DO_PAGE_DOWN) {
-		if (line + (editwinrows - 1) < last_line)
-		    line += editwinrows - 2;
-	} else if (f->scfunc == DO_UP_VOID) {
-		if (line > 0)
-		    line--;
-	} else if (f->scfunc == DO_DOWN_VOID) {
-		if (line + (editwinrows - 1) < last_line)
-		    line++;
-	} else if (f->scfunc == DO_FIRST_LINE) {
-		if (meta_key)
-		    line = 0;
-		break;
-	} else if (f->scfunc == DO_LAST_LINE) {
-		if (meta_key) {
-		    if (line + (editwinrows - 1) < last_line)
-			line = last_line - (editwinrows - 1);
-		}
-		break;
-	    /* Abort the help browser. */
-	} else if (f->scfunc == DO_EXIT) {
-		abort = TRUE;
-		break;
+	func = parse_help_input(&kbinput);
+
+	if (func == total_refresh) {
+	    total_redraw();
+	} else if (func == do_page_up) {
+	    if (line > editwinrows - 2)
+		line -= editwinrows - 2;
+	    else
+		line = 0;
+	} else if (func == do_page_down) {
+	    if (line + (editwinrows - 1) < last_line)
+		line += editwinrows - 2;
+	} else if (func == do_up_void) {
+	    if (line > 0)
+		line--;
+	} else if (func == do_down_void) {
+	    if (line + (editwinrows - 1) < last_line)
+		line++;
+	} else if (func == do_first_line) {
+	    line = 0;
+	} else if (func == do_last_line) {
+	    if (line + (editwinrows - 1) < last_line)
+		line = last_line - (editwinrows - 1);
+	} else if (func == do_exit) {
+	    /* Exit from the help browser. */
+	    break;
 	}
     }
 
-#ifndef DISABLE_MOUSE
     currmenu = oldmenu;
-#endif
 
     if (old_no_help) {
 	blank_bottombars();
@@ -201,14 +178,6 @@ void do_help(void (*refresh_func)(void))
     help_text = NULL;
 }
 
-#ifndef DISABLE_BROWSER
-/* Start the help browser for the file browser. */
-void do_browser_help(void)
-{
-    do_help(&browser_refresh);
-}
-#endif
-
 /* This function allocates help_text, and stores the help string in it.
  * help_text should be NULL initially. */
 void help_init(void)
@@ -224,7 +193,7 @@ void help_init(void)
     int scsfound = 0;
 
 #ifndef NANO_TINY
-#ifdef ENABLE_NANORC
+#ifndef DISABLE_NANORC
     bool old_whitespace = ISSET(WHITESPACE_DISPLAY);
 
     UNSET(WHITESPACE_DISPLAY);
@@ -232,7 +201,7 @@ void help_init(void)
 #endif
 
     /* First, set up the initial help text for the current function. */
-    if (currmenu == MWHEREIS || currmenu == MREPLACE || currmenu == MREPLACE2) {
+    if (currmenu == MWHEREIS || currmenu == MREPLACE || currmenu == MREPLACEWITH) {
 	htx[0] = N_("Search Command Help Text\n\n "
 		"Enter the words or characters you would like to "
 		"search for, and then press Enter.  If there is a "
@@ -392,24 +361,23 @@ void help_init(void)
     if (htx[2] != NULL)
 	allocsize += strlen(htx[2]);
 
-    /* Count the shortcut help text.  Each entry has up to three keys,
-     * which fill 24 columns, plus translated text, plus one or two
-     * \n's. */
+    /* Calculate the length of the shortcut help text.  Each entry has
+     * one or two keys, which fill 16 columns, plus translated text,
+     * plus one or two \n's. */
 	for (f = allfuncs; f != NULL; f = f->next)
-            if (f->menus & currmenu)
-		allocsize += (24 * mb_cur_max()) + strlen(f->help) + 2;
+	    if (f->menus & currmenu)
+		allocsize += (16 * mb_cur_max()) + strlen(f->help) + 2;
 
 #ifndef NANO_TINY
     /* If we're on the main list, we also count the toggle help text.
-     * Each entry has "M-%c\t\t\t", which fills 24 columns, plus a
-     * space, plus translated text, plus one or two '\n's. */
+     * Each entry has "M-%c\t\t", five chars which fill 16 columns,
+     * plus a space, plus translated text, plus one or two '\n's. */
     if (currmenu == MMAIN) {
 	size_t endis_len = strlen(_("enable/disable"));
 
 	for (s = sclist; s != NULL; s = s->next)
-            if (s->scfunc ==  DO_TOGGLE)
-		allocsize += strlen(_(flagtostr(s->toggle))) + endis_len + 9;
-
+	    if (s->scfunc == do_toggle_void)
+		allocsize += strlen(_(flagtostr(s->toggle))) + endis_len + 8;
     }
 #endif
 
@@ -433,39 +401,36 @@ void help_init(void)
     /* Now add our shortcut info. */
     for (f = allfuncs; f != NULL; f = f->next) {
 
-        if ((f->menus & currmenu) == 0)
+	if ((f->menus & currmenu) == 0)
 	    continue;
 
-        if (!f->desc || !strcmp(f->desc, ""))
-	    continue;
-
-        /* Lets just try and use the first 3 shortcuts
-           from the new struct... */
-        for (s = sclist, scsfound = 0; s != NULL; s = s->next) {
+	/* Let's simply show the first two shortcuts from the list. */
+	for (s = sclist, scsfound = 0; s != NULL; s = s->next) {
 
-            if (scsfound == 3)
-		continue;
-
-            if (s->type == RAW)
+	    if (s->type == RAWINPUT)
 		continue;
 
 	    if ((s->menu & currmenu) == 0)
 		continue;
 
-            if (s->scfunc == f->scfunc) {
+	    if (s->scfunc == f->scfunc) {
 		scsfound++;
-
-		if (scsfound == 1)
-		    ptr += sprintf(ptr, "%s", s->keystr);
-		else
-		    ptr += sprintf(ptr, "(%s)", s->keystr);
-		*(ptr++) = '\t';
+		/* Make the first column narrower (6) than the second (10),
+		 * but allow it to spill into the second, for "M-Space". */
+		if (scsfound == 1) {
+		    sprintf(ptr, "%s              ", s->keystr);
+		    ptr += 6;
+		} else {
+		    ptr += sprintf(ptr, "(%s)\t", s->keystr);
+		    break;
+		}
 	    }
 	}
-	/* Pad with tabs if we didnt find 3 */
-        for (; scsfound < 3; scsfound++) {
-	    *(ptr++) = '\t';
-	}
+
+	if (scsfound == 0)
+	    ptr += sprintf(ptr, "\t\t");
+	else if (scsfound == 1)
+	    ptr += 10;
 
 	/* The shortcut's help text. */
 	ptr += sprintf(ptr, "%s\n", _(f->help));
@@ -477,48 +442,41 @@ void help_init(void)
 #ifndef NANO_TINY
     /* And the toggles... */
     if (currmenu == MMAIN)
-        for (s = sclist; s != NULL; s = s->next)
-            if (s->scfunc ==  DO_TOGGLE)
-		ptr += sprintf(ptr, "(%s)\t\t\t%s %s\n",
-		    s->keystr, _(flagtostr(s->toggle)), _("enable/disable"));
-
+	for (s = sclist; s != NULL; s = s->next) {
+	    if (s->scfunc == do_toggle_void)
+		ptr += sprintf(ptr, "%s\t\t%s %s\n", (s->menu == MMAIN ? s->keystr : ""),
+				 _(flagtostr(s->toggle)), _("enable/disable"));
+	    if (s->toggle == NO_COLOR_SYNTAX || s->toggle == TABS_TO_SPACES)
+		ptr += sprintf(ptr, "\n");
+	}
 
-#ifdef ENABLE_NANORC
+#ifndef DISABLE_NANORC
     if (old_whitespace)
 	SET(WHITESPACE_DISPLAY);
 #endif
-#endif
+#endif /* !NANO_TINY */
 
     /* If all went well, we didn't overwrite the allocated space for
      * help_text. */
     assert(strlen(help_text) <= allocsize + 1);
 }
 
-/* Determine the shortcut key corresponding to the values of kbinput
- * (the key itself), meta_key (whether the key is a meta sequence), and
- * func_key (whether the key is a function key), if any.  In the
- * process, convert certain non-shortcut keys into their corresponding
- * shortcut keys. */
-void parse_help_input(int *kbinput, bool *meta_key, bool *func_key)
+/* Return the function that is bound to the given key, accepting certain
+ * plain characters too, for consistency with the file browser. */
+functionptrtype parse_help_input(int *kbinput)
 {
-    get_shortcut(MHELP, kbinput, meta_key, func_key);
-
-    if (!*meta_key) {
+    if (!meta_key) {
 	switch (*kbinput) {
-	    /* For consistency with the file browser. */
 	    case ' ':
-		*kbinput = sc_seq_or(DO_PAGE_UP, 0);
-		break;
+		return do_page_down;
 	    case '-':
-		*kbinput = sc_seq_or(DO_PAGE_DOWN, 0);;
-		break;
-	    /* Cancel is equivalent to Exit here. */
+		return do_page_up;
 	    case 'E':
 	    case 'e':
-		*kbinput = sc_seq_or(DO_EXIT, 0);;
-		break;
+		return do_exit;
 	}
     }
+    return func_from_key(kbinput);
 }
 
 /* Calculate the next line of help_text, starting at ptr. */
@@ -547,17 +505,21 @@ size_t help_line_len(const char *ptr)
 
 #endif /* !DISABLE_HELP */
 
-/* Start the help browser for the edit window. */
+/* Start the help browser. */
 void do_help_void(void)
 {
-
 #ifndef DISABLE_HELP
-    /* Start the help browser for the edit window. */
-    do_help(&edit_refresh);
+    /* Start the help browser, with the correct refresher for afterwards. */
+#ifndef DISABLE_BROWSER
+    if (currmenu == MBROWSER || currmenu == MWHEREISFILE || currmenu == MGOTODIR)
+	do_help(&browser_refresh);
+    else
+#endif
+	do_help(&edit_refresh);
 #else
     if (currmenu == MMAIN)
 	nano_disabled_msg();
     else
 	beep();
-#endif
+#endif /* !DISABLE_HELP */
 }
diff --git a/src/move.c b/src/move.c
index 468a02f..910ff83 100644
--- a/src/move.c
+++ b/src/move.c
@@ -1,9 +1,9 @@
-/* $Id: move.c 4486 2010-03-21 04:56:37Z astyanax $ */
+/* $Id: move.c 5013 2014-06-23 18:20:12Z bens $ */
 /**************************************************************************
  *   move.c                                                               *
  *                                                                        *
  *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009 Free Software Foundation, Inc.                            *
+ *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -33,7 +33,7 @@ void do_first_line(void)
     openfile->current_x = 0;
     openfile->placewewant = 0;
 
-    edit_refresh_needed = 1;
+    edit_refresh_needed = TRUE;
 }
 
 /* Move to the last line of the file. */
@@ -44,7 +44,7 @@ void do_last_line(void)
     openfile->placewewant = xplustabs();
     openfile->current_y = editwinrows - 1;
 
-    edit_refresh_needed = 1;
+    edit_refresh_needed = TRUE;
 }
 
 /* Move up one page. */
@@ -55,7 +55,10 @@ void do_page_up(void)
     /* If there's less than a page of text left on the screen, put the
      * cursor at the beginning of the first line of the file, and then
      * update the edit window. */
-    if (openfile->current->lineno == 1 || (!ISSET(SOFTWRAP) &&
+    if (openfile->current->lineno == 1 || (
+#ifndef NANO_TINY
+	!ISSET(SOFTWRAP) &&
+#endif
 	openfile->current->lineno <= editwinrows - 2)) {
 	do_first_line();
 	return;
@@ -63,7 +66,6 @@ void do_page_up(void)
 
     /* If we're not in smooth scrolling mode, put the cursor at the
      * beginning of the top line of the edit window, as Pico does. */
-
 #ifndef NANO_TINY
     if (!ISSET(SMOOTH_SCROLL)) {
 #endif
@@ -76,20 +78,23 @@ void do_page_up(void)
     for (i = editwinrows - 2; i - skipped > 0 && openfile->current !=
 	openfile->fileage; i--) {
 	openfile->current = openfile->current->prev;
+#ifndef NANO_TINY
 	if (ISSET(SOFTWRAP) && openfile->current) {
 	    skipped += strlenpt(openfile->current->data) / COLS;
 #ifdef DEBUG
-    fprintf(stderr, "do_page_up: i = %d, skipped = %d based on line %ld len %d\n", i, (unsigned long) skipped, 
-openfile->current->lineno, strlenpt(openfile->current->data));
+	    fprintf(stderr, "do_page_up: i = %d, skipped = %d based on line %ld len %lu\n",
+			i, skipped, (long)openfile->current->lineno, (unsigned long)strlenpt(openfile->current->data));
 #endif
 	}
+#endif
     }
 
     openfile->current_x = actual_x(openfile->current->data,
 	openfile->placewewant);
 
 #ifdef DEBUG
-    fprintf(stderr, "do_page_up: openfile->current->lineno = %lu, skipped = %d\n", (unsigned long) openfile->current->lineno, skipped);
+    fprintf(stderr, "do_page_up: openfile->current->lineno = %lu, skipped = %d\n",
+	(unsigned long)openfile->current->lineno, skipped);
 #endif
 
     /* Scroll the edit window up a page. */
@@ -125,7 +130,7 @@ void do_page_down(void)
 	openfile->filebot; i--) {
 	openfile->current = openfile->current->next;
 #ifdef DEBUG
-    fprintf(stderr, "do_page_down: moving to line %lu\n", (unsigned long) openfile->current->lineno);
+	fprintf(stderr, "do_page_down: moving to line %lu\n", (unsigned long)openfile->current->lineno);
 #endif
 
     }
@@ -513,12 +518,12 @@ void do_up(
      * smooth scrolling mode, or up half a page if we're not.  If
      * scroll_only is TRUE, scroll the edit window up one line
      * unconditionally. */
-    if (openfile->current_y == 0 || (ISSET(SOFTWRAP) && openfile->edittop->lineno == openfile->current->next->lineno)
+    if (openfile->current_y == 0
 #ifndef NANO_TINY
-	|| scroll_only
+	|| (ISSET(SOFTWRAP) && openfile->edittop->lineno == openfile->current->next->lineno) || scroll_only
 #endif
 	)
-	edit_scroll(UP_DIR,
+	edit_scroll(UPWARD,
 #ifndef NANO_TINY
 		(ISSET(SMOOTH_SCROLL) || scroll_only) ? 1 :
 #endif
@@ -563,13 +568,15 @@ void do_down(
 #endif
 	)
 {
-    bool onlastline = FALSE;
+#ifndef NANO_TINY
+    int amount = 0, enough;
+    filestruct *topline;
+#endif
 
     /* If we're at the bottom of the file, get out. */
-    if (openfile->current == openfile->filebot)
+    if (openfile->current == openfile->filebot || !openfile->current->next)
 	return;
 
-
     assert(ISSET(SOFTWRAP) || openfile->current_y == openfile->current->lineno - openfile->edittop->lineno);
 
     /* Move the current line of the edit window down. */
@@ -577,34 +584,54 @@ void do_down(
     openfile->current_x = actual_x(openfile->current->data,
 	openfile->placewewant);
 
+#ifndef NANO_TINY
     if (ISSET(SOFTWRAP)) {
-	if (openfile->current->lineno - openfile->edittop->lineno >= maxrows)
-	    onlastline = TRUE;
+	/* Compute the amount to scroll. */
+	amount = (strlenpt(openfile->current->data) / COLS + openfile->current_y + 2
+		 + strlenpt(openfile->current->prev->data) / COLS - editwinrows);
+	topline = openfile->edittop;
+	/* Reduce the amount when there are overlong lines at the top. */
+	for (enough = 1; enough < amount; enough++) {
+	    if (amount <= strlenpt(topline->data) / COLS) {
+		amount = enough;
+		break;
+	    }
+	    amount -= strlenpt(topline->data) / COLS;
+	    topline = topline->next;
+	}
     }
+#endif
 
-    /* If scroll_only is FALSE and if we're on the first line of the
+    /* If scroll_only is FALSE and if we're on the last line of the
      * edit window, scroll the edit window down one line if we're in
      * smooth scrolling mode, or down half a page if we're not.  If
      * scroll_only is TRUE, scroll the edit window down one line
      * unconditionally. */
-    if (onlastline || openfile->current_y == editwinrows - 1
+    if (openfile->current_y == editwinrows - 1
 #ifndef NANO_TINY
-	|| scroll_only
+	|| amount > 0 || scroll_only
 #endif
 	) {
-	edit_scroll(DOWN_DIR,
 #ifndef NANO_TINY
-		(ISSET(SMOOTH_SCROLL) || scroll_only) ? 1 :
+	if (amount < 1 || scroll_only)
+	    amount = 1;
+#endif
+	edit_scroll(DOWNWARD,
+#ifndef NANO_TINY
+		(ISSET(SMOOTH_SCROLL) || scroll_only) ? amount :
 #endif
 		editwinrows / 2 + 1);
-
 	edit_refresh_needed = TRUE;
     }
     /* If we're above the last line of the edit window, update the line
      * we were on before and the line we're on now.  The former needs to
      * be redrawn if we're not on the first page, and the latter needs
      * to be drawn unconditionally. */
-    if (ISSET(SOFTWRAP) || openfile->current_y < editwinrows - 1) {
+    if (openfile->current_y < editwinrows - 1
+#ifndef NANO_TINY
+	|| ISSET(SOFTWRAP)
+#endif
+	) {
 	if (need_vertical_update(0))
 	    update_line(openfile->current->prev, 0);
 	update_line(openfile->current, openfile->current_x);
diff --git a/src/nano.c b/src/nano.c
index e4e2222..6930425 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1,9 +1,9 @@
-/* $Id: nano.c 4520 2010-11-12 06:23:14Z astyanax $ */ 
+/* $Id: nano.c 5141 2015-03-20 11:18:22Z bens $ */
 /**************************************************************************
  *   nano.c                                                               *
  *                                                                        *
  *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009 Free Software Foundation, Inc.                            *
+ *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -48,7 +48,7 @@
 static int oldinterval = -1;
 	/* Used to store the user's original mouse click interval. */
 #endif
-#ifdef ENABLE_NANORC
+#ifndef DISABLE_NANORC
 static bool no_rcfiles = FALSE;
 	/* Should we ignore all rcfiles? */
 #endif
@@ -68,7 +68,7 @@ filestruct *make_new_node(filestruct *prevnode)
     newnode->next = NULL;
     newnode->lineno = (prevnode != NULL) ? prevnode->lineno + 1 : 1;
 
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     newnode->multidata = NULL;
 #endif
 
@@ -88,7 +88,7 @@ filestruct *copy_node(const filestruct *src)
     dst->next = src->next;
     dst->prev = src->prev;
     dst->lineno = src->lineno;
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     dst->multidata = NULL;
 #endif
 
@@ -127,7 +127,7 @@ void delete_node(filestruct *fileptr)
     if (fileptr->data != NULL)
 	free(fileptr->data);
 
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     if (fileptr->multidata)
 	free(fileptr->multidata);
 #endif
@@ -178,7 +178,8 @@ void renumber(filestruct *fileptr)
 {
     ssize_t line;
 
-    assert(fileptr != NULL);
+    if (fileptr == NULL)
+	return;
 
     line = (fileptr->prev == NULL) ? 0 : fileptr->prev->lineno;
 
@@ -297,6 +298,7 @@ void move_to_filestruct(filestruct **file_top, filestruct **file_bot,
     bool edittop_inside;
 #ifndef NANO_TINY
     bool mark_inside = FALSE;
+    bool same_line = FALSE;
 #endif
 
     assert(file_top != NULL && file_bot != NULL && top != NULL && bot != NULL);
@@ -314,7 +316,7 @@ void move_to_filestruct(filestruct **file_top, filestruct **file_bot,
 	openfile->fileage->lineno && openfile->edittop->lineno <=
 	openfile->filebot->lineno);
 #ifndef NANO_TINY
-    if (openfile->mark_set)
+    if (openfile->mark_set) {
 	mark_inside = (openfile->mark_begin->lineno >=
 		openfile->fileage->lineno &&
 		openfile->mark_begin->lineno <=
@@ -323,6 +325,8 @@ void move_to_filestruct(filestruct **file_top, filestruct **file_bot,
 		openfile->mark_begin_x >= top_x) &&
 		(openfile->mark_begin != openfile->filebot ||
 		openfile->mark_begin_x <= bot_x));
+	same_line = (openfile->mark_begin == openfile->fileage);
+    }
 #endif
 
     /* Get the number of characters in the text, and subtract it from
@@ -357,10 +361,12 @@ void move_to_filestruct(filestruct **file_top, filestruct **file_bot,
 	    *file_bot = openfile->filebot;
 	}
 
+	openfile->fileage->next = NULL;
+	free_filestruct(openfile->fileage);
+
 	/* Renumber starting with the line after the original
 	 * file_bot. */
-	if (file_bot_save->next != NULL)
-	    renumber(file_bot_save->next);
+	renumber(file_bot_save->next);
     }
 
     /* Since the text has now been saved, remove it from the
@@ -369,7 +375,7 @@ void move_to_filestruct(filestruct **file_top, filestruct **file_bot,
     openfile->fileage->data = mallocstrcpy(NULL, "");
     openfile->filebot = openfile->fileage;
 
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     openfile->fileage->multidata = NULL;
 #endif
 
@@ -382,7 +388,9 @@ void move_to_filestruct(filestruct **file_top, filestruct **file_bot,
     if (mark_inside) {
 	openfile->mark_begin = openfile->current;
 	openfile->mark_begin_x = openfile->current_x;
-    }
+    } else if (same_line)
+	/* Update the content of this partially cut line. */
+	openfile->mark_begin = openfile->current;
 #endif
 
     top_save = openfile->fileage;
@@ -406,10 +414,9 @@ void move_to_filestruct(filestruct **file_top, filestruct **file_bot,
 	new_magicline();
 }
 
-/* Copy all the text from the filestruct beginning with file_top and
- * ending with file_bot to the current filestruct at the current cursor
- * position. */
-void copy_from_filestruct(filestruct *file_top, filestruct *file_bot)
+/* Copy all text from the given filestruct to the current filestruct
+ * at the current cursor position. */
+void copy_from_filestruct(filestruct *somebuffer)
 {
     filestruct *top_save;
     size_t current_x_save = openfile->current_x;
@@ -418,7 +425,7 @@ void copy_from_filestruct(filestruct *file_top, filestruct *file_bot)
     bool right_side_up = FALSE, single_line = FALSE;
 #endif
 
-    assert(file_top != NULL && file_bot != NULL);
+    assert(somebuffer != NULL);
 
 #ifndef NANO_TINY
     /* Keep track of whether the mark begins inside the partition and
@@ -441,9 +448,10 @@ void copy_from_filestruct(filestruct *file_top, filestruct *file_bot)
 	openfile->current_x, openfile->current, openfile->current_x);
     edittop_inside = (openfile->edittop == openfile->fileage);
 
-    /* Put the top and bottom of the filestruct at copies of file_top
-     * and file_bot. */
-    openfile->fileage = copy_filestruct(file_top);
+    /* Put the top and bottom of the current filestruct at the top and
+     * bottom of a copy of the passed buffer. */
+    free_filestruct(openfile->fileage);
+    openfile->fileage = copy_filestruct(somebuffer);
     openfile->filebot = openfile->fileage;
     while (openfile->filebot->next != NULL)
 	openfile->filebot = openfile->filebot->next;
@@ -465,7 +473,12 @@ void copy_from_filestruct(filestruct *file_top, filestruct *file_bot)
     }
 #ifndef NANO_TINY
     else if (openfile->mark_set) {
-	if (!right_side_up) {
+	if (right_side_up) {
+	    if (single_line)
+		/* Get the new data, stuff was inserted on the mark line. */
+		openfile->mark_begin = openfile->fileage;
+		/* The x is okay, it did not move. */
+	} else {
 	    if (single_line) {
 		openfile->mark_begin = openfile->current;
 		openfile->mark_begin_x -= current_x_save;
@@ -520,6 +533,7 @@ openfilestruct *make_new_opennode(void)
 #ifndef NANO_TINY
     newnode->current_stat = NULL;
     newnode->last_action = OTHER;
+    newnode->lock_filename = NULL;
 #endif
 
     return newnode;
@@ -602,9 +616,13 @@ void finish(void)
     /* Restore the old terminal settings. */
     tcsetattr(0, TCSANOW, &oldterm);
 
-#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
-    if (!no_rcfiles && ISSET(HISTORYLOG))
+#ifndef DISABLE_HISTORIES
+    if (ISSET(HISTORYLOG))
 	save_history();
+    if (ISSET(POS_HISTORY)) {
+	update_poshistory(openfile->filename, openfile->current->lineno, xplustabs() + 1);
+	save_poshistory();
+    }
 #endif
 
 #ifdef DEBUG
@@ -642,7 +660,7 @@ void die(const char *msg, ...)
 		);
     }
 
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
     /* Save all of the other modified file buffers, if any. */
     if (openfile != NULL) {
 	openfilestruct *tmp = openfile;
@@ -708,6 +726,8 @@ void die_save_file(const char *die_filename
 	int shush;
 	shush = chmod(retval, die_stat->st_mode);
 	shush = chown(retval, die_stat->st_uid, die_stat->st_gid);
+	if (shush)
+	    ;
     }
 #endif
 
@@ -718,7 +738,7 @@ void die_save_file(const char *die_filename
 void window_init(void)
 {
     /* If the screen height is too small, get out. */
-    editwinrows = LINES - 5 + no_more_space() + no_help();
+    editwinrows = LINES - 5 + more_space() + no_help();
     if (COLS < MIN_EDITOR_COLS || editwinrows < MIN_EDITOR_ROWS)
 	die(_("Window size is too small for nano...\n"));
 
@@ -739,10 +759,10 @@ void window_init(void)
 	delwin(bottomwin);
 
     /* Set up the windows. */
-    topwin = newwin(2 - no_more_space(), COLS, 0, 0);
-    edit = newwin(editwinrows, COLS, 2 - no_more_space(), 0);
+    topwin = newwin(2 - more_space(), COLS, 0, 0);
+    edit = newwin(editwinrows, COLS, 2 - more_space(), 0);
     bottomwin = newwin(3 - no_help(), COLS, editwinrows + (2 -
-	no_more_space()), 0);
+	more_space()), 0);
 
     /* Turn the keypad on for the windows, if necessary. */
     if (!ISSET(REBIND_KEYPAD)) {
@@ -810,7 +830,7 @@ void print_opt_full(const char *shortflag
     printf("\n");
 }
 
-/* Explain how to properly use nano and its command line options. */
+/* Explain how to properly use nano and its command-line options. */
 void usage(void)
 {
     printf(_("Usage: nano [OPTIONS] [[+LINE,COLUMN] FILE]...\n\n"));
@@ -821,8 +841,9 @@ void usage(void)
 	_("Option\t\tMeaning\n")
 #endif
 	);
-    print_opt("-h, -?", "--help", N_("Show this message"));
     print_opt(_("+LINE,COLUMN"), "",
+	/* TRANSLATORS: The next forty or so strings are option descriptions
+	 * for the --help output.  Try to keep them at most 40 characters. */
 	N_("Start at line LINE, column COLUMN"));
 #ifndef NANO_TINY
     print_opt("-A", "--smarthome", N_("Enable smart home key"));
@@ -836,14 +857,18 @@ void usage(void)
     print_opt("-E", "--tabstospaces",
 	N_("Convert typed tabs to spaces"));
 #endif
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
     print_opt("-F", "--multibuffer", N_("Enable multiple file buffers"));
 #endif
-#ifdef ENABLE_NANORC
 #ifndef NANO_TINY
+    print_opt("-G", "--locking",
+	N_("Use (vim-style) lock files"));
+#endif
+#ifndef DISABLE_HISTORIES
     print_opt("-H", "--historylog",
 	N_("Log & read search/replace string history"));
 #endif
+#ifndef DISABLE_NANORC
     print_opt("-I", "--ignorercfiles",
 	N_("Don't look at nanorc files"));
 #endif
@@ -856,6 +881,10 @@ void usage(void)
 	N_("Don't convert files from DOS/Mac format"));
 #endif
     print_opt("-O", "--morespace", N_("Use one more line for editing"));
+#ifndef DISABLE_HISTORIES
+    print_opt("-P", "--poslog",
+	N_("Log & read location of cursor position"));
+#endif
 #ifndef DISABLE_JUSTIFY
     print_opt(_("-Q <str>"), _("--quotestr=<str>"),
 	N_("Quoting string"));
@@ -876,13 +905,14 @@ void usage(void)
     print_opt("-W", "--wordbounds",
 	N_("Detect word boundaries more accurately"));
 #endif
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     print_opt(_("-Y <str>"), _("--syntax=<str>"),
 	N_("Syntax definition to use for coloring"));
 #endif
     print_opt("-c", "--const", N_("Constantly show cursor position"));
     print_opt("-d", "--rebinddelete",
 	N_("Fix Backspace/Delete confusion problem"));
+    print_opt("-h", "--help", N_("Show this help text"));
 #ifndef NANO_TINY
     print_opt("-i", "--autoindent",
 	N_("Automatically indent new lines"));
@@ -893,17 +923,20 @@ void usage(void)
 #ifndef DISABLE_MOUSE
     print_opt("-m", "--mouse", N_("Enable the use of the mouse"));
 #endif
+    print_opt("-n", "--noread", N_("Do not read the file (only write it)"));
 #ifndef DISABLE_OPERATINGDIR
     print_opt(_("-o <dir>"), _("--operatingdir=<dir>"),
 	N_("Set operating directory"));
 #endif
     print_opt("-p", "--preserve",
 	N_("Preserve XON (^Q) and XOFF (^S) keys"));
+#ifndef DISABLE_NANORC
     print_opt("-q", "--quiet",
 	N_("Silently ignore startup issues like rc file errors"));
+#endif
 #ifndef DISABLE_WRAPJUSTIFY
     print_opt(_("-r <#cols>"), _("--fill=<#cols>"),
-	N_("Set wrapping point at column #cols"));
+	N_("Set hard-wrapping point at column #cols"));
 #endif
 #ifndef DISABLE_SPELLER
     print_opt(_("-s <prog>"), _("--speller=<prog>"),
@@ -911,23 +944,15 @@ void usage(void)
 #endif
     print_opt("-t", "--tempfile",
 	N_("Auto save on exit, don't prompt"));
-#ifndef NANO_TINY
-    print_opt("-u", "--undo", N_("Allow generic undo [EXPERIMENTAL]"));
-#endif
-
     print_opt("-v", "--view", N_("View mode (read-only)"));
 #ifndef DISABLE_WRAPPING
-    print_opt("-w", "--nowrap", N_("Don't wrap long lines"));
+    print_opt("-w", "--nowrap", N_("Don't hard-wrap long lines"));
 #endif
     print_opt("-x", "--nohelp", N_("Don't show the two help lines"));
     print_opt("-z", "--suspend", N_("Enable suspension"));
+#ifndef NANO_TINY
     print_opt("-$", "--softwrap", N_("Enable soft line wrapping"));
-
-    /* This is a special case. */
-    print_opt("-a, -b, -e,", "", NULL);
-    print_opt("-f, -g, -j", "", N_("(ignored, for Pico compatibility)"));
-
-    exit(0);
+#endif
 }
 
 /* Display the current version of nano, the date and time it was
@@ -935,28 +960,86 @@ void usage(void)
  * it was compiled with. */
 void version(void)
 {
-    printf(_(" GNU nano version %s (compiled %s, %s)\n"), VERSION,
-	__TIME__, __DATE__);
-    printf(" (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,\n");
-    printf(" 2008, 2009 Free Software Foundation, Inc.\n");
+    printf(_(" GNU nano, version %s\n"), VERSION);
+    printf(" (C) 1999..2015 Free Software Foundation, Inc.\n");
     printf(
 	_(" Email: nano@nano-editor.org	Web: http://www.nano-editor.org/"));
     printf(_("\n Compiled options:"));
 
+#ifdef NANO_TINY
+    printf(" --enable-tiny");
+#ifndef DISABLE_BROWSER
+    printf(" --enable-browser");
+#endif
+#ifndef DISABLE_COLOR
+    printf(" --enable-color");
+#endif
+#ifndef DISABLE_EXTRA
+    printf(" --enable-extra");
+#endif
+#ifndef DISABLE_HELP
+    printf(" --enable-help");
+#endif
+#ifndef DISABLE_HISTORIES
+    printf(" --enable-histories");
+#endif
+#ifndef DISABLE_JUSTIFY
+    printf(" --enable-justify");
+#endif
+#ifdef HAVE_LIBMAGIC
+    printf(" --enable-libmagic");
+#endif
+#ifndef DISABLE_MOUSE
+    printf(" --enable-mouse");
+#endif
+#ifndef DISABLE_NANORC
+    printf(" --enable-nanorc");
+#endif
+#ifndef DISABLE_MULTIBUFFER
+    printf(" --enable-multibuffer");
+#endif
+#ifndef DISABLE_OPERATINGDIR
+    printf(" --enable-operatingdir");
+#endif
+#ifndef DISABLE_SPELLER
+    printf(" --enable-speller");
+#endif
+#ifndef DISABLE_TABCOMP
+    printf(" --enable-tabcomp");
+#endif
+#ifndef DISABLE_WRAPPING
+    printf(" --enable-wrapping");
+#endif
+#else /* !NANO_TINY */
 #ifdef DISABLE_BROWSER
     printf(" --disable-browser");
 #endif
+#ifdef DISABLE_COLOR
+    printf(" --disable-color");
+#endif
+#ifdef DISABLE_EXTRA
+    printf(" --disable-extra");
+#endif
 #ifdef DISABLE_HELP
     printf(" --disable-help");
 #endif
+#ifdef DISABLE_HISTORIES
+    printf(" --disable-histories");
+#endif
 #ifdef DISABLE_JUSTIFY
     printf(" --disable-justify");
 #endif
+#ifndef HAVE_LIBMAGIC
+    printf(" --disable-libmagic");
+#endif
 #ifdef DISABLE_MOUSE
     printf(" --disable-mouse");
 #endif
-#ifndef ENABLE_NLS
-    printf(" --disable-nls");
+#ifdef DISABLE_MULTIBUFFER
+    printf(" --disable-multibuffer");
+#endif
+#ifdef DISABLE_NANORC
+    printf(" --disable-nanorc");
 #endif
 #ifdef DISABLE_OPERATINGDIR
     printf(" --disable-operatingdir");
@@ -970,29 +1053,21 @@ void version(void)
 #ifdef DISABLE_WRAPPING
     printf(" --disable-wrapping");
 #endif
+#endif /* !NANO_TINY */
+
 #ifdef DISABLE_ROOTWRAPPING
     printf(" --disable-wrapping-as-root");
 #endif
-#ifdef ENABLE_COLOR
-    printf(" --enable-color");
-#endif
 #ifdef DEBUG
     printf(" --enable-debug");
 #endif
-#ifdef NANO_EXTRA
-    printf(" --enable-extra");
-#endif
-#ifdef ENABLE_MULTIBUFFER
-    printf(" --enable-multibuffer");
-#endif
-#ifdef ENABLE_NANORC
-    printf(" --enable-nanorc");
-#endif
-#ifdef NANO_TINY
-    printf(" --enable-tiny");
+#ifndef ENABLE_NLS
+    printf(" --disable-nls");
 #endif
 #ifdef ENABLE_UTF8
     printf(" --enable-utf8");
+#else
+    printf(" --disable-utf8");
 #endif
 #ifdef USE_SLANG
     printf(" --with-slang");
@@ -1001,16 +1076,15 @@ void version(void)
 }
 
 /* Return 1 if the MORE_SPACE flag is set, and 0 otherwise.  This is
- * used to calculate the relative screen position while taking this flag
- * into account, since it adds one line to the edit window. */
-int no_more_space(void)
+ * used to calculate the sizes and Y coordinates of the subwindows. */
+int more_space(void)
 {
     return ISSET(MORE_SPACE) ? 1 : 0;
 }
 
 /* Return 2 if the NO_HELP flag is set, and 0 otherwise.  This is used
- * to calculate the relative screen position while taking this flag into
- * account, since it removes two lines from the edit window. */
+ * to calculate the sizes and Y coordinates of the subwindows, because
+ * having NO_HELP adds two lines to the edit window. */
 int no_help(void)
 {
     return ISSET(NO_HELP) ? 2 : 0;
@@ -1024,9 +1098,10 @@ void nano_disabled_msg(void)
 
 /* If the current file buffer has been modified, and the TEMP_FILE flag
  * isn't set, ask whether or not to save the file buffer.  If the
- * TEMP_FILE flag is set, save it unconditionally.  Then, if more than
- * one file buffer is open, close the current file buffer and switch to
- * the next one.  If only one file buffer is open, exit from nano. */
+ * TEMP_FILE flag is set and the current file has a name, save it
+ * unconditionally.  Then, if more than one file buffer is open, close
+ * the current file buffer and switch to the next one.  If only one file
+ * buffer is open, exit from nano. */
 void do_exit(void)
 {
     int i;
@@ -1035,13 +1110,31 @@ void do_exit(void)
      * save. */
     if (!openfile->modified)
 	i = 0;
-    /* If the TEMP_FILE flag is set, pretend the user chose to save. */
-    else if (ISSET(TEMP_FILE))
+    /* If the TEMP_FILE flag is set and the current file has a name,
+     * pretend the user chose to save. */
+    else if (openfile->filename[0] != '\0' && ISSET(TEMP_FILE))
 	i = 1;
     /* Otherwise, ask the user whether or not to save. */
-    else
+    else {
+	/* If the TEMP_FILE flag is set, and the current file doesn't
+	 * have a name, handle it the same way Pico does. */
+	if (ISSET(TEMP_FILE)) {
+	    curs_set(0);
+
+	    /* Warn that the current file has no name. */
+	    statusbar(_("No file name"));
+	    beep();
+
+	    /* Ensure that we see the warning. */
+	    doupdate();
+	    napms(2000);
+
+	    curs_set(1);
+	}
+
 	i = do_yesno_prompt(FALSE,
 		_("Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "));
+    }
 
 #ifdef DEBUG
     dump_filestruct(openfile->fileage);
@@ -1050,62 +1143,68 @@ void do_exit(void)
     /* If the user chose not to save, or if the user chose to save and
      * the save succeeded, we're ready to exit. */
     if (i == 0 || (i == 1 && do_writeout(TRUE))) {
-#ifdef ENABLE_MULTIBUFFER
+
+#ifndef NANO_TINY
+        if (ISSET(LOCKING) && openfile->lock_filename)
+            delete_lockfile(openfile->lock_filename);
+#endif
+
+#ifndef DISABLE_MULTIBUFFER
 	/* Exit only if there are no more open file buffers. */
-	if (!close_buffer())
+	if (!close_buffer(FALSE))
 #endif
 	    finish();
     /* If the user canceled, we go on. */
     } else if (i != 1)
 	statusbar(_("Cancelled"));
 
-    shortcut_init(FALSE);
     display_main_list();
 }
 
-
+/* Another placeholder for function mapping. */
+void do_cancel(void)
+{
+    ;
+}
 
 static struct sigaction pager_oldaction, pager_newaction;  /* Original and temporary handlers for SIGINT. */
 static bool pager_sig_failed = FALSE; /* Did sigaction() fail without changing the signal handlers? */
 static bool pager_input_aborted = FALSE; /* Did someone invoke the pager and abort it via ^C? */
 
-
 /* Things which need to be run regardless of whether
-   we finished the stdin pipe correctly or not */
+ * we finished the stdin pipe correctly or not. */
 void finish_stdin_pager(void)
 {
     FILE *f;
     int ttystdin;
 
-    /* Read whatever we did get from stdin */
+    /* Read whatever we did get from stdin. */
     f = fopen("/dev/stdin", "rb");
-       if (f == NULL)
-        nperror("fopen");
+    if (f == NULL)
+	nperror("fopen");
 
     read_file(f, 0, "stdin", TRUE, FALSE);
     ttystdin = open("/dev/tty", O_RDONLY);
     if (!ttystdin)
-        die(_("Couldn't reopen stdin from keyboard, sorry\n"));
+	die(_("Couldn't reopen stdin from keyboard, sorry\n"));
 
     dup2(ttystdin,0);
     close(ttystdin);
     if (!pager_input_aborted)
 	tcgetattr(0, &oldterm);
     if (!pager_sig_failed && sigaction(SIGINT, &pager_oldaction, NULL) == -1)
-        nperror("sigaction");
+	nperror("sigaction");
     terminal_init();
     doupdate();
 }
 
-
-/* Cancel reading from stdin like a pager */
+/* Cancel reading from stdin like a pager. */
 RETSIGTYPE cancel_stdin_pager(int signal)
 {
-    /* Currently do nothing, just handle the intr silently */
     pager_input_aborted = TRUE;
 }
 
-/* Let nano read stdin for the first file at least */
+/* Let nano read stdin for the first file at least. */
 void stdin_pager(void)
 {
     endwin();
@@ -1113,13 +1212,13 @@ void stdin_pager(void)
 	tcsetattr(0, TCSANOW, &oldterm);
     fprintf(stderr, _("Reading from stdin, ^C to abort\n"));
 
-    /* Set things up so that Ctrl-C will cancel the new process. */
-    /* Enable interpretation of the special control keys so that we get
-     * SIGINT when Ctrl-C is pressed. */
+    /* Enable interpretation of the special control keys so that
+     * we get SIGINT when Ctrl-C is pressed. */
 #ifndef NANO_TINY
     enable_signals();
 #endif
 
+    /* Set things up so that SIGINT will cancel the new process. */
     if (sigaction(SIGINT, NULL, &pager_newaction) == -1) {
 	pager_sig_failed = TRUE;
 	nperror("sigaction");
@@ -1135,8 +1234,6 @@ void stdin_pager(void)
     finish_stdin_pager();
 }
 
-
-
 /* Initialize the signal handlers. */
 void signal_init(void)
 {
@@ -1274,7 +1371,7 @@ RETSIGTYPE handle_sigwinch(int signal)
      * otherwise.  However, COLS and LINES are curses global variables,
      * and in some cases curses has already updated them.  But not in
      * all cases.  Argh. */
-#ifdef REDEFINIG_MACROS_OK
+#ifdef REDEFINING_MACROS_OK
     COLS = win.ws_col;
     LINES = win.ws_row;
 #endif
@@ -1332,11 +1429,11 @@ void allow_pending_sigwinch(bool allow)
 #endif /* !NANO_TINY */
 
 #ifndef NANO_TINY
-/* Handle the global toggle specified in which. */
+/* Handle the global toggle specified in flag. */
 void do_toggle(int flag)
 {
     bool enabled;
-    char *desc;
+    const char *desc;
 
     TOGGLE(flag);
 
@@ -1354,40 +1451,43 @@ void do_toggle(int flag)
 	case SUSPEND:
 	    signal_init();
 	    break;
-#ifdef ENABLE_NANORC
+#ifndef DISABLE_NANORC
 	case WHITESPACE_DISPLAY:
 	    titlebar(NULL);
 	    edit_refresh();
 	    break;
 #endif
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 	case NO_COLOR_SYNTAX:
-	    edit_refresh();
-	    break;
 #endif
 	case SOFTWRAP:
-	    total_refresh();
+	    edit_refresh();
 	    break;
     }
 
     enabled = ISSET(flag);
 
-    if (flag ==  NO_HELP
+    if (flag == NO_HELP
 #ifndef DISABLE_WRAPPING
 	|| flag == NO_WRAP
 #endif
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 	|| flag == NO_COLOR_SYNTAX
 #endif
 	)
 	enabled = !enabled;
 
-    desc = _(flagtostr(flag));
-    statusbar("%s %s", desc, enabled ? _("enabled") :
-	_("disabled"));
+    desc = (char *) _(flagtostr(flag));
+    statusbar("%s %s", desc, enabled ? _("enabled") : _("disabled"));
 }
 #endif /* !NANO_TINY */
 
+/* Bleh. */
+void do_toggle_void(void)
+{
+    ;
+}
+
 /* Disable extended input and output processing in our terminal
  * settings. */
 void disable_extended_io(void)
@@ -1489,16 +1589,10 @@ void terminal_init(void)
 }
 
 /* Read in a character, interpret it as a shortcut or toggle if
- * necessary, and return it.  Set meta_key to TRUE if the character is a
- * meta sequence, set func_key to TRUE if the character is a function
- * key, set s_or_t to TRUE if the character is a shortcut or toggle
- * key, set ran_func to TRUE if we ran a function associated with a
- * shortcut key, and set finished to TRUE if we're done after running
- * or trying to run a function associated with a shortcut key.  If
- * allow_funcs is FALSE, don't actually run any functions associated
+ * necessary, and return it.
+ * If allow_funcs is FALSE, don't actually run any functions associated
  * with shortcut keys. */
-int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
-	*ran_func, bool *finished, bool allow_funcs)
+int do_input(bool allow_funcs)
 {
     int input;
 	/* The character we read in. */
@@ -1506,36 +1600,29 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
 	/* The input buffer. */
     static size_t kbinput_len = 0;
 	/* The length of the input buffer. */
-    bool cut_copy = FALSE;
-	/* Are we cutting or copying text? */
+    bool preserve = FALSE;
+	/* Preserve the contents of the cutbuffer? */
     const sc *s;
     bool have_shortcut;
 
-    *s_or_t = FALSE;
-    *ran_func = FALSE;
-    *finished = FALSE;
-
     /* Read in a character. */
-    input = get_kbinput(edit, meta_key, func_key);
+    input = get_kbinput(edit);
 
 #ifndef DISABLE_MOUSE
-    if (allow_funcs) {
-	/* If we got a mouse click and it was on a shortcut, read in the
-	 * shortcut character. */
-	if (*func_key && input == KEY_MOUSE) {
-	    if (do_mouse() == 1)
-		input = get_kbinput(edit, meta_key, func_key);
-	    else {
-		*meta_key = FALSE;
-		*func_key = FALSE;
-		input = ERR;
-	    }
-	}
+    if (func_key && input == KEY_MOUSE) {
+	/* We received a mouse click. */
+	if (do_mouse() == 1)
+	    /* The click was on a shortcut -- read in the character
+	     * that it was converted into. */
+	    input = get_kbinput(edit);
+	else
+	    /* The click was invalid or has been handled -- get out. */
+	    return ERR;
     }
 #endif
 
     /* Check for a shortcut in the main list. */
-    s = get_shortcut(MMAIN, &input, meta_key, func_key);
+    s = get_shortcut(&input);
 
     /* If we got a shortcut from the main list, or a "universal"
      * edit window shortcut, set have_shortcut to TRUE. */
@@ -1544,11 +1631,11 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
     /* If we got a non-high-bit control key, a meta key sequence, or a
      * function key, and it's not a shortcut or toggle, throw it out. */
     if (!have_shortcut) {
-	if (is_ascii_cntrl_char(input) || *meta_key || *func_key) {
+	if (is_ascii_cntrl_char(input) || meta_key || func_key) {
 	    statusbar(_("Unknown Command"));
 	    beep();
-	    *meta_key = FALSE;
-	    *func_key = FALSE;
+	    meta_key = FALSE;
+	    func_key = FALSE;
 	    input = ERR;
 	}
     }
@@ -1575,13 +1662,11 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
 	 * output all the characters in the input buffer if it isn't
 	 * empty.  Note that it should be empty if we're in view
 	 * mode. */
-	 if (have_shortcut || get_key_buffer_len() == 0) {
+	if (have_shortcut || get_key_buffer_len() == 0) {
 #ifndef DISABLE_WRAPPING
 	    /* If we got a shortcut or toggle, and it's not the shortcut
-	     * for verbatim input, turn off prepending of wrapped
-	     * text. */
-	    if (have_shortcut && (!have_shortcut || s == NULL || s->scfunc !=
-		DO_VERBATIM_INPUT))
+	     * for verbatim input, turn off prepending of wrapped text. */
+	    if (have_shortcut && s->scfunc != do_verbatim_input)
 		wrap_reset();
 #endif
 
@@ -1607,63 +1692,51 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
 	}
 
 	if (have_shortcut) {
-	    switch (input) {
-		/* Handle the normal edit window shortcuts, setting
-		 * ran_func to TRUE if we try to run their associated
-		 * functions and setting finished to TRUE to indicate
-		 * that we're done after running or trying to run their
-		 * associated functions. */
-		default:
-		    /* If the function associated with this shortcut is
-		     * cutting or copying text, indicate this. */
-		    if (s->scfunc == DO_CUT_TEXT_VOID
-#ifndef NANO_TINY
-			|| s->scfunc == DO_COPY_TEXT || s->scfunc ==
-			DO_CUT_TILL_END
-#endif
-			)
-			cut_copy = TRUE;
-
-		    if (s->scfunc != 0) {
-			const subnfunc *f = sctofunc((sc *) s);
-			*ran_func = TRUE;
-			if (ISSET(VIEW_MODE) && f && !f->viewok)
-			    print_view_warning();
-			else {
+	    /* If the function associated with this shortcut is
+	     * cutting or copying text, remember this. */
+	    if (s->scfunc == do_cut_text_void
 #ifndef NANO_TINY
-			    if (s->scfunc ==  DO_TOGGLE)
-				do_toggle(s->toggle);
-			    else {
-#else
-			    {
+		|| s->scfunc == do_copy_text || s->scfunc == do_cut_till_eof
 #endif
-				iso_me_harder_funcmap(s->scfunc);
-#ifdef ENABLE_COLOR
-				if (f && !f->viewok && openfile->syntax != NULL
-					&& openfile->syntax->nmultis > 0) {
-				    reset_multis(openfile->current, FALSE);
-				}
-#endif
-				if (edit_refresh_needed) {
+		)
+		preserve = TRUE;
+
+	    if (s->scfunc != 0) {
+		const subnfunc *f = sctofunc((sc *) s);
+		if (ISSET(VIEW_MODE) && f && !f->viewok)
+		    print_view_warning();
+		else {
+#ifndef NANO_TINY
+		    if (s->scfunc == do_toggle_void) {
+			do_toggle(s->toggle);
+			if (s->toggle != CUT_TO_END)
+			    preserve = TRUE;
+		    } else
+#endif
+		    {
+			/* Execute the function of the shortcut. */
+			s->scfunc();
+#ifndef DISABLE_COLOR
+			if (f && !f->viewok && openfile->syntax != NULL
+				&& openfile->syntax->nmultis > 0)
+			    reset_multis(openfile->current, FALSE);
+#endif
+			if (edit_refresh_needed) {
 #ifdef DEBUG
-	    			    fprintf(stderr, "running edit_refresh() as edit_refresh_needed is true\n");
+			    fprintf(stderr, "running edit_refresh() as edit_refresh_needed is true\n");
 #endif
-				    edit_refresh();
-				    edit_refresh_needed = FALSE;
-				}
-
-			    }
+			    edit_refresh();
+			    edit_refresh_needed = FALSE;
 			}
 		    }
-		    *finished = TRUE;
-		    break;
+		}
 	    }
 	}
     }
 
-    /* If we aren't cutting or copying text, blow away the text in the
-     * cutbuffer. */
-    if (!cut_copy)
+    /* If we aren't cutting or copying text, and the key wasn't a toggle,
+     * blow away the text in the cutbuffer upon the next cutting action. */
+    if (!preserve)
 	cutbuffer_reset();
 
     return input;
@@ -1687,32 +1760,39 @@ int do_mouse(void)
     int mouse_x, mouse_y;
     int retval = get_mouseinput(&mouse_x, &mouse_y, TRUE);
 
+    if (retval != 0)
+	/* The click is wrong or already handled. */
+	return retval;
+
     /* We can click on the edit window to move the cursor. */
-    if (retval == 0 && wmouse_trafo(edit, &mouse_y, &mouse_x, FALSE)) {
+    if (wmouse_trafo(edit, &mouse_y, &mouse_x, FALSE)) {
 	bool sameline;
 	    /* Did they click on the line with the cursor?  If they
 	     * clicked on the cursor, we set the mark. */
 	filestruct *current_save = openfile->current;
+#ifndef NANO_TINY
 	size_t current_x_save = openfile->current_x;
+#endif
 	size_t pww_save = openfile->placewewant;
 
 	sameline = (mouse_y == openfile->current_y);
 
 #ifdef DEBUG
-	    fprintf(stderr, "mouse_y = %d, current_y = %d\n", mouse_y, openfile->current_y);
+	fprintf(stderr, "mouse_y = %d, current_y = %ld\n", mouse_y, (long)openfile->current_y);
 #endif
 
- 	if (ISSET(SOFTWRAP)) {
-	    int i = 0;
+#ifndef NANO_TINY
+	if (ISSET(SOFTWRAP)) {
+	    size_t i = 0;
 	    for (openfile->current = openfile->edittop;
 		 openfile->current->next && i < mouse_y;
 		 openfile->current = openfile->current->next, i++) {
 		openfile->current_y = i;
 		i += strlenpt(openfile->current->data) / COLS;
 	    }
-
 #ifdef DEBUG
-	    fprintf(stderr, "do_mouse(): moving to current_y = %d, i %d\n", openfile->current_y, i);
+	    fprintf(stderr, "do_mouse(): moving to current_y = %ld, index i = %lu\n",
+			(long)openfile->current_y, (unsigned long)i);
 	    fprintf(stderr, "            openfile->current->data = \"%s\"\n", openfile->current->data);
 #endif
 
@@ -1720,18 +1800,19 @@ int do_mouse(void)
 		openfile->current = openfile->current->prev;
 		openfile->current_x = actual_x(openfile->current->data, mouse_x + (mouse_y - openfile->current_y) * COLS);
 #ifdef DEBUG
-	    fprintf(stderr, "do_mouse(): i > mouse_y, mouse_x = %d, current_x to = %d\n", mouse_x, openfile->current_x);
+		fprintf(stderr, "do_mouse(): i > mouse_y, mouse_x = %d, current_x to = %lu\n",
+			mouse_x, (unsigned long)openfile->current_x);
 #endif
 	    } else {
 	        openfile->current_x = actual_x(openfile->current->data, mouse_x);
 #ifdef DEBUG
-	    fprintf(stderr, "do_mouse(): i <= mouse_y, mouse_x = %d, setting current_x to = %d\n", mouse_x, openfile->current_x);
+		fprintf(stderr, "do_mouse(): i <= mouse_y, mouse_x = %d, setting current_x to = %lu\n",
+			mouse_x, (unsigned long)openfile->current_x);
 #endif
 	    }
-
-	    openfile->placewewant = xplustabs();
-
-	} else {
+	} else
+#endif /* NANO_TINY */
+	{
 	    /* Move to where the click occurred. */
 	    for (; openfile->current_y < mouse_y && openfile->current !=
 		   openfile->filebot; openfile->current_y++)
@@ -1742,38 +1823,42 @@ int do_mouse(void)
 
 	    openfile->current_x = actual_x(openfile->current->data,
 		get_page_start(xplustabs()) + mouse_x);
-
-	    openfile->placewewant = xplustabs();
 	}
 
+	openfile->placewewant = xplustabs();
+
 #ifndef NANO_TINY
 	/* Clicking where the cursor is toggles the mark, as does
 	 * clicking beyond the line length with the cursor at the end of
 	 * the line. */
 	if (sameline && openfile->current_x == current_x_save)
 	    do_mark();
+	else
 #endif
+	    /* The cursor moved; clean the cutbuffer on the next cut. */
+	    cutbuffer_reset();
 
 	edit_redraw(current_save, pww_save);
     }
 
-    return retval;
+    /* No more handling is needed. */
+    return 2;
 }
 #endif /* !DISABLE_MOUSE */
 
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 void alloc_multidata_if_needed(filestruct *fileptr)
 {
     if (!fileptr->multidata)
-	fileptr->multidata = (short *) nmalloc(openfile->syntax->nmultis * sizeof(short));
+	fileptr->multidata = (short *)nmalloc(openfile->syntax->nmultis * sizeof(short));
 }
 
-/* Precalculate the multi-line start and end regex info so we can speed up
-   rendering (with any hope at all...) */
+/* Precalculate the multi-line start and end regex info so we can
+ * speed up rendering (with any hope at all...). */
 void precalc_multicolorinfo(void)
 {
 #ifdef DEBUG
-	    fprintf(stderr, "entering precalc_multicolorinfo()\n");
+    fprintf(stderr, "Entering precalculation of multiline color info\n");
 #endif
     if (openfile->colorstrings != NULL && !ISSET(NO_COLOR_SYNTAX)) {
 	const colortype *tmpcolor = openfile->colorstrings;
@@ -1781,30 +1866,26 @@ void precalc_multicolorinfo(void)
 	filestruct *fileptr, *endptr;
 	time_t last_check = time(NULL), cur_check = 0;
 
-	/* Let us get keypresses to see if the user is trying to
-	   start editing.  We may want to throw up a statusbar
-	   message before starting this later if it takes
-	   too long to do this routine.  For now silently
-	   abort if they hit a key */
- 	nodelay(edit, FALSE);
+	/* Let us get keypresses to see if the user is trying to start
+	 * editing.  Later we may want to throw up a statusbar message
+	 * before starting this if it takes too long to do this routine.
+	 * For now silently abort if they hit a key. */
+	nodelay(edit, TRUE);
 
 	for (; tmpcolor != NULL; tmpcolor = tmpcolor->next) {
 
-	    /* If it's not a multi-line regex, amscray */
+	    /* If it's not a multi-line regex, amscray. */
 	    if (tmpcolor->end == NULL)
 		continue;
 #ifdef DEBUG
-	    fprintf(stderr, "working on color id %d\n", tmpcolor->id);
+	    fprintf(stderr, "Starting work on color id %d\n", tmpcolor->id);
 #endif
 
-
 	    for (fileptr = openfile->fileage; fileptr != NULL; fileptr = fileptr->next) {
 		int startx = 0;
 		int nostart = 0;
-
-
 #ifdef DEBUG
-	    fprintf(stderr, "working on lineno %lu\n", (unsigned long) fileptr->lineno);
+		fprintf(stderr, "working on lineno %ld... ", (long)fileptr->lineno);
 #endif
 
 		alloc_multidata_if_needed(fileptr);
@@ -1812,84 +1893,81 @@ void precalc_multicolorinfo(void)
 		if ((cur_check = time(NULL)) - last_check > 1) {
 		    last_check = cur_check;
 		    if (wgetch(edit) != ERR)
-	   		goto precalc_cleanup;
+			goto precalc_cleanup;
 		}
 
-		while ((nostart = regexec(tmpcolor->start, &fileptr->data[startx], 1, &startmatch, 0))  == 0) {
-		    /* Look for end and start marking how many lines are encompassed
-		       whcih should speed up rendering later */
+		while ((nostart = regexec(tmpcolor->start, &fileptr->data[startx], 1, &startmatch,
+					  (startx == 0) ? 0 : REG_NOTBOL)) == 0) {
+		    /* Look for an end, and start marking how many lines are
+		     * encompassed, which should speed up rendering later. */
 		    startx += startmatch.rm_eo;
 #ifdef DEBUG
-		    fprintf(stderr, "match found at pos %d...", startx);
+		    fprintf(stderr, "start found at pos %lu... ", (unsigned long)startx);
 #endif
 
-		    /* Look on this line first for end */
-		    if (regexec(tmpcolor->end, &fileptr->data[startx], 1, &endmatch, 0)  == 0) {
+		    /* Look first on this line for an end. */
+		    if (regexec(tmpcolor->end, &fileptr->data[startx], 1, &endmatch,
+				(startx == 0) ? 0 : REG_NOTBOL) == 0) {
 			startx += endmatch.rm_eo;
 			fileptr->multidata[tmpcolor->id] |= CSTARTENDHERE;
 #ifdef DEBUG
-	    fprintf(stderr, "end found on this line\n");
+			fprintf(stderr, "end found on this line\n");
 #endif
 			continue;
 		    }
 
-		    /* Nice, we didn't find the end regex on this line.  Let's start looking for it */
+		    /* Nice, we didn't find the end regex on this line.  Let's start looking for it. */
 		    for (endptr = fileptr->next; endptr != NULL; endptr = endptr->next) {
-
 #ifdef DEBUG
-	    fprintf(stderr, "advancing to line %lu to find end...\n", (unsigned long) endptr->lineno);
+			fprintf(stderr, "\nadvancing to line %ld to find end... ", (long)endptr->lineno);
 #endif
-			/* Check for keyboard input  again */
+			/* Check for keyboard input, again. */
 			if ((cur_check = time(NULL)) - last_check > 1) {
 			    last_check = cur_check;
 			    if (wgetch(edit) != ERR)
-		   		goto precalc_cleanup;
+				goto precalc_cleanup;
 			}
 			if (regexec(tmpcolor->end, endptr->data, 1, &endmatch, 0) == 0)
-			   break;
+			    break;
 		    }
 
 		    if (endptr == NULL) {
 #ifdef DEBUG
-	    		fprintf(stderr, "no end found, breaking out\n");
+			fprintf(stderr, "no end found, breaking out\n");
 #endif
 			break;
 		    }
 
-
 #ifdef DEBUG
 		    fprintf(stderr, "end found\n");
 #endif
-
-		    /* We found it, we found it, la la la la la.  Mark all the
-			lines in between and the ends properly */
+		    /* We found it, we found it, la la la la la.  Mark all
+		     * the lines in between and the end properly. */
 		    fileptr->multidata[tmpcolor->id] |= CENDAFTER;
 #ifdef DEBUG
-		    fprintf(stderr, "marking line %lu as CENDAFTER\n", (unsigned long) fileptr->lineno);
+		    fprintf(stderr, "marking line %ld as CENDAFTER\n", (long)fileptr->lineno);
 #endif
 		    for (fileptr = fileptr->next; fileptr != endptr; fileptr = fileptr->next) {
 			alloc_multidata_if_needed(fileptr);
 			fileptr->multidata[tmpcolor->id] = CWHOLELINE;
 #ifdef DEBUG
-			fprintf(stderr, "marking intermediary line %lu as CWHOLELINE\n", (unsigned long) fileptr->lineno);
+			fprintf(stderr, "marking intermediary line %ld as CWHOLELINE\n", (long)fileptr->lineno);
 #endif
 		    }
 		    alloc_multidata_if_needed(endptr);
+		    fileptr->multidata[tmpcolor->id] |= CBEGINBEFORE;
 #ifdef DEBUG
-		    fprintf(stderr, "marking line %lu as BEGINBEFORE\n", (unsigned long) fileptr->lineno);
+		    fprintf(stderr, "marking line %ld as CBEGINBEFORE\n", (long)fileptr->lineno);
 #endif
-		    endptr->multidata[tmpcolor->id] |= CBEGINBEFORE;
-		    /* We should be able to skip all the way to the line of the match.
-			This may introduce more bugs but it's the Right Thing to do */
-		    fileptr = endptr;
+		    /* Skip to the end point of the match. */
 		    startx = endmatch.rm_eo;
 #ifdef DEBUG
-		    fprintf(stderr, "jumping to line %lu pos %d to continue\n", (unsigned long) endptr->lineno, startx);
+		    fprintf(stderr, "jumping to line %ld pos %lu to continue\n", (long)fileptr->lineno, (unsigned long)startx);
 #endif
 		}
 		if (nostart && startx == 0) {
 #ifdef DEBUG
-		    fprintf(stderr, "no start found on line %lu, continuing\n", (unsigned long) fileptr->lineno);
+		    fprintf(stderr, "no match\n");
 #endif
 		    fileptr->multidata[tmpcolor->id] = CNONE;
 		    continue;
@@ -1900,22 +1978,29 @@ void precalc_multicolorinfo(void)
 precalc_cleanup:
     nodelay(edit, FALSE);
 }
-#endif /* ENABLE_COLOR */
+#endif /* !DISABLE_COLOR */
 
 /* The user typed output_len multibyte characters.  Add them to the edit
  * buffer, filtering out all ASCII control characters if allow_cntrls is
  * TRUE. */
 void do_output(char *output, size_t output_len, bool allow_cntrls)
 {
-    size_t current_len, orig_lenpt, i = 0;
+    size_t current_len, i = 0;
+#ifndef NANO_TINY
+    size_t orig_lenpt = 0;
+#endif
+
     char *char_buf = charalloc(mb_cur_max());
     int char_buf_len;
 
     assert(openfile->current != NULL && openfile->current->data != NULL);
 
     current_len = strlen(openfile->current->data);
+
+#ifndef NANO_TINY
     if (ISSET(SOFTWRAP))
 	orig_lenpt = strlenpt(openfile->current->data);
+#endif
 
     while (i < output_len) {
 	/* If allow_cntrls is TRUE, convert nulls and newlines
@@ -1966,7 +2051,7 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
 	set_modified();
 
 #ifndef NANO_TINY
-	update_undo(ADD);
+	add_undo(ADD);
 
 	/* Note that current_x has not yet been incremented. */
 	if (openfile->mark_set && openfile->current ==
@@ -1977,14 +2062,18 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
 
 	openfile->current_x += char_buf_len;
 
+#ifndef NANO_TINY
+	update_undo(ADD);
+#endif
+
 #ifndef DISABLE_WRAPPING
 	/* If we're wrapping text, we need to call edit_refresh(). */
 	if (!ISSET(NO_WRAP))
-	    if (do_wrap(openfile->current, FALSE))
+	    if (do_wrap(openfile->current))
 		edit_refresh_needed = TRUE;
 #endif
 
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 	/* If color syntaxes are available and turned on, we need to
 	 * call edit_refresh(). */
 	if (openfile->colorstrings != NULL && !ISSET(NO_COLOR_SYNTAX))
@@ -1992,18 +2081,19 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
 #endif
     }
 
-    /* Well we might also need a full refresh if we've changed the 
-       line length to be a new multiple of COLS */
+#ifndef NANO_TINY
+    /* Well, we might also need a full refresh if we've changed the
+     * line length to be a new multiple of COLS. */
     if (ISSET(SOFTWRAP) && edit_refresh_needed == FALSE)
-	if (strlenpt(openfile->current->data) / COLS  != orig_lenpt / COLS)
+	if (strlenpt(openfile->current->data) / COLS != orig_lenpt / COLS)
 	    edit_refresh_needed = TRUE;
+#endif
 
     free(char_buf);
 
     openfile->placewewant = xplustabs();
 
-
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     reset_multis(openfile->current, FALSE);
 #endif
     if (edit_refresh_needed == TRUE) {
@@ -2016,15 +2106,13 @@ void do_output(char *output, size_t output_len, bool allow_cntrls)
 int main(int argc, char **argv)
 {
     int optchr;
-    ssize_t startline = 1;
-	/* Line to try and start at. */
-    ssize_t startcol = 1;
-	/* Column to try and start at. */
+    ssize_t startline = 0, startcol = 0;
+	/* Target line and column when specified on the command line. */
 #ifndef DISABLE_WRAPJUSTIFY
     bool fill_used = FALSE;
 	/* Was the fill option used? */
 #endif
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
     bool old_multibuffer;
 	/* The old value of the multibuffer option, restored after we
 	 * load all files on the command line. */
@@ -2033,10 +2121,10 @@ int main(int argc, char **argv)
     const struct option long_options[] = {
 	{"help", 0, NULL, 'h'},
 	{"boldtext", 0, NULL, 'D'},
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 	{"multibuffer", 0, NULL, 'F'},
 #endif
-#ifdef ENABLE_NANORC
+#ifndef DISABLE_NANORC
 	{"ignorercfiles", 0, NULL, 'I'},
 #endif
 	{"rebindkeypad", 0, NULL, 'K'},
@@ -2048,7 +2136,7 @@ int main(int argc, char **argv)
 	{"restricted", 0, NULL, 'R'},
 	{"tabsize", 1, NULL, 'T'},
 	{"version", 0, NULL, 'V'},
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 	{"syntax", 1, NULL, 'Y'},
 #endif
 	{"const", 0, NULL, 'c'},
@@ -2057,6 +2145,7 @@ int main(int argc, char **argv)
 #ifndef DISABLE_MOUSE
 	{"mouse", 0, NULL, 'm'},
 #endif
+	{"noread", 0, NULL, 'n'},
 #ifndef DISABLE_OPERATINGDIR
 	{"operatingdir", 1, NULL, 'o'},
 #endif
@@ -2080,8 +2169,10 @@ int main(int argc, char **argv)
 	{"backup", 0, NULL, 'B'},
 	{"backupdir", 1, NULL, 'C'},
 	{"tabstospaces", 0, NULL, 'E'},
+	{"locking", 0, NULL, 'G'},
 	{"historylog", 0, NULL, 'H'},
 	{"noconvert", 0, NULL, 'N'},
+	{"poslog", 0, NULL, 'P'},
 	{"smooth", 0, NULL, 'S'},
 	{"quickblank", 0, NULL, 'U'},
 	{"undo", 0, NULL, 'u'},
@@ -2117,7 +2208,7 @@ int main(int argc, char **argv)
     textdomain(PACKAGE);
 #endif
 
-#if !defined(ENABLE_NANORC) && defined(DISABLE_ROOTWRAPPING)
+#if defined(DISABLE_NANORC) && defined(DISABLE_ROOTWRAPPING)
     /* If we don't have rcfile support, --disable-wrapping-as-root is
      * used, and we're root, turn wrapping off. */
     if (geteuid() == NANO_ROOT_UID)
@@ -2127,11 +2218,11 @@ int main(int argc, char **argv)
     while ((optchr =
 #ifdef HAVE_GETOPT_LONG
 	getopt_long(argc, argv,
-		"h?ABC:DEFHIKLNOQ:RST:UVWY:abcdefgijklmo:pqr:s:tuvwxz$",
+		"ABC:DEFGHIKLNOPQ:RST:UVWY:abcdefghijklmno:pqr:s:tvwxz$",
 		long_options, NULL)
 #else
 	getopt(argc, argv,
-		"h?ABC:DEFHIKLNOQ:RST:UVWY:abcdefgijklmo:pqr:s:tuvwxz$")
+		"ABC:DEFGHIKLNOPQ:RST:UVWY:abcdefghijklmno:pqr:s:tvwxz$")
 #endif
 		) != -1) {
 	switch (optchr) {
@@ -2162,17 +2253,22 @@ int main(int argc, char **argv)
 		SET(TABS_TO_SPACES);
 		break;
 #endif
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
 	    case 'F':
 		SET(MULTIBUFFER);
 		break;
 #endif
-#ifdef ENABLE_NANORC
 #ifndef NANO_TINY
+	    case 'G':
+		SET(LOCKING);
+		break;
+#endif
+#ifndef DISABLE_HISTORIES
 	    case 'H':
 		SET(HISTORYLOG);
 		break;
 #endif
+#ifndef DISABLE_NANORC
 	    case 'I':
 		no_rcfiles = TRUE;
 		break;
@@ -2191,6 +2287,11 @@ int main(int argc, char **argv)
 	    case 'O':
 		SET(MORE_SPACE);
 		break;
+#ifndef DISABLE_HISTORIES
+	    case 'P':
+		SET(POS_HISTORY);
+		break;
+#endif
 #ifndef DISABLE_JUSTIFY
 	    case 'Q':
 		quotestr = mallocstrcpy(quotestr, optarg);
@@ -2224,7 +2325,7 @@ int main(int argc, char **argv)
 		SET(WORD_BOUNDS);
 		break;
 #endif
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 	    case 'Y':
 		syntaxstr = mallocstrcpy(syntaxstr, optarg);
 		break;
@@ -2251,6 +2352,9 @@ int main(int argc, char **argv)
 		SET(USE_MOUSE);
 		break;
 #endif
+	    case 'n':
+		SET(NOREAD_MODE);
+		break;
 #ifndef DISABLE_OPERATINGDIR
 	    case 'o':
 		operating_dir = mallocstrcpy(operating_dir, optarg);
@@ -2259,9 +2363,11 @@ int main(int argc, char **argv)
 	    case 'p':
 		SET(PRESERVE);
 		break;
+#ifndef DISABLE_NANORC
 	    case 'q':
 		SET(QUIET);
 		break;
+#endif
 #ifndef DISABLE_WRAPJUSTIFY
 	    case 'r':
 		if (!parse_num(optarg, &wrap_at)) {
@@ -2280,22 +2386,15 @@ int main(int argc, char **argv)
 	    case 't':
 		SET(TEMP_FILE);
 		break;
-#ifndef NANO_TINY
-	    case 'u':
-		SET(UNDOABLE);
-		break;
-#endif
 	    case 'v':
 		SET(VIEW_MODE);
 		break;
 #ifndef DISABLE_WRAPPING
 	    case 'w':
 		SET(NO_WRAP);
-
-		/* If both --fill and --nowrap are given on the command line,
-		   the last option wins, */
+		/* If both --fill and --nowrap are given on the
+		 * command line, the last given option wins. */
 		fill_used = FALSE;
-
 		break;
 #endif
 	    case 'x':
@@ -2309,8 +2408,12 @@ int main(int argc, char **argv)
 		SET(SOFTWRAP);
 		break;
 #endif
-	    default:
+	    case 'h':
 		usage();
+		exit(0);
+	    default:
+		printf(_("Type '%s -h' for a list of available options.\n"), argv[0]);
+		exit(1);
 	}
     }
 
@@ -2319,26 +2422,27 @@ int main(int argc, char **argv)
     if (*(tail(argv[0])) == 'r')
 	SET(RESTRICTED);
 
-    /* If we're using restricted mode, disable suspending, backups, and
-     * reading rcfiles, since they all would allow reading from or
-     * writing to files not specified on the command line. */
+    /* If we're using restricted mode, disable suspending, backups,
+     * rcfiles, and history files, since they all would allow reading
+     * from or writing to files not specified on the command line. */
     if (ISSET(RESTRICTED)) {
 	UNSET(SUSPEND);
 	UNSET(BACKUP_FILE);
-#ifdef ENABLE_NANORC
+#ifndef DISABLE_NANORC
 	no_rcfiles = TRUE;
+	UNSET(HISTORYLOG);
+	UNSET(POS_HISTORY);
 #endif
     }
 
-
-    /* Set up the shortcut lists.
-       Need to do this before the rcfile */
-    shortcut_init(FALSE);
+    /* Set up the function and shortcut lists.  This needs to be done
+     * before reading the rcfile, to be able to rebind/unbind keys. */
+    shortcut_init();
 
 /* We've read through the command line options.  Now back up the flags
  * and values that are set, and read the rcfile(s).  If the values
  * haven't changed afterward, restore the backed-up values. */
-#ifdef ENABLE_NANORC
+#ifndef DISABLE_NANORC
     if (!no_rcfiles) {
 #ifndef DISABLE_OPERATINGDIR
 	char *operating_dir_cpy = operating_dir;
@@ -2421,11 +2525,11 @@ int main(int argc, char **argv)
     else if (geteuid() == NANO_ROOT_UID)
 	SET(NO_WRAP);
 #endif
-#endif /* ENABLE_NANORC */
+#endif /* !DISABLE_NANORC */
 
 #ifndef DISABLE_WRAPPING
     /* Overwrite an rcfile "set nowrap" or --disable-wrapping-as-root
-       if a --fill option was given on the command line. */ 
+     * if a --fill option was given on the command line. */
     if (fill_used)
 	UNSET(NO_WRAP);
 #endif
@@ -2433,16 +2537,24 @@ int main(int argc, char **argv)
     /* If we're using bold text instead of reverse video text, set it up
      * now. */
     if (ISSET(BOLD_TEXT))
-	reverse_attr = A_BOLD;
+	hilite_attribute = A_BOLD;
 
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
     /* Set up the search/replace history. */
     history_init();
-#ifdef ENABLE_NANORC
-    if (!no_rcfiles && ISSET(HISTORYLOG))
+    /* Verify that the home directory and ~/.nano subdir exist. */
+    if (ISSET(HISTORYLOG) || ISSET(POS_HISTORY)) {
+	get_homedir();
+	if (homedir == NULL || check_dotnano() == 0) {
+	    UNSET(HISTORYLOG);
+	    UNSET(POS_HISTORY);
+	}
+    }
+    if (ISSET(HISTORYLOG))
 	load_history();
-#endif
-#endif
+    if (ISSET(POS_HISTORY))
+	load_poshistory();
+#endif /* !DISABLE_HISTORIES */
 
 #ifndef NANO_TINY
     /* Set up the backup directory (unless we're using restricted mode,
@@ -2513,16 +2625,28 @@ int main(int argc, char **argv)
     /* If matchbrackets wasn't specified, set its default value. */
     if (matchbrackets == NULL)
 	matchbrackets = mallocstrcpy(NULL, "(<[{)>]}");
-#endif
 
-#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
-    /* If whitespace wasn't specified, set its default value. */
+#ifndef DISABLE_NANORC
+    /* If whitespace wasn't specified, set its default value.  If we're
+     * using UTF-8, it's Unicode 00BB (Right-Pointing Double Angle
+     * Quotation Mark) and Unicode 00B7 (Middle Dot).  Otherwise, it's
+     * ">" and ".". */
     if (whitespace == NULL) {
-	whitespace = mallocstrcpy(NULL, "  ");
-	whitespace_len[0] = 1;
-	whitespace_len[1] = 1;
+#ifdef ENABLE_UTF8
+	if (using_utf8()) {
+	    whitespace = mallocstrcpy(NULL, "\xC2\xBB\xC2\xB7");
+	    whitespace_len[0] = 2;
+	    whitespace_len[1] = 2;
+	} else
+#endif
+	{
+	    whitespace = mallocstrcpy(NULL, ">.");
+	    whitespace_len[0] = 1;
+	    whitespace_len[1] = 1;
+	}
     }
-#endif
+#endif /* !DISABLE_NANORC */
+#endif /* !NANO_TINY */
 
     /* If tabsize wasn't specified, set its default value. */
     if (tabsize == -1)
@@ -2557,6 +2681,19 @@ int main(int argc, char **argv)
     mouse_init();
 #endif
 
+#ifndef DISABLE_COLOR
+    set_colorpairs();
+#else
+    interface_color_pair[TITLE_BAR].pairnum = hilite_attribute;
+    interface_color_pair[STATUS_BAR].pairnum = hilite_attribute;
+    interface_color_pair[KEY_COMBO].pairnum = hilite_attribute;
+    interface_color_pair[FUNCTION_TAG].pairnum = A_NORMAL;
+    interface_color_pair[TITLE_BAR].bright = FALSE;
+    interface_color_pair[STATUS_BAR].bright = FALSE;
+    interface_color_pair[KEY_COMBO].bright = FALSE;
+    interface_color_pair[FUNCTION_TAG].bright = FALSE;
+#endif
+
 #ifdef DEBUG
     fprintf(stderr, "Main: open file\n");
 #endif
@@ -2575,7 +2712,7 @@ int main(int argc, char **argv)
 	optind++;
     }
 
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
     old_multibuffer = ISSET(MULTIBUFFER);
     SET(MULTIBUFFER);
 
@@ -2583,7 +2720,7 @@ int main(int argc, char **argv)
      * new buffers. */
     {
 	int i = optind + 1;
-	ssize_t iline = 1, icol = 1;
+	ssize_t iline = 0, icol = 0;
 
 	for (; i < argc; i++) {
 	    /* If there's a +LINE or +LINE,COLUMN flag here, it is
@@ -2595,16 +2732,25 @@ int main(int argc, char **argv)
 	    else {
 		open_buffer(argv[i], FALSE);
 
-		if (iline > 1 || icol > 1) {
+		if (iline > 0 || icol > 0) {
 		    do_gotolinecolumn(iline, icol, FALSE, FALSE, FALSE,
 			FALSE);
 		    iline = 1;
 		    icol = 1;
 		}
+#ifndef DISABLE_HISTORIES
+                  else {
+		    /* See if we have a POS history to use if we haven't overridden it. */
+		    ssize_t savedposline, savedposcol;
+		    if (check_poshistory(argv[i], &savedposline, &savedposcol))
+			do_gotolinecolumn(savedposline, savedposcol, FALSE, FALSE, FALSE,
+			FALSE);
+		}
+#endif
 	    }
 	}
     }
-#endif
+#endif /* !DISABLE_MULTIBUFFER */
 
     /* Read the first file on the command line into either the current
      * buffer or a new buffer, depending on whether multibuffer mode is
@@ -2621,7 +2767,7 @@ int main(int argc, char **argv)
 	UNSET(VIEW_MODE);
     }
 
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
     if (!old_multibuffer)
 	UNSET(MULTIBUFFER);
 #endif
@@ -2630,22 +2776,29 @@ int main(int argc, char **argv)
     fprintf(stderr, "Main: top and bottom win\n");
 #endif
 
-#ifdef ENABLE_COLOR
-    if (openfile->syntax && openfile->syntax->nmultis > 0)
-	precalc_multicolorinfo();
+#ifndef DISABLE_COLOR
+    if (openfile->syntax)
+	if (openfile->syntax->nmultis > 0)
+	    precalc_multicolorinfo();
 #endif
 
-    if (startline > 1 || startcol > 1)
+    if (startline > 0 || startcol > 0)
 	do_gotolinecolumn(startline, startcol, FALSE, FALSE, FALSE,
 		FALSE);
+#ifndef DISABLE_HISTORIES
+    else {
+	/* See if we have a POS history to use if we haven't overridden it. */
+	ssize_t savedposline, savedposcol;
+	if (check_poshistory(argv[optind], &savedposline, &savedposcol))
+	    do_gotolinecolumn(savedposline, savedposcol, FALSE, FALSE, FALSE, FALSE);
+    }
+#endif
 
     display_main_list();
 
     display_buffer();
 
     while (TRUE) {
-	bool meta_key, func_key, s_or_t, ran_func, finished;
-
 	/* Make sure the cursor is in the edit window. */
 	reset_cursor();
 	wnoutrefresh(edit);
@@ -2674,11 +2827,9 @@ int main(int argc, char **argv)
         currmenu = MMAIN;
 
 	/* Read in and interpret characters. */
-	do_input(&meta_key, &func_key, &s_or_t, &ran_func, &finished,
-		TRUE);
+	do_input(TRUE);
     }
 
     /* We should never get here. */
     assert(FALSE);
 }
-
diff --git a/src/nano.h b/src/nano.h
index 12131fb..4b44fb8 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -1,9 +1,9 @@
-/* $Id: nano.h 4508 2010-06-21 03:10:10Z astyanax $ */
+/* $Id: nano.h 5100 2015-01-03 07:24:17Z astyanax $ */
 /**************************************************************************
  *   nano.h                                                               *
  *                                                                        *
  *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009 Free Software Foundation, Inc.                            *
+ *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -31,8 +31,8 @@
 #ifdef NEED_XOPEN_SOURCE_EXTENDED
 #ifndef _XOPEN_SOURCE_EXTENDED
 #define _XOPEN_SOURCE_EXTENDED 1
-#endif /* _XOPEN_SOURCE_EXTENDED */
-#endif /* NEED_XOPEN_SOURCE_EXTENDED */
+#endif
+#endif
 
 #ifdef __TANDEM
 /* Tandem NonStop Kernel support. */
@@ -54,13 +54,12 @@
 #include <stdarg.h>
 #endif
 
-/* Suppress warnings for __attribute__((warn_unused_result)) */
+/* Suppress warnings for __attribute__((warn_unused_result)). */
 #define IGNORE_CALL_RESULT(call) do { if (call) {} } while(0)
 
-/* Macros for flags. */
-#define FLAGOFF(flag) ((flag) / (sizeof(unsigned) * 8))
+/* Macros for flags, indexing each bit in a small array. */
+#define FLAGS(flag) flags[((flag) / (sizeof(unsigned) * 8))]
 #define FLAGMASK(flag) (1 << ((flag) % (sizeof(unsigned) * 8)))
-#define FLAGS(flag) flags[FLAGOFF(flag)]
 #define SET(flag) FLAGS(flag) |= FLAGMASK(flag)
 #define UNSET(flag) FLAGS(flag) &= ~FLAGMASK(flag)
 #define ISSET(flag) ((FLAGS(flag) & FLAGMASK(flag)) != 0)
@@ -85,6 +84,8 @@
 #define KEY_DC SL_KEY_DELETE
 #define KEY_IC SL_KEY_IC
 /* Ncurses support. */
+#elif defined(HAVE_NCURSESW_NCURSES_H)
+#include <ncursesw/ncurses.h>
 #elif defined(HAVE_NCURSES_H)
 #include <ncurses.h>
 #else
@@ -174,7 +175,7 @@ typedef enum {
 } append_type;
 
 typedef enum {
-    UP_DIR, DOWN_DIR
+    UPWARD, DOWNWARD
 } scroll_dir;
 
 typedef enum {
@@ -182,14 +183,26 @@ typedef enum {
 } update_type;
 
 typedef enum {
-    CONTROL, META, FKEY, RAW
-}  function_type;
+    CONTROL, META, FKEY, RAWINPUT
+}  key_type;
 
 typedef enum {
-    ADD, DEL, REPLACE, SPLIT, UNSPLIT, CUT, UNCUT, ENTER, INSERT, OTHER
+    ADD, DEL, BACK, CUT, CUT_EOF, REPLACE,
+#ifndef DISABLE_WRAPPING
+    SPLIT_BEGIN, SPLIT_END,
+#endif
+    JOIN, PASTE, INSERT, ENTER, OTHER
 } undo_type;
 
-#ifdef ENABLE_COLOR
+typedef struct color_pair {
+    int pairnum;
+	/* The color pair number used for this foreground color and
+	 * background color. */
+    bool bright;
+	/* Is this color A_BOLD? */
+} color_pair;
+
+#ifndef DISABLE_COLOR
 typedef struct colortype {
     short fg;
 	/* This syntax's foreground color. */
@@ -212,48 +225,70 @@ typedef struct colortype {
 	/* The compiled end (if any) of the regex string. */
     struct colortype *next;
 	/* Next set of colors. */
-     int id;
-	/* basic id for assigning to lines later */
+    int id;
+	/* Basic id for assigning to lines later. */
 } colortype;
 
-typedef struct exttype {
+typedef struct regexlisttype {
     char *ext_regex;
-	/* The extensions that match this syntax. */
+	/* The regexstrings for the things that match this syntax. */
     regex_t *ext;
-	/* The compiled extensions that match this syntax. */
-    struct exttype *next;
-	/* Next set of extensions. */
-} exttype;
+	/* The compiled regexes. */
+    struct regexlisttype *next;
+	/* Next set of regexes. */
+} regexlisttype;
 
 typedef struct syntaxtype {
     char *desc;
 	/* The name of this syntax. */
-    exttype *extensions;
+    regexlisttype *extensions;
 	/* The list of extensions that this syntax applies to. */
-    exttype *headers;
-	/* Regexes to match on the 'header' (1st line) of the file */
+    regexlisttype *headers;
+	/* The list of headerlines that this syntax applies to. */
+    regexlisttype *magics;
+	/* The list of libmagic results that this syntax applies to. */
     colortype *color;
 	/* The colors used in this syntax. */
+    char *linter;
+	/* The command to lint this type of file. */
+    char *formatter;
+        /* Use this formatter command (for programming lang mainly) */
     int nmultis;
-	/* How many multi line strings this syntax has */
+	/* How many multi-line strings this syntax has. */
     struct syntaxtype *next;
 	/* Next syntax. */
 } syntaxtype;
 
-#define CNONE 		(1<<1)
+typedef struct lintstruct {
+    ssize_t lineno;
+	/* Line number of the error. */
+    ssize_t colno;
+	/* Column # of the error. */
+    char *msg;
+	/* Error message text. */
+    char *filename;
+	/* Filename. */
+    struct lintstruct *next;
+	/* Next error. */
+    struct lintstruct *prev;
+	/* Previous error. */
+} lintstruct;
+
+
+#define CNONE		(1<<1)
 	/* Yay, regex doesn't apply to this line at all! */
-#define CBEGINBEFORE 	(1<<2)
-	/* regex starts on an earlier line, ends on this one */
-#define CENDAFTER 	(1<<3)
-	/* regex sraers on this line and ends on a later one */
-#define CWHOLELINE 	(1<<4)
-	/* whole line engulfed by the regex  start < me, end > me */
-#define CSTARTENDHERE 	(1<<5)
-	/* regex starts and ends within this line */
+#define CBEGINBEFORE	(1<<2)
+	/* Regex starts on an earlier line, ends on this one. */
+#define CENDAFTER	(1<<3)
+	/* Regex starts on this line and ends on a later one. */
+#define CWHOLELINE	(1<<4)
+	/* Whole line engulfed by the regex, start < me, end > me. */
+#define CSTARTENDHERE	(1<<5)
+	/* Regex starts and ends within this line. */
 #define CWTF		(1<<6)
-	/* Something else */
+	/* Something else. */
 
-#endif /* ENABLE_COLOR */
+#endif /* !DISABLE_COLOR */
 
 
 /* Structure types. */
@@ -266,8 +301,9 @@ typedef struct filestruct {
 	/* Next node. */
     struct filestruct *prev;
 	/* Previous node. */
-#ifdef ENABLE_COLOR
-    short *multidata;		/* Array of which multi-line regexes apply to this line */
+#ifndef DISABLE_COLOR
+    short *multidata;
+	/* Array of which multi-line regexes apply to this line. */
 #endif
 } filestruct;
 
@@ -293,35 +329,40 @@ typedef struct partition {
 typedef struct undo {
     ssize_t lineno;
     undo_type type;
-	/* What type of undo was this */
-    int begin;
-	/* Where did this  action begin or end */
+	/* What type of undo this was. */
+    size_t begin;
+	/* Where did this action begin or end. */
     char *strdata;
-	/* String type data we will use for ccopying the affected line back */
-    char *strdata2;
-	/* Sigh, need this too it looks like */
+	/* String type data we will use for copying the affected line back. */
     int xflags;
-	/* Some flag data we need */
+	/* Some flag data we need. */
 
-    /* Cut specific stuff we need */
+    /* Cut-specific stuff we need. */
     filestruct *cutbuffer;
-	/* Copy of the cutbuffer */
+	/* Copy of the cutbuffer. */
     filestruct *cutbottom;
-	/* Copy of cutbottom */
+	/* Copy of cutbottom. */
     bool mark_set;
-	/* was the marker set when we cut */
-    bool to_end;
-	/* was this a cut to end */
+	/* Was the marker set when we cut? */
     ssize_t mark_begin_lineno;
 	/* copy copy copy */
-    ssize_t mark_begin_x;
-	/* Another shadow variable */
+    size_t mark_begin_x;
+	/* Another shadow variable. */
     struct undo *next;
 } undo;
+#endif /* !NANO_TINY */
 
-
-#endif /* NANO_TINY */
-
+#ifndef DISABLE_HISTORIES
+typedef struct poshiststruct {
+    char *filename;
+	/* The file. */
+    ssize_t lineno;
+	/* Line number we left off on. */
+    ssize_t xno;
+	/* x position in the file we left off on. */
+    struct poshiststruct *next;
+} poshiststruct;
+#endif
 
 typedef struct openfilestruct {
     char *filename;
@@ -339,7 +380,7 @@ typedef struct openfilestruct {
     size_t current_x;
 	/* The current file's x-coordinate position. */
     size_t placewewant;
-	/* The current file's place we want. */
+	/* The current file's x position we would like. */
     ssize_t current_y;
 	/* The current file's y-coordinate position. */
     bool modified;
@@ -357,14 +398,16 @@ typedef struct openfilestruct {
     struct stat *current_stat;
 	/* The current file's stat. */
     undo *undotop;
-	/* Top of the undo list */
+	/* Top of the undo list. */
     undo *current_undo;
-	/* The current (i.e. n ext) level of undo */
+	/* The current (i.e. next) level of undo. */
     undo_type last_action;
+    const char *lock_filename;
+	/* The path of the lockfile, if we created one. */
 #endif
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     syntaxtype *syntax;
-	/* The  syntax struct for this file, if any */
+	/* The  syntax struct for this file, if any. */
     colortype *colorstrings;
 	/* The current file's associated colors. */
 #endif
@@ -384,17 +427,6 @@ typedef struct shortcut {
 	/* Whether there should be a blank line after the help entry
 	 * text for this function. */
 #endif
-    /* Note: Key values that aren't used should be set to
-     * NANO_NO_KEY. */
-    int ctrlval;
-	/* The special sentinel key or control key we want bound, if
-	 * any. */
-    int metaval;
-	/* The meta key we want bound, if any. */
-    int funcval;
-	/* The function key we want bound, if any. */
-    int miscval;
-	/* The other meta key we want bound, if any. */
     bool viewok;
 	/* Is this function allowed when in view mode? */
     void (*func)(void);
@@ -403,41 +435,40 @@ typedef struct shortcut {
 	/* Next shortcut. */
 } shortcut;
 
-#ifdef ENABLE_NANORC
+#ifndef DISABLE_NANORC
 typedef struct rcoption {
    const char *name;
 	/* The name of the rcfile option. */
    long flag;
 	/* The flag associated with it, if any. */
 } rcoption;
-
 #endif
 
 typedef struct sc {
     char *keystr;
-	/* The shortcut key for a function, ASCII version */
-    function_type type;
-        /* What kind of function key is it for convenience later */
+	/* The shortcut key for a function, ASCII version. */
+    key_type type;
+	/* What kind of command key it is, for convenience later. */
     int seq;
-        /* The actual sequence to check on the the type is determined */
+	/* The actual sequence to check on the type is determined. */
     int menu;
-        /* What list does this apply to */
-    short scfunc;
-        /* The function we're going to run */
+	/* What list this applies to. */
+    void (*scfunc)(void);
+	/* The function we're going to run. */
     int toggle;
-        /* If a toggle, what we're toggling */
+	/* If a toggle, what we're toggling. */
     bool execute;
 	/* Whether to execute the function in question or just return
-	   so the sequence can be caught by the calling code */
+	 * so the sequence can be caught by the calling code. */
     struct sc *next;
-        /* Next in the list */
+	/* Next in the list. */
 } sc;
 
 typedef struct subnfunc {
-    short scfunc;
-	/* What function is this */
+    void (*scfunc)(void);
+	/* What function this is. */
     int menus;
-	/* In what menus does this function applu */
+	/* In what menus this function applies. */
     const char *desc;
 	/* The function's description, e.g. "Page Up". */
 #ifndef DISABLE_HELP
@@ -448,16 +479,24 @@ typedef struct subnfunc {
 	 * text for this function. */
 #endif
     bool viewok;
-        /* Is this function allowed when in view mode? */
+	/* Is this function allowed when in view mode? */
     long toggle;
-	/* If this is a toggle, if nonzero what toggle to set */
+	/* If this is a toggle, if nonzero what toggle to set. */
     struct subnfunc *next;
-	/* next item in the list */
+	/* Next item in the list. */
 } subnfunc;
 
+/* The elements of the interface that can be colored differently. */
+enum
+{
+    TITLE_BAR = 0,
+    STATUS_BAR,
+    KEY_COMBO,
+    FUNCTION_TAG,
+    NUMBER_OF_ELEMENTS
+};
 
-/* Enumeration to be used in flags table. See FLAGBIT and FLAGOFF 
- * definitions. */
+/* Enumeration used in the flags array.  See the definition of FLAGMASK. */
 enum
 {
     DONTUSE,
@@ -494,425 +533,53 @@ enum
     NO_NEWLINES,
     BOLD_TEXT,
     QUIET,
-    UNDOABLE,
-    SOFTWRAP
+    SOFTWRAP,
+    POS_HISTORY,
+    LOCKING,
+    NOREAD_MODE
 };
 
-/* Flags for which menus in which a given function should be present */
-#define MMAIN				(1<<0)
-#define	MWHEREIS			(1<<1)
-#define	MREPLACE			(1<<2)
-#define	MREPLACE2			(1<<3)
-#define	MGOTOLINE			(1<<4)
-#define	MWRITEFILE			(1<<5)
-#define	MINSERTFILE			(1<<6)
-#define	MEXTCMD				(1<<7)
-#define	MHELP				(1<<8)
-#define	MSPELL				(1<<9)
-#define	MBROWSER			(1<<10)
-#define	MWHEREISFILE			(1<<11)
-#define MGOTODIR			(1<<12)
-#define MYESNO				(1<<13)
-/* This really isnt all but close enough */
-#define	MALL				(MMAIN|MWHEREIS|MREPLACE|MREPLACE2|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MSPELL|MBROWSER|MWHEREISFILE|MGOTODIR|MHELP)
+/* Flags for the menus in which a given function should be present. */
+#define MMAIN			(1<<0)
+#define MWHEREIS		(1<<1)
+#define MREPLACE		(1<<2)
+#define MREPLACEWITH		(1<<3)
+#define MGOTOLINE		(1<<4)
+#define MWRITEFILE		(1<<5)
+#define MINSERTFILE		(1<<6)
+#define MEXTCMD			(1<<7)
+#define MHELP			(1<<8)
+#define MSPELL			(1<<9)
+#define MBROWSER		(1<<10)
+#define MWHEREISFILE		(1<<11)
+#define MGOTODIR		(1<<12)
+#define MYESNO			(1<<13)
+#define MLINTER			(1<<14)
+/* This is an abbreviation for all menus except Help and YesNo. */
+#define MMOST	(MMAIN|MWHEREIS|MREPLACE|MREPLACEWITH|MGOTOLINE|MWRITEFILE|MINSERTFILE|MEXTCMD|MBROWSER|MWHEREISFILE|MGOTODIR|MSPELL|MLINTER)
 
 /* Control key sequences.  Changing these would be very, very bad. */
 #define NANO_CONTROL_SPACE 0
-#define NANO_CONTROL_A 1
-#define NANO_CONTROL_B 2
-#define NANO_CONTROL_C 3
-#define NANO_CONTROL_D 4
-#define NANO_CONTROL_E 5
-#define NANO_CONTROL_F 6
-#define NANO_CONTROL_G 7
-#define NANO_CONTROL_H 8
 #define NANO_CONTROL_I 9
-#define NANO_CONTROL_J 10
-#define NANO_CONTROL_K 11
-#define NANO_CONTROL_L 12
-#define NANO_CONTROL_M 13
-#define NANO_CONTROL_N 14
-#define NANO_CONTROL_O 15
-#define NANO_CONTROL_P 16
-#define NANO_CONTROL_Q 17
-#define NANO_CONTROL_R 18
-#define NANO_CONTROL_S 19
-#define NANO_CONTROL_T 20
-#define NANO_CONTROL_U 21
-#define NANO_CONTROL_V 22
-#define NANO_CONTROL_W 23
-#define NANO_CONTROL_X 24
-#define NANO_CONTROL_Y 25
-#define NANO_CONTROL_Z 26
 #define NANO_CONTROL_3 27
-#define NANO_CONTROL_4 28
-#define NANO_CONTROL_5 29
-#define NANO_CONTROL_6 30
 #define NANO_CONTROL_7 31
 #define NANO_CONTROL_8 127
 
-/* Meta key sequences. */
-#define NANO_META_SPACE ' '
-#define NANO_META_LPARENTHESIS '('
-#define NANO_META_RPARENTHESIS ')'
-#define NANO_META_PLUS '+'
-#define NANO_META_COMMA ','
-#define NANO_META_MINUS '-'
-#define NANO_META_PERIOD '.'
-#define NANO_META_SLASH '/'
-#define NANO_META_0 '0'
-#define NANO_META_6 '6'
-#define NANO_META_9 '9'
-#define NANO_META_LCARET '<'
-#define NANO_META_EQUALS '='
-#define NANO_META_RCARET '>'
-#define NANO_META_QUESTION '?'
-#define NANO_META_BACKSLASH '\\'
-#define NANO_META_RBRACKET ']'
-#define NANO_META_CARET '^'
-#define NANO_META_UNDERSCORE '_'
-#define NANO_META_A 'a'
-#define NANO_META_B 'b'
-#define NANO_META_C 'c'
-#define NANO_META_D 'd'
-#define NANO_META_E 'e'
-#define NANO_META_F 'f'
-#define NANO_META_G 'g'
-#define NANO_META_H 'h'
-#define NANO_META_I 'i'
-#define NANO_META_J 'j'
-#define NANO_META_K 'k'
-#define NANO_META_L 'l'
-#define NANO_META_M 'm'
-#define NANO_META_N 'n'
-#define NANO_META_O 'o'
-#define NANO_META_P 'p'
-#define NANO_META_Q 'q'
-#define NANO_META_R 'r'
-#define NANO_META_S 's'
-#define NANO_META_T 't'
-#define NANO_META_U 'u'
-#define NANO_META_V 'v'
-#define NANO_META_W 'w'
-#define NANO_META_X 'x'
-#define NANO_META_Y 'y'
-#define NANO_META_Z 'z'
-#define NANO_META_LCURLYBRACKET '{'
-#define NANO_META_PIPE '|'
-#define NANO_META_RCURLYBRACKET '}'
-
-/* Some semi-changeable keybindings; don't play with these unless you're
- * sure you know what you're doing.  Assume ERR is defined as -1. */
-
-/* No key at all. */
-#define NANO_NO_KEY			-2
-
-/* Normal keys. */
-#define NANO_XON_KEY			NANO_CONTROL_Q
-#define NANO_XOFF_KEY			NANO_CONTROL_S
-#define NANO_CANCEL_KEY			NANO_CONTROL_C
-#define NANO_EXIT_KEY			NANO_CONTROL_X
-#define NANO_EXIT_FKEY			KEY_F(2)
-#define NANO_INSERTFILE_KEY		NANO_CONTROL_R
-#define NANO_INSERTFILE_FKEY		KEY_F(5)
-#define NANO_TOOTHERINSERT_KEY		NANO_CONTROL_X
-#define NANO_WRITEOUT_KEY		NANO_CONTROL_O
-#define NANO_WRITEOUT_FKEY		KEY_F(3)
-#define NANO_GOTOLINE_KEY		NANO_CONTROL_7
-#define NANO_GOTOLINE_FKEY		KEY_F(13)
-#define NANO_GOTOLINE_METAKEY		NANO_META_G
-#define NANO_GOTODIR_KEY		NANO_CONTROL_7
-#define NANO_GOTODIR_FKEY		KEY_F(13)
-#define NANO_GOTODIR_METAKEY		NANO_META_G
-#define NANO_TOGOTOLINE_KEY		NANO_CONTROL_T
-#define NANO_HELP_KEY			NANO_CONTROL_G
-#define NANO_HELP_FKEY			KEY_F(1)
-#define NANO_WHEREIS_KEY		NANO_CONTROL_W
-#define NANO_WHEREIS_FKEY		KEY_F(6)
-#define NANO_WHEREIS_NEXT_KEY		NANO_META_W
-#define NANO_WHEREIS_NEXT_FKEY		KEY_F(16)
-#define NANO_TOOTHERWHEREIS_KEY		NANO_CONTROL_T
-#define NANO_REGEXP_KEY			NANO_META_R
-#define NANO_REPLACE_KEY		NANO_CONTROL_4
-#define NANO_REPLACE_FKEY		KEY_F(14)
-#define NANO_REPLACE_METAKEY		NANO_META_R
-#define NANO_TOOTHERSEARCH_KEY		NANO_CONTROL_R
-#define NANO_PREVPAGE_KEY		NANO_CONTROL_Y
-#define NANO_PREVPAGE_FKEY		KEY_F(7)
-#define NANO_NEXTPAGE_KEY		NANO_CONTROL_V
-#define NANO_NEXTPAGE_FKEY		KEY_F(8)
-#define NANO_CUT_KEY			NANO_CONTROL_K
-#define NANO_CUT_FKEY			KEY_F(9)
-#define NANO_COPY_KEY			NANO_META_CARET
-#define NANO_COPY_METAKEY		NANO_META_6
-#define NANO_UNCUT_KEY			NANO_CONTROL_U
-#define NANO_UNCUT_FKEY			KEY_F(10)
-#define NANO_CURSORPOS_KEY		NANO_CONTROL_C
-#define NANO_CURSORPOS_FKEY		KEY_F(11)
-#define NANO_SPELL_KEY			NANO_CONTROL_T
-#define NANO_SPELL_FKEY			KEY_F(12)
-#define NANO_FIRSTLINE_KEY		NANO_PREVPAGE_KEY
-#define NANO_FIRSTLINE_FKEY		NANO_PREVPAGE_FKEY
-#define NANO_FIRSTLINE_METAKEY		NANO_META_BACKSLASH
-#define NANO_FIRSTLINE_METAKEY2		NANO_META_PIPE
-#define NANO_FIRSTFILE_KEY		NANO_FIRSTLINE_KEY
-#define NANO_FIRSTFILE_FKEY		NANO_FIRSTLINE_FKEY
-#define NANO_FIRSTFILE_METAKEY		NANO_FIRSTLINE_METAKEY
-#define NANO_FIRSTFILE_METAKEY2		NANO_FIRSTLINE_METAKEY2
-#define NANO_LASTLINE_KEY		NANO_NEXTPAGE_KEY
-#define NANO_LASTLINE_FKEY		NANO_NEXTPAGE_FKEY
-#define NANO_LASTLINE_METAKEY		NANO_META_SLASH
-#define NANO_LASTLINE_METAKEY2		NANO_META_QUESTION
-#define NANO_LASTFILE_KEY		NANO_LASTLINE_KEY
-#define NANO_LASTFILE_FKEY		NANO_LASTLINE_FKEY
-#define NANO_LASTFILE_METAKEY		NANO_LASTLINE_METAKEY
-#define NANO_LASTFILE_METAKEY2		NANO_LASTLINE_METAKEY2
-#define NANO_REFRESH_KEY		NANO_CONTROL_L
-#define NANO_JUSTIFY_KEY		NANO_CONTROL_J
-#define NANO_JUSTIFY_FKEY		KEY_F(4)
-#define NANO_UNJUSTIFY_KEY		NANO_UNCUT_KEY
-#define NANO_UNJUSTIFY_FKEY		NANO_UNCUT_FKEY
-#define NANO_PREVLINE_KEY		NANO_CONTROL_P
-#define NANO_NEXTLINE_KEY		NANO_CONTROL_N
-#define NANO_FORWARD_KEY		NANO_CONTROL_F
-#define NANO_BACK_KEY			NANO_CONTROL_B
-#define NANO_MARK_KEY			NANO_CONTROL_6
-#define NANO_MARK_METAKEY		NANO_META_A
-#define NANO_MARK_FKEY			KEY_F(15)
-#define NANO_HOME_KEY			NANO_CONTROL_A
-#define NANO_END_KEY			NANO_CONTROL_E
-#define NANO_DELETE_KEY			NANO_CONTROL_D
-#define NANO_BACKSPACE_KEY		NANO_CONTROL_H
-#define NANO_TAB_KEY			NANO_CONTROL_I
-#define NANO_INDENT_KEY			NANO_META_RCURLYBRACKET
-#define NANO_UNINDENT_KEY		NANO_META_LCURLYBRACKET
-#define NANO_SUSPEND_KEY		NANO_CONTROL_Z
-#define NANO_ENTER_KEY			NANO_CONTROL_M
-#define NANO_TOFILES_KEY		NANO_CONTROL_T
-#define NANO_APPEND_KEY			NANO_META_A
-#define NANO_PREPEND_KEY		NANO_META_P
-#define NANO_PREVFILE_KEY		NANO_META_LCARET
-#define NANO_PREVFILE_METAKEY		NANO_META_COMMA
-#define NANO_NEXTFILE_KEY		NANO_META_RCARET
-#define NANO_NEXTFILE_METAKEY		NANO_META_PERIOD
-#define NANO_BRACKET_KEY		NANO_META_RBRACKET
-#define NANO_NEXTWORD_KEY		NANO_CONTROL_SPACE
-#define NANO_PREVWORD_KEY		NANO_META_SPACE
-#define NANO_WORDCOUNT_KEY		NANO_META_D
-#define NANO_SCROLLUP_KEY		NANO_META_MINUS
-#define NANO_SCROLLDOWN_KEY		NANO_META_PLUS
-#define NANO_SCROLLUP_METAKEY		NANO_META_UNDERSCORE
-#define NANO_SCROLLDOWN_METAKEY		NANO_META_EQUALS
-#define NANO_CUTTILLEND_METAKEY		NANO_META_T
-#define NANO_PARABEGIN_KEY		NANO_CONTROL_W
-#define NANO_PARABEGIN_METAKEY		NANO_META_LPARENTHESIS
-#define NANO_PARABEGIN_METAKEY2		NANO_META_9
-#define NANO_PARAEND_KEY		NANO_CONTROL_O
-#define NANO_PARAEND_METAKEY		NANO_META_RPARENTHESIS
-#define NANO_PARAEND_METAKEY2		NANO_META_0
-#define NANO_FULLJUSTIFY_KEY		NANO_CONTROL_U
-#define NANO_FULLJUSTIFY_METAKEY	NANO_META_J
-#define NANO_VERBATIM_KEY		NANO_META_V
-
-/* Toggles do not exist if NANO_TINY is defined. */
-#ifndef NANO_TINY
-
-/* No toggle at all. */
-#define TOGGLE_NO_KEY			-2
-
-/* Normal toggles. */
-#define TOGGLE_NOHELP_KEY		NANO_META_X
-#define TOGGLE_CONST_KEY		NANO_META_C
-#define TOGGLE_MORESPACE_KEY		NANO_META_O
-#define TOGGLE_SMOOTH_KEY		NANO_META_S
-#define TOGGLE_WHITESPACE_KEY		NANO_META_P
-#define TOGGLE_SYNTAX_KEY		NANO_META_Y
-#define TOGGLE_SMARTHOME_KEY		NANO_META_H
-#define TOGGLE_AUTOINDENT_KEY		NANO_META_I
-#define TOGGLE_CUTTOEND_KEY		NANO_META_K
-#define TOGGLE_WRAP_KEY			NANO_META_L
-#define TOGGLE_TABSTOSPACES_KEY		NANO_META_Q
-#define TOGGLE_BACKUP_KEY		NANO_META_B
-#define TOGGLE_MULTIBUFFER_KEY		NANO_META_F
-#define TOGGLE_MOUSE_KEY		NANO_META_M
-#define TOGGLE_NOCONVERT_KEY		NANO_META_N
-#define TOGGLE_SUSPEND_KEY		NANO_META_Z
-#define TOGGLE_CASE_KEY			NANO_META_C
-#define TOGGLE_BACKWARDS_KEY		NANO_META_B
-#define TOGGLE_DOS_KEY			NANO_META_D
-#define TOGGLE_MAC_KEY			NANO_META_M
-
-/* Extra bits for the undo function */
-#define UNDO_DEL_DEL		(1<<0)
-#define UNDO_DEL_BACKSPACE	(1<<1)
-#define UNDO_SPLIT_MADENEW	(1<<2)
-
-/* Since in ISO C you can't pass around function pointers anymore,
-  let's make some integer macros for function names, and then I
-  can go cut my wrists after writing the big switch statement
-  that will necessitate. */
+/* Codes for "modified" Arrow keys.  Chosen like this because some
+ * terminals produce them, and they are beyond KEY_MAX of ncurses. */
+#define CONTROL_LEFT 539
+#define CONTROL_RIGHT 554
 
+#ifndef NANO_TINY
+/* Extra bits for the undo function. */
+#define UNdel_del		(1<<0)
+#define UNdel_backspace		(1<<1)
+#define UNcut_marked_forward	(1<<2)
+#define UNcut_cutline		(1<<3)
 #endif /* !NANO_TINY */
 
-#define CASE_SENS_MSG 1
-#define BACKWARDS_MSG 2
-#define REGEXP_MSG 3
-#define WHEREIS_NEXT_MSG 4
-#define FIRST_FILE_MSG 5
-#define LAST_FILE_MSG 6
-#define GOTO_DIR_MSG 7
-#define TOTAL_REFRESH 8
-#define DO_HELP_VOID 9
-#define DO_SEARCH 10
-#define DO_PAGE_UP 11
-#define DO_PAGE_DOWN 12
-#define DO_UP_VOID 13
-#define DO_LEFT 14
-#define DO_DOWN_VOID 15
-#define DO_RIGHT 16
-#define DO_ENTER 17
-#define DO_EXIT 18
-#define NEW_BUFFER_MSG 19
-#define EXT_CMD_MSG 20
-#define TO_FILES_MSG 21
-#define DOS_FORMAT_MSG 23
-#define MAC_FORMAT_MSG 24
-#define BACKUP_FILE_MSG 25
-#define PREPEND_MSG 26
-#define APPEND_MSG 27
-#define DO_FIRST_LINE 28
-#define DO_LAST_LINE 29
-#define DO_TOGGLE 30
-#define GOTOTEXT_MSG 31
-#define NO_REPLACE_MSG 32
-#define DO_BACKSPACE 33
-#define DO_DELETE 34
-#define DO_TAB 35
-#define DO_VERBATIM_INPUT 36
-#define SWITCH_TO_NEXT_BUFFER_VOID 37
-#define SWITCH_TO_PREV_BUFFER_VOID 38
-#define DO_END 39
-#define DO_HOME 40
-#define NEXT_HISTORY_MSG 41
-#define PREV_HISTORY_MSG 42
-#define DO_REDO 43
-#define DO_UNDO 44
-#define DO_WORDLINECHAR_COUNT 45
-#define DO_FIND_BRACKET 46
-#define DO_PREV_WORD_VOID 47
-#define DO_SUSPEND_VOID 48
-#define CANCEL_MSG 49
-#define DO_WRITEOUT_VOID 50
-#define DO_INSERTFILE_VOID 51
-#define DO_CUT_TEXT_VOID 52
-#define DO_UNCUT_TEXT 53
-#define DO_CURSORPOS_VOID 54
-#define DO_GOTOLINECOLUMN_VOID 55
-#define DO_REPLACE 56
-#define DO_JUSTIFY_VOID 57
-#define DO_PARA_BEGIN_VOID 58
-#define DO_PARA_END_VOID 59
-#define DO_FULL_JUSTIFY 60
-#define DO_MARK 61
-#define DO_RESEARCH 62
-#define DO_COPY_TEXT 63
-#define DO_INDENT_VOID 64
-#define DO_UNINDENT 65
-#define DO_SCROLL_UP 66
-#define DO_SCROLL_DOWN 67
-#define DO_NEXT_WORD_VOID 68
-#define DO_CUT_TILL_END 69
-#define NANO_GOTODIR_MSG 70
-#define NANO_LASTFILE_MSG 71
-#define NANO_FIRSTFILE_MSG 72
-#define INSERT_FILE_MSG 73
-#define NANO_MULTIBUFFER_MSG 74
-#define NANO_EXECUTE_MSG 75
-#define NANO_BACKUP_MSG 76
-#define NANO_PREPEND_MSG 77
-#define NANO_APPEND_MSG 78
-#define NANO_MAC_MSG 79
-#define NANO_DOS_MSG 80
-#define NANO_TOFILES_MSG 81
-#define NANO_NEXT_HISTORY_MSG 82
-#define NANO_PREV_HISTORY_MSG 83
-#define NANO_REGEXP_MSG 84
-#define NANO_REVERSE_MSG 85
-#define NANO_CASE_MSG 86
-#define NANO_SUSPEND_MSG 87
-#define SUSPEND_MSG 88
-#define NANO_REFRESH_MSG 89
-#define REFRESH_MSG 90
-#define NANO_WORDCOUNT_MSG 91
-#define NANO_FULLJUSTIFY_MSG 92
-#define FULLJSTIFY_MSG 93
-#define XOFF_COMPLAINT 94
-#define XON_COMPLAINT 95
-#define NANO_CUT_TILL_END_MSG 96
-#define NANO_BACKSPACE_MSG 97
-#define NANO_DELETE_MSG 98
-#define NANO_ENTER_MSG 99
-#define NANO_TAB_MSG 100
-#define NANO_VERBATIM_MSG 101
-#define NANO_NEXTFILE_MSG 102
-#define NANO_PREVFILE_MSG 103
-#define NANO_SCROLLDOWN_MSG 104
-#define NANO_SCROLLUP_MSG 105
-#define NANO_BRACKET_MSG 106
-#define NANO_PARAEND_MSG 107
-#define END_OF_PAR_MSG 108
-#define NANO_PARABEGIN_MSG 109
-#define BEG_OF_PAR_MSG 110
-#define NANO_END_MSG 111
-#define NANO_HOME_MSG 112
-#define NANO_NEXTLINE_MSG 113
-#define NANO_PREVLINE_MSG 114
-#define NANO_PREVWORD_MSG 115
-#define NANO_NEXTWORD_MSG 116
-#define NANO_BACK_MSG 117
-#define NANO_FORWARD_MSG 118
-#define NANO_REDO_MSG 119
-#define NANO_UNDO_MSG 120
-#define NANO_UNINDENT_MSG 121
-#define NANO_INDENT_MSG 122
-#define NANO_COPY_MSG 123
-#define NANO_WHEREIS_NEXT_MSG 124
-#define NANO_MARK_MSG 125
-#define NANO_REPLACE_MSG 126
-#define REPLACE_MSG 127
-#define NANO_GOTOLINE_MSG 128
-#define NANO_LASTLINE_MSG 129
-#define NANO_FIRSTLINE_MSG 130
-#define NANO_SPELL_MSG 131
-#define DO_SPELL 132
-#define NANO_CURSORPOS_MSG 133
-#define NANO_UNCUT_MSG 134
-#define GET_HELP_MSG 135
-#define NANO_HELP_MSG 136
-#define NANO_CANCEL_MSG 137
-#define NANO_EXIT_MSG 138
-#define EXIT_MSG 139
-#define NANO_EXITBROWSER_MSG 140
-#define NANO_WRITEOUT_MSG 141
-#define NANO_DISABLED_MSG 142
-#define NANO_INSERT_MSG 143
-#define WHEREIS_MSG 144
-#define NANO_WHEREIS_MSG 145
-#define NANO_PREVPAGE_MSG 146
-#define NANO_NEXTPAGE_MSG 147
-#define NANO_CUT_MSG 148
-#define DO_CUT_TEXT 149
-#define DO_NEXT_WORD 150
-#define DO_PREV_WORD 151
-
-
-
-
-#define VIEW TRUE
-#define NOVIEW FALSE
-
 /* The maximum number of entries displayed in the main shortcut list. */
-#define MAIN_VISIBLE 12
+#define MAIN_VISIBLE (((COLS + 40) / 20) * 2)
 
 /* The minimum editor window columns and rows required for nano to work
  * correctly. */
diff --git a/src/prompt.c b/src/prompt.c
index afb36d6..e3d4f1f 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -1,9 +1,9 @@
-/* $Id: prompt.c 4475 2010-01-17 05:30:22Z astyanax $ */
+/* $Id: prompt.c 5086 2014-07-31 20:49:32Z bens $ */
 /**************************************************************************
  *   prompt.c                                                             *
  *                                                                        *
  *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009 Free Software Foundation, Inc.                            *
+ *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -42,18 +42,13 @@ static bool reset_statusbar_x = FALSE;
 	 * prompt? */
 
 /* Read in a character, interpret it as a shortcut or toggle if
- * necessary, and return it.  Set meta_key to TRUE if the character is a
- * meta sequence, set func_key to TRUE if the character is a function
- * key, set have_shortcut to TRUE if the character is a shortcut
- * key, set ran_func to TRUE if we ran a function associated with a
+ * necessary, and return it.
+ * Set ran_func to TRUE if we ran a function associated with a
  * shortcut key, and set finished to TRUE if we're done after running
- * or trying to run a function associated with a shortcut key.  If
- * allow_funcs is FALSE, don't actually run any functions associated
- * with shortcut keys.  refresh_func is the function we will call to
- * refresh the edit window. */
-int do_statusbar_input(bool *meta_key, bool *func_key, bool *have_shortcut,
-	bool *ran_func, bool *finished, bool allow_funcs, void
-	(*refresh_func)(void))
+ * or trying to run a function associated with a shortcut key.
+ * refresh_func is the function we will call to refresh the edit window. */
+int do_statusbar_input(bool *ran_func, bool *finished,
+	void (*refresh_func)(void))
 {
     int input;
 	/* The character we read in. */
@@ -62,157 +57,142 @@ int do_statusbar_input(bool *meta_key, bool *func_key, bool *have_shortcut,
     static size_t kbinput_len = 0;
 	/* The length of the input buffer. */
     const sc *s;
+    bool have_shortcut = FALSE;
     const subnfunc *f;
 
-    *have_shortcut = FALSE;
     *ran_func = FALSE;
     *finished = FALSE;
 
     /* Read in a character. */
-    input = get_kbinput(bottomwin, meta_key, func_key);
+    input = get_kbinput(bottomwin);
 
 #ifndef DISABLE_MOUSE
-    if (allow_funcs) {
-	/* If we got a mouse click and it was on a shortcut, read in the
-	 * shortcut character. */
-	if (*func_key && input == KEY_MOUSE) {
-	    if (do_statusbar_mouse() == 1)
-		input = get_kbinput(bottomwin, meta_key, func_key);
-	    else {
-		*meta_key = FALSE;
-		*func_key = FALSE;
-		input = ERR;
-	    }
+    /* If we got a mouse click and it was on a shortcut, read in the
+     * shortcut character. */
+    if (func_key && input == KEY_MOUSE) {
+	if (do_statusbar_mouse() == 1)
+	    input = get_kbinput(bottomwin);
+	else {
+	    meta_key = FALSE;
+	    func_key = FALSE;
+	    input = ERR;
 	}
     }
 #endif
 
     /* Check for a shortcut in the current list. */
-    s = get_shortcut(currmenu, &input, meta_key, func_key);
+    s = get_shortcut(&input);
 
     /* If we got a shortcut from the current list, or a "universal"
      * statusbar prompt shortcut, set have_shortcut to TRUE. */
-    *have_shortcut = (s != NULL);
+    have_shortcut = (s != NULL);
 
     /* If we got a non-high-bit control key, a meta key sequence, or a
      * function key, and it's not a shortcut or toggle, throw it out. */
-    if (!*have_shortcut) {
-	if (is_ascii_cntrl_char(input) || *meta_key || *func_key) {
+    if (!have_shortcut) {
+	if (is_ascii_cntrl_char(input) || meta_key || func_key) {
 	    beep();
-	    *meta_key = FALSE;
-	    *func_key = FALSE;
+	    meta_key = FALSE;
+	    func_key = FALSE;
 	    input = ERR;
 	}
     }
 
-    if (allow_funcs) {
-	/* If we got a character, and it isn't a shortcut or toggle,
-	 * it's a normal text character.  Display the warning if we're
-	 * in view mode, or add the character to the input buffer if
-	 * we're not. */
-	if (input != ERR && !*have_shortcut) {
-	    /* If we're using restricted mode, the filename isn't blank,
-	     * and we're at the "Write File" prompt, disable text
-	     * input. */
-	    if (!ISSET(RESTRICTED) || openfile->filename[0] == '\0' ||
+    /* If we got a character, and it isn't a shortcut or toggle,
+     * it's a normal text character.  Display the warning if we're
+     * in view mode, or add the character to the input buffer if
+     * we're not. */
+    if (input != ERR && !have_shortcut) {
+	/* If we're using restricted mode, the filename isn't blank,
+	 * and we're at the "Write File" prompt, disable text input. */
+	if (!ISSET(RESTRICTED) || openfile->filename[0] == '\0' ||
 		currmenu != MWRITEFILE) {
-		kbinput_len++;
-		kbinput = (int *)nrealloc(kbinput, kbinput_len *
-			sizeof(int));
-		kbinput[kbinput_len - 1] = input;
-	    }
+	    kbinput_len++;
+	    kbinput = (int *)nrealloc(kbinput, kbinput_len * sizeof(int));
+	    kbinput[kbinput_len - 1] = input;
 	}
-
-	/* If we got a shortcut, or if there aren't any other characters
-	 * waiting after the one we read in, we need to display all the
-	 * characters in the input buffer if it isn't empty. */
-	 if (*have_shortcut || get_key_buffer_len() == 0) {
-	    if (kbinput != NULL) {
-		/* Display all the characters in the input buffer at
-		 * once, filtering out control characters. */
-		char *output = charalloc(kbinput_len + 1);
-		size_t i;
-		bool got_enter;
-			/* Whether we got the Enter key. */
-
-		for (i = 0; i < kbinput_len; i++)
-		    output[i] = (char)kbinput[i];
-		output[i] = '\0';
-
-		do_statusbar_output(output, kbinput_len, &got_enter,
-			FALSE);
-
-		free(output);
-
-		/* Empty the input buffer. */
-		kbinput_len = 0;
-		free(kbinput);
-		kbinput = NULL;
-	    }
+     }
+
+    /* If we got a shortcut, or if there aren't any other characters
+     * waiting after the one we read in, we need to display all the
+     * characters in the input buffer if it isn't empty. */
+    if (have_shortcut || get_key_buffer_len() == 0) {
+	if (kbinput != NULL) {
+	    /* Display all the characters in the input buffer at
+	     * once, filtering out control characters. */
+	    char *output = charalloc(kbinput_len + 1);
+	    size_t i;
+	    bool got_enter;
+		/* Whether we got the Enter key. */
+
+	    for (i = 0; i < kbinput_len; i++)
+		output[i] = (char)kbinput[i];
+	    output[i] = '\0';
+
+	    do_statusbar_output(output, kbinput_len, &got_enter, FALSE);
+
+	    free(output);
+
+	    /* Empty the input buffer. */
+	    kbinput_len = 0;
+	    free(kbinput);
+	    kbinput = NULL;
 	}
 
-	if (*have_shortcut) {
-	    if (s->scfunc == DO_TAB || s->scfunc == DO_ENTER)
+	if (have_shortcut) {
+	    if (s->scfunc == do_tab || s->scfunc == do_enter_void)
 		;
-	    else if (s->scfunc == TOTAL_REFRESH)
+	    else if (s->scfunc == total_refresh)
 		total_statusbar_refresh(refresh_func);
-            else if (s->scfunc ==  DO_CUT_TEXT) {
+	    else if (s->scfunc == do_cut_text_void) {
 		/* If we're using restricted mode, the filename
 		 * isn't blank, and we're at the "Write File"
 		 * prompt, disable Cut. */
 		if (!ISSET(RESTRICTED) || openfile->filename[0] ==
 			'\0' || currmenu != MWRITEFILE)
 		    do_statusbar_cut_text();
-	    } else if (s->scfunc == DO_RIGHT)
-		do_statusbar_right();
-	    else if (s->scfunc == DO_LEFT)
+	    } else if (s->scfunc == do_left)
 		do_statusbar_left();
-
+	    else if (s->scfunc == do_right)
+		do_statusbar_right();
 #ifndef NANO_TINY
-	    else if (s->scfunc ==  DO_NEXT_WORD)
+	    else if (s->scfunc == do_prev_word_void)
+		do_statusbar_prev_word(FALSE);
+	    else if (s->scfunc == do_next_word_void)
 		do_statusbar_next_word(FALSE);
-	    else if (s->scfunc ==  DO_PREV_WORD)
-		    do_statusbar_prev_word(FALSE);
-#endif
-	    else if (s->scfunc == DO_HOME)
-		    do_statusbar_home();
-	    else if (s->scfunc == DO_END)
-		    do_statusbar_end();
-
-#ifndef NANO_TINY
-	    else if (s->scfunc == DO_FIND_BRACKET)
-		do_statusbar_find_bracket();
 #endif
-	    else if (s->scfunc == DO_VERBATIM_INPUT) {
-		    /* If we're using restricted mode, the filename
-		     * isn't blank, and we're at the "Write File"
-	   	     * prompt, disable verbatim input. */
-		    if (!ISSET(RESTRICTED) ||
-			openfile->filename[0] == '\0' ||
-			currmenu != MWRITEFILE) {
-			    bool got_enter;
-			    /* Whether we got the Enter key. */
-
-			    do_statusbar_verbatim_input(&got_enter);
-
-			    /* If we got the Enter key, remove it from
-			     * the input buffer, set input to the key
-			     * value for Enter, and set finished to TRUE
-			     * to indicate that we're done. */
-			    if (got_enter) {
-				get_input(NULL, 1);
-				input = sc_seq_or(DO_ENTER, 0);
-				*finished = TRUE;
-			    }
+	    else if (s->scfunc == do_home)
+		do_statusbar_home();
+	    else if (s->scfunc == do_end)
+		do_statusbar_end();
+	    else if (s->scfunc == do_verbatim_input) {
+		/* If we're using restricted mode, the filename
+		 * isn't blank, and we're at the "Write File"
+		 * prompt, disable verbatim input. */
+		if (!ISSET(RESTRICTED) || currmenu != MWRITEFILE ||
+			openfile->filename[0] == '\0') {
+		    bool got_enter;
+		    /* Whether we got the Enter key. */
+
+		    do_statusbar_verbatim_input(&got_enter);
+
+		    /* If we got the Enter key, remove it from the input
+		     * buffer, set input to the key value for Enter, and
+		     * set finished to TRUE to indicate that we're done. */
+		    if (got_enter) {
+			get_input(NULL, 1);
+			input = sc_seq_or(do_enter_void, 0);
+			*finished = TRUE;
 		    }
-	    } else if (s->scfunc == DO_DELETE) {
+		}
+	    } else if (s->scfunc == do_delete) {
 		/* If we're using restricted mode, the filename
 		 * isn't blank, and we're at the "Write File"
 		 * prompt, disable Delete. */
 		if (!ISSET(RESTRICTED) || openfile->filename[0] ==
 			'\0' || currmenu != MWRITEFILE)
 		    do_statusbar_delete();
-	    } else if (s->scfunc == DO_BACKSPACE) {
+	    } else if (s->scfunc == do_backspace) {
 		/* If we're using restricted mode, the filename
 		 * isn't blank, and we're at the "Write File"
 		 * prompt, disable Backspace. */
@@ -220,17 +200,17 @@ int do_statusbar_input(bool *meta_key, bool *func_key, bool *have_shortcut,
 			'\0' || currmenu != MWRITEFILE)
 		    do_statusbar_backspace();
 	    } else {
-	    /* Handle the normal statusbar prompt shortcuts, setting
-	     * ran_func to TRUE if we try to run their associated
-	     * functions and setting finished to TRUE to indicate
-	     * that we're done after running or trying to run their
-	     * associated functions. */
-
+		/* Handle any other shortcut in the current menu, setting
+		 * ran_func to TRUE if we try to run their associated
+		 * functions and setting finished to TRUE to indicate
+		 * that we're done after running or trying to run their
+		 * associated functions. */
 		f = sctofunc((sc *) s);
-		if (s->scfunc != 0 &&  s->execute == TRUE) {
-			*ran_func = TRUE;
-		    if (f && (!ISSET(VIEW_MODE) || (f->viewok)))
-		        iso_me_harder_funcmap(f->scfunc);
+		if (s->scfunc != NULL) {
+		    *ran_func = TRUE;
+		    if (f && (!ISSET(VIEW_MODE) || f->viewok) &&
+				f->scfunc != do_gotolinecolumn_void)
+			f->scfunc();
 		}
 		*finished = TRUE;
 	    }
@@ -320,7 +300,7 @@ void do_statusbar_output(char *output, size_t output_len, bool
 		char_buf_len)))
 	    continue;
 
-	/* More dangerousness fun =) */
+	/* More dangerousness fun. =) */
 	answer = charealloc(answer, answer_len + (char_buf_len * 2));
 
 	assert(statusbar_x <= answer_len);
@@ -360,13 +340,12 @@ void do_statusbar_home(void)
 	    statusbar_x = 0;
 
 	statusbar_pww = statusbar_xplustabs();
-    } else {
+    } else
 #endif
+    {
 	statusbar_x = 0;
 	statusbar_pww = statusbar_xplustabs();
-#ifndef NANO_TINY
     }
-#endif
 
     if (need_statusbar_horizontal_update(pww_save))
 	update_statusbar_line(answer, statusbar_x);
@@ -451,14 +430,13 @@ void do_statusbar_cut_text(void)
 #ifndef NANO_TINY
     if (ISSET(CUT_TO_END))
 	null_at(&answer, statusbar_x);
-    else {
+    else
 #endif
+    {
 	null_at(&answer, 0);
 	statusbar_x = 0;
 	statusbar_pww = statusbar_xplustabs();
-#ifndef NANO_TINY
     }
-#endif
 
     update_statusbar_line(answer, statusbar_x);
 }
@@ -651,162 +629,6 @@ void do_statusbar_verbatim_input(bool *got_enter)
     free(output);
 }
 
-#ifndef NANO_TINY
-/* Search for a match to one of the two characters in bracket_set.  If
- * reverse is TRUE, search backwards for the leftmost bracket.
- * Otherwise, search forwards for the rightmost bracket.  Return TRUE if
- * we found a match, and FALSE otherwise. */
-bool find_statusbar_bracket_match(bool reverse, const char
-	*bracket_set)
-{
-    const char *rev_start = NULL, *found = NULL;
-
-    assert(mbstrlen(bracket_set) == 2);
-
-    /* rev_start might end up 1 character before the start or after the
-     * end of the line.  This won't be a problem because we'll skip over
-     * it below in that case. */
-    rev_start = reverse ? answer + (statusbar_x - 1) : answer +
-	(statusbar_x + 1);
-
-    while (TRUE) {
-	/* Look for either of the two characters in bracket_set.
-	 * rev_start can be 1 character before the start or after the
-	 * end of the line.  In either case, just act as though no match
-	 * is found. */
-	found = ((rev_start > answer && *(rev_start - 1) == '\0') ||
-		rev_start < answer) ? NULL : (reverse ?
-		mbrevstrpbrk(answer, bracket_set, rev_start) :
-		mbstrpbrk(rev_start, bracket_set));
-
-	/* We've found a potential match. */
-	if (found != NULL)
-	    break;
-
-	/* We've reached the start or end of the statusbar text, so
-	 * get out. */
-	return FALSE;
-    }
-
-    /* We've definitely found something. */
-    statusbar_x = found - answer;
-    statusbar_pww = statusbar_xplustabs();
-
-    return TRUE;
-}
-
-/* Search for a match to the bracket at the current cursor position, if
- * there is one. */
-void do_statusbar_find_bracket(void)
-{
-    size_t statusbar_x_save, pww_save;
-    const char *ch;
-	/* The location in matchbrackets of the bracket at the current
-	 * cursor position. */
-    int ch_len;
-	/* The length of ch in bytes. */
-    const char *wanted_ch;
-	/* The location in matchbrackets of the bracket complementing
-	 * the bracket at the current cursor position. */
-    int wanted_ch_len;
-	/* The length of wanted_ch in bytes. */
-    char *bracket_set;
-	/* The pair of characters in ch and wanted_ch. */
-    size_t i;
-	/* Generic loop variable. */
-    size_t matchhalf;
-	/* The number of single-byte characters in one half of
-	 * matchbrackets. */
-    size_t mbmatchhalf;
-	/* The number of multibyte characters in one half of
-	 * matchbrackets. */
-    size_t count = 1;
-	/* The initial bracket count. */
-    bool reverse;
-	/* The direction we search. */
-    char *found_ch;
-	/* The character we find. */
-
-    assert(mbstrlen(matchbrackets) % 2 == 0);
-
-    ch = answer + statusbar_x;
-
-    if (ch == '\0' || (ch = mbstrchr(matchbrackets, ch)) == NULL)
-	return;
-
-    /* Save where we are. */
-    statusbar_x_save = statusbar_x;
-    pww_save = statusbar_pww;
-
-    /* If we're on an opening bracket, which must be in the first half
-     * of matchbrackets, we want to search forwards for a closing
-     * bracket.  If we're on a closing bracket, which must be in the
-     * second half of matchbrackets, we want to search backwards for an
-     * opening bracket. */
-    matchhalf = 0;
-    mbmatchhalf = mbstrlen(matchbrackets) / 2;
-
-    for (i = 0; i < mbmatchhalf; i++)
-	matchhalf += parse_mbchar(matchbrackets + matchhalf, NULL,
-		NULL);
-
-    reverse = ((ch - matchbrackets) >= matchhalf);
-
-    /* If we're on an opening bracket, set wanted_ch to the character
-     * that's matchhalf characters after ch.  If we're on a closing
-     * bracket, set wanted_ch to the character that's matchhalf
-     * characters before ch. */
-    wanted_ch = ch;
-
-    while (mbmatchhalf > 0) {
-	if (reverse)
-	    wanted_ch = matchbrackets + move_mbleft(matchbrackets,
-		wanted_ch - matchbrackets);
-	else
-	    wanted_ch += move_mbright(wanted_ch, 0);
-
-	mbmatchhalf--;
-    }
-
-    ch_len = parse_mbchar(ch, NULL, NULL);
-    wanted_ch_len = parse_mbchar(wanted_ch, NULL, NULL);
-
-    /* Fill bracket_set in with the values of ch and wanted_ch. */
-    bracket_set = charalloc((mb_cur_max() * 2) + 1);
-    strncpy(bracket_set, ch, ch_len);
-    strncpy(bracket_set + ch_len, wanted_ch, wanted_ch_len);
-    null_at(&bracket_set, ch_len + wanted_ch_len);
-
-    found_ch = charalloc(mb_cur_max() + 1);
-
-    while (TRUE) {
-	if (find_statusbar_bracket_match(reverse, bracket_set)) {
-	    /* If we found an identical bracket, increment count.  If we
-	     * found a complementary bracket, decrement it. */
-	    parse_mbchar(answer + statusbar_x, found_ch, NULL);
-	    count += (strncmp(found_ch, ch, ch_len) == 0) ? 1 : -1;
-
-	    /* If count is zero, we've found a matching bracket.  Update
-	     * the statusbar prompt and get out. */
-	    if (count == 0) {
-		if (need_statusbar_horizontal_update(pww_save))
-		    update_statusbar_line(answer, statusbar_x);
-		break;
-	    }
-	} else {
-	    /* We didn't find either an opening or closing bracket.
-	     * Restore where we were, and get out. */
-	    statusbar_x = statusbar_x_save;
-	    statusbar_pww = pww_save;
-	    break;
-	}
-    }
-
-    /* Clean up. */
-    free(bracket_set);
-    free(found_ch);
-}
-#endif /* !NANO_TINY */
 
 /* Return the placewewant associated with statusbar_x, i.e. the
  * zero-based column position of the cursor.  The value will be no
@@ -854,7 +676,9 @@ void update_statusbar_line(const char *curranswer, size_t index)
     index = strnlenpt(curranswer, index);
     page_start = get_statusbar_page_start(start_col, start_col + index);
 
-    wattron(bottomwin, reverse_attr);
+    if (interface_color_pair[TITLE_BAR].bright)
+	wattron(bottomwin, A_BOLD);
+    wattron(bottomwin, interface_color_pair[TITLE_BAR].pairnum);
 
     blank_statusbar();
 
@@ -867,7 +691,8 @@ void update_statusbar_line(const char *curranswer, size_t index)
     waddstr(bottomwin, expanded);
     free(expanded);
 
-    wattroff(bottomwin, reverse_attr);
+    wattroff(bottomwin, A_BOLD);
+    wattroff(bottomwin, interface_color_pair[TITLE_BAR].pairnum);
     statusbar_pww = statusbar_xplustabs();
     reset_statusbar_cursor();
     wnoutrefresh(bottomwin);
@@ -894,30 +719,26 @@ void total_statusbar_refresh(void (*refresh_func)(void))
 
 /* Get a string of input at the statusbar prompt.  This should only be
  * called from do_prompt(). */
-const sc *get_prompt_string(int *actual, bool allow_tabs,
+functionptrtype get_prompt_string(int *actual, bool allow_tabs,
 #ifndef DISABLE_TABCOMP
 	bool allow_files,
+	bool *list,
 #endif
 	const char *curranswer,
-	bool *meta_key, bool *func_key,
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
 	filestruct **history_list,
 #endif
-	void (*refresh_func)(void), int menu
-#ifndef DISABLE_TABCOMP
-	, bool *list
-#endif
-	)
+	void (*refresh_func)(void))
 {
     int kbinput = ERR;
-    bool have_shortcut, ran_func, finished;
+    bool ran_func, finished;
     size_t curranswer_len;
-    const sc *s;
+    functionptrtype func;
 #ifndef DISABLE_TABCOMP
     bool tabbed = FALSE;
 	/* Whether we've pressed Tab. */
 #endif
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
     char *history = NULL;
 	/* The current history string. */
     char *magichistory = NULL;
@@ -930,7 +751,7 @@ const sc *get_prompt_string(int *actual, bool allow_tabs,
 	/* The length of the original string that we're trying to
 	 * tab complete, if any. */
 #endif
-#endif /* !NANO_TINY */
+#endif /* !DISABLE_HISTORIES */
 
     answer = mallocstrcpy(answer, curranswer);
     curranswer_len = strlen(answer);
@@ -953,10 +774,8 @@ const sc *get_prompt_string(int *actual, bool allow_tabs,
 	statusbar_pww = statusbar_xplustabs();
     }
 
-    currmenu = menu;
-
 #ifdef DEBUG
-fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answer, (unsigned long) statusbar_x);
+    fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answer, (unsigned long) statusbar_x);
 #endif
 
     update_statusbar_line(answer, statusbar_x);
@@ -971,124 +790,108 @@ fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answe
      * allow writing to files not specified on the command line.  In
      * this case, disable all keys that would change the text if the
      * filename isn't blank and we're at the "Write File" prompt. */
-    while (1) {
-	kbinput = do_statusbar_input(meta_key, func_key, &have_shortcut,
-	    &ran_func, &finished, TRUE, refresh_func);
+    while (TRUE) {
+	kbinput = do_statusbar_input(&ran_func, &finished, refresh_func);
 	assert(statusbar_x <= strlen(answer));
 
-	s = get_shortcut(currmenu, &kbinput, meta_key, func_key);
+	func = func_from_key(&kbinput);
 
-	if (s)
-	    if (s->scfunc ==  CANCEL_MSG || s->scfunc == DO_ENTER)
-		break;
+	if (func == do_cancel || func == do_enter_void)
+	    break;
 
 #ifndef DISABLE_TABCOMP
-	if (s && s->scfunc != DO_TAB)
+	if (func != do_tab)
 	    tabbed = FALSE;
-#endif
 
-#ifndef DISABLE_TABCOMP
-#ifndef NANO_TINY
-	if (s && s->scfunc == DO_TAB) {
-		if (history_list != NULL) {
-		    if (last_kbinput != sc_seq_or(DO_TAB, NANO_CONTROL_I))
-			complete_len = strlen(answer);
+	if (func == do_tab) {
+#ifndef DISABLE_HISTORIES
+	    if (history_list != NULL) {
+		if (last_kbinput != sc_seq_or(do_tab, NANO_CONTROL_I))
+		    complete_len = strlen(answer);
 
-		    if (complete_len > 0) {
-			answer = mallocstrcpy(answer,
+		if (complete_len > 0) {
+		    answer = mallocstrcpy(answer,
 				get_history_completion(history_list,
-				answer, complete_len));
-			statusbar_x = strlen(answer);
-		    }
-		} else
-#endif /* !NANO_TINY */
-		if (allow_tabs)
-		    answer = input_tab(answer, allow_files,
-			&statusbar_x, &tabbed, refresh_func, list);
+					answer, complete_len));
+		    statusbar_x = strlen(answer);
+		}
+	    } else
+#endif
+	    if (allow_tabs)
+		answer = input_tab(answer, allow_files, &statusbar_x,
+				   &tabbed, refresh_func, list);
 
-		update_statusbar_line(answer, statusbar_x);
-	} else 
+	    update_statusbar_line(answer, statusbar_x);
+	} else
 #endif /* !DISABLE_TABCOMP */
-#ifndef NANO_TINY
-	if (s && s->scfunc ==  PREV_HISTORY_MSG) {
-		if (history_list != NULL) {
-		    /* If we're scrolling up at the bottom of the
-		     * history list and answer isn't blank, save answer
-		     * in magichistory. */
-		    if ((*history_list)->next == NULL &&
-			answer[0] != '\0')
-			magichistory = mallocstrcpy(magichistory,
-				answer);
-
-		    /* Get the older search from the history list and
-		     * save it in answer.  If there is no older search,
-		     * don't do anything. */
-		    if ((history =
-			get_history_older(history_list)) != NULL) {
-			answer = mallocstrcpy(answer, history);
-			statusbar_x = strlen(answer);
-		    }
+#ifndef DISABLE_HISTORIES
+	if (func == get_history_older_void) {
+	    if (history_list != NULL) {
+		/* If we're scrolling up at the bottom of the history list
+		 * and answer isn't blank, save answer in magichistory. */
+		if ((*history_list)->next == NULL && answer[0] != '\0')
+		    magichistory = mallocstrcpy(magichistory, answer);
+
+		/* Get the older search from the history list and save it in
+		 * answer.  If there is no older search, don't do anything. */
+		if ((history = get_history_older(history_list)) != NULL) {
+		    answer = mallocstrcpy(answer, history);
+		    statusbar_x = strlen(answer);
+		}
 
-		    update_statusbar_line(answer, statusbar_x);
+		update_statusbar_line(answer, statusbar_x);
 
-		    /* This key has a shortcut list entry when it's used
-		     * to move to an older search, which means that
-		     * finished has been set to TRUE.  Set it back to
-		     * FALSE here, so that we aren't kicked out of the
-		     * statusbar prompt. */
-		    finished = FALSE;
+		/* This key has a shortcut-list entry when it's used to
+		 * move to an older search, which means that finished has
+		 * been set to TRUE.  Set it back to FALSE here, so that
+		 * we aren't kicked out of the statusbar prompt. */
+		finished = FALSE;
+	    }
+	} else if (func == get_history_newer_void) {
+	    if (history_list != NULL) {
+		/* Get the newer search from the history list and save it in
+		 * answer.  If there is no newer search, don't do anything. */
+		if ((history = get_history_newer(history_list)) != NULL) {
+		    answer = mallocstrcpy(answer, history);
+		    statusbar_x = strlen(answer);
 		}
-	} else if (s && s->scfunc ==  NEXT_HISTORY_MSG) {
-		if (history_list != NULL) {
-		    /* Get the newer search from the history list and
-		     * save it in answer.  If there is no newer search,
-		     * don't do anything. */
-		    if ((history =
-			get_history_newer(history_list)) != NULL) {
-			answer = mallocstrcpy(answer, history);
-			statusbar_x = strlen(answer);
-		    }
 
-		    /* If, after scrolling down, we're at the bottom of
-		     * the history list, answer is blank, and
-		     * magichistory is set, save magichistory in
-		     * answer. */
-		    if ((*history_list)->next == NULL &&
-			*answer == '\0' && magichistory != NULL) {
+		/* If, after scrolling down, we're at the bottom of the
+		 * history list, answer is blank, and magichistory is set,
+		 * save magichistory in answer. */
+		if ((*history_list)->next == NULL &&
+		    *answer == '\0' && magichistory != NULL) {
 			answer = mallocstrcpy(answer, magichistory);
 			statusbar_x = strlen(answer);
 		    }
 
-		    update_statusbar_line(answer, statusbar_x);
-
-		    /* This key has a shortcut list entry when it's used
-		     * to move to a newer search, which means that
-		     * finished has been set to TRUE.  Set it back to
-		     * FALSE here, so that we aren't kicked out of the
-		     * statusbar prompt. */
-		    finished = FALSE;
-		}
-	} else
-#endif /* !NANO_TINY */
-	if (s && s->scfunc == DO_HELP_VOID) {
 		update_statusbar_line(answer, statusbar_x);
 
-		/* This key has a shortcut list entry when it's used to
-		 * go to the help browser or display a message
-		 * indicating that help is disabled, which means that
-		 * finished has been set to TRUE.  Set it back to FALSE
-		 * here, so that we aren't kicked out of the statusbar
-		 * prompt. */
+		/* This key has a shortcut-list entry when it's used to
+		 * move to a newer search, which means that finished has
+		 * been set to TRUE.  Set it back to FALSE here, so that
+		 * we aren't kicked out of the statusbar prompt. */
 		finished = FALSE;
+	    }
+	} else
+#endif /* !DISABLE_HISTORIES */
+	if (func == do_help_void) {
+	    update_statusbar_line(answer, statusbar_x);
+
+	    /* This key has a shortcut-list entry when it's used to go to
+	     * the help browser or display a message indicating that help
+	     * is disabled, which means that finished has been set to TRUE.
+	     * Set it back to FALSE here, so that we aren't kicked out of
+	     * the statusbar prompt. */
+	    finished = FALSE;
 	}
 
-	/* If we have a shortcut with an associated function, break out
-	 * if we're finished after running or trying to run the
-	 * function. */
+	/* If we have a shortcut with an associated function, break out if
+	 * we're finished after running or trying to run the function. */
 	if (finished)
 	    break;
 
-#if !defined(NANO_TINY) && !defined(DISABLE_TABCOMP)
+#if !defined(DISABLE_HISTORIES) && !defined(DISABLE_TABCOMP)
 	last_kbinput = kbinput;
 #endif
 
@@ -1096,10 +899,9 @@ fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answe
 	wnoutrefresh(bottomwin);
     }
 
-
-#ifndef NANO_TINY
-    /* Set the current position in the history list to the bottom and
-     * free magichistory, if we need to. */
+#ifndef DISABLE_HISTORIES
+    /* Set the current position in the history list to the bottom,
+     * and free magichistory if we need to. */
     if (history_list != NULL) {
 	history_reset(*history_list);
 
@@ -1108,14 +910,12 @@ fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answe
     }
 #endif
 
-
     /* We've finished putting in an answer or run a normal shortcut's
      * associated function, so reset statusbar_x and statusbar_pww.  If
      * we've finished putting in an answer, reset the statusbar cursor
      * position too. */
-    if (s) {
-	if (s->scfunc ==  CANCEL_MSG || s->scfunc == DO_ENTER ||
-	ran_func) {
+    if (func) {
+	if (func == do_cancel || func == do_enter_void || ran_func) {
 	    statusbar_x = old_statusbar_x;
 	    statusbar_pww = old_pww;
 
@@ -1129,7 +929,8 @@ fprintf(stderr, "get_prompt_string: answer = \"%s\", statusbar_x = %lu\n", answe
     }
 
     *actual = kbinput;
-    return s;
+
+    return func;
 }
 
 /* Ask a question on the statusbar.  The prompt will be stored in the
@@ -1149,15 +950,14 @@ int do_prompt(bool allow_tabs,
 	bool allow_files,
 #endif
 	int menu, const char *curranswer,
-	bool *meta_key, bool *func_key,
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
 	filestruct **history_list,
 #endif
 	void (*refresh_func)(void), const char *msg, ...)
 {
     va_list ap;
     int retval;
-    const sc *s;
+    functionptrtype func;
 #ifndef DISABLE_TABCOMP
     bool list = FALSE;
 #endif
@@ -1169,6 +969,7 @@ int do_prompt(bool allow_tabs,
 
     prompt = charalloc(((COLS - 4) * mb_cur_max()) + 1);
 
+    currmenu = menu;
     bottombars(menu);
 
     va_start(ap, msg);
@@ -1176,20 +977,16 @@ int do_prompt(bool allow_tabs,
     va_end(ap);
     null_at(&prompt, actual_x(prompt, COLS - 4));
 
-    s = get_prompt_string(&retval, allow_tabs,
+    func = get_prompt_string(&retval, allow_tabs,
 #ifndef DISABLE_TABCOMP
 	allow_files,
+	&list,
 #endif
 	curranswer,
-	meta_key, func_key,
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
 	history_list,
 #endif
-	refresh_func, menu
-#ifndef DISABLE_TABCOMP
-	, &list
-#endif
-	);
+	refresh_func);
 
     free(prompt);
     prompt = NULL;
@@ -1201,9 +998,9 @@ int do_prompt(bool allow_tabs,
 
     /* If we left the prompt via Cancel or Enter, set the return value
      * properly. */
-    if (s && s->scfunc ==  CANCEL_MSG)
+    if (func == do_cancel)
 	retval = -1;
-    else if (s && s->scfunc == DO_ENTER)
+    else if (func == do_enter_void)
 	retval = (*answer == '\0') ? -2 : 0;
 
     blank_statusbar();
@@ -1244,7 +1041,6 @@ int do_yesno_prompt(bool all, const char *msg)
     const char *yesstr;		/* String of Yes characters accepted. */
     const char *nostr;		/* Same for No. */
     const char *allstr;		/* And All, surprise! */
-    const sc *s;
     int oldmenu = currmenu;
 
     assert(msg != NULL);
@@ -1288,12 +1084,15 @@ int do_yesno_prompt(bool all, const char *msg)
 	onekey("^C", _("Cancel"), width);
     }
 
-    wattron(bottomwin, reverse_attr);
+    if (interface_color_pair[TITLE_BAR].bright)
+	wattron(bottomwin, A_BOLD);
+    wattron(bottomwin, interface_color_pair[TITLE_BAR].pairnum);
 
     blank_statusbar();
     mvwaddnstr(bottomwin, 0, 0, msg, actual_x(msg, COLS - 1));
 
-     wattroff(bottomwin, reverse_attr);
+    wattroff(bottomwin, A_BOLD);
+    wattroff(bottomwin, interface_color_pair[TITLE_BAR].pairnum);
 
     /* Refresh the edit window and the statusbar before getting
      * input. */
@@ -1302,16 +1101,16 @@ int do_yesno_prompt(bool all, const char *msg)
 
     do {
 	int kbinput;
-	bool meta_key, func_key;
+	functionptrtype func;
 #ifndef DISABLE_MOUSE
 	int mouse_x, mouse_y;
 #endif
 
 	currmenu = MYESNO;
-	kbinput = get_kbinput(bottomwin, &meta_key, &func_key);
-	s = get_shortcut(currmenu, &kbinput, &meta_key, &func_key);
+	kbinput = get_kbinput(bottomwin);
+	func = func_from_key(&kbinput);
 
-	if (s && s->scfunc ==  CANCEL_MSG)
+	if (func == do_cancel)
 	    ok = -1;
 #ifndef DISABLE_MOUSE
 	else if (kbinput == KEY_MOUSE) {
@@ -1343,7 +1142,7 @@ int do_yesno_prompt(bool all, const char *msg)
 		}
 	}
 #endif /* !DISABLE_MOUSE */
-	else if  (s && s->scfunc == TOTAL_REFRESH) {
+	else if (func == total_refresh) {
 	    total_redraw();
 	    continue;
 	} else {
diff --git a/src/proto.h b/src/proto.h
index e05eefe..aa79c56 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -1,9 +1,9 @@
-/* $Id: proto.h 4460 2009-12-09 16:51:43Z astyanax $ */
+/* $Id: proto.h 5133 2015-03-08 12:10:52Z bens $ */
 /**************************************************************************
  *   proto.h                                                              *
  *                                                                        *
  *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009 Free Software Foundation, Inc.                            *
+ *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -30,9 +30,11 @@
 #ifndef NANO_TINY
 extern sigjmp_buf jump_buf;
 extern bool jump_buf_main;
-extern bool use_undo;
 #endif
 
+extern bool meta_key;
+extern bool func_key;
+
 #ifndef DISABLE_WRAPJUSTIFY
 extern ssize_t fill;
 extern ssize_t wrap_at;
@@ -60,13 +62,16 @@ extern openfilestruct *openfile;
 extern char *matchbrackets;
 #endif
 
-#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
+#if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
 extern char *whitespace;
 extern int whitespace_len[2];
-extern undo_type last_action;
 #endif
 
+extern const char *exit_tag;
+extern const char *close_tag;
+extern const char *uncut_tag;
 #ifndef DISABLE_JUSTIFY
+extern const char *unjust_tag;
 extern char *punct;
 extern char *brackets;
 extern char *quotestr;
@@ -77,7 +82,8 @@ extern char *quoteerr;
 #else
 extern size_t quotelen;
 #endif
-#endif
+#endif /* !DISABLE_JUSTIFY */
+
 extern bool nodelay_mode;
 extern char *answer;
 
@@ -85,6 +91,8 @@ extern ssize_t tabsize;
 
 #ifndef NANO_TINY
 extern char *backup_dir;
+extern const char *locking_prefix;
+extern const char *locking_suffix;
 #endif
 #ifndef DISABLE_OPERATINGDIR
 extern char *operating_dir;
@@ -95,24 +103,27 @@ extern char *full_operating_dir;
 extern char *alt_speller;
 #endif
 
-extern sc *sclist;
-extern subnfunc *allfuncs;
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 extern syntaxtype *syntaxes;
 extern char *syntaxstr;
 #endif
 
 extern bool edit_refresh_needed;
-extern const shortcut *currshortcut;
+
 extern int currmenu;
+extern sc *sclist;
+extern subnfunc *allfuncs;
+extern subnfunc *exitfunc;
+extern subnfunc *uncutfunc;
 
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
 extern filestruct *search_history;
 extern filestruct *searchage;
 extern filestruct *searchbot;
 extern filestruct *replace_history;
 extern filestruct *replaceage;
 extern filestruct *replacebot;
+extern poshiststruct *poshistory;
 #endif
 
 #ifdef HAVE_REGEX_H
@@ -120,16 +131,22 @@ extern regex_t search_regexp;
 extern regmatch_t regmatches[10];
 #endif
 
-extern int reverse_attr;
+extern int hilite_attribute;
+#ifndef DISABLE_COLOR
+extern char* specified_color_combo[NUMBER_OF_ELEMENTS];
+#endif
+extern color_pair interface_color_pair[NUMBER_OF_ELEMENTS];
 
 extern char *homedir;
 
+typedef void (*functionptrtype)(void);
+
 /* All functions in browser.c. */
 #ifndef DISABLE_BROWSER
 char *do_browser(char *path, DIR *dir);
 char *do_browse_from(const char *inpath);
 void browser_init(const char *path, DIR *dir);
-void parse_browser_input(int *kbinput, bool *meta_key, bool *func_key);
+functionptrtype parse_browser_input(int *kbinput);
 void browser_refresh(void);
 bool browser_select_filename(const char *needle);
 int filesearch_init(void);
@@ -148,6 +165,7 @@ char *striponedir(const char *path);
 void utf8_init(void);
 bool using_utf8(void);
 #endif
+char *addstrings(char* str1, size_t len1, char* str2, size_t len2);
 #ifndef HAVE_ISBLANK
 bool nisblank(int c);
 #endif
@@ -214,19 +232,19 @@ char *revstrpbrk(const char *s, const char *accept, const char
 char *mbrevstrpbrk(const char *s, const char *accept, const char
 	*rev_start);
 #endif
-#if defined(ENABLE_NANORC) && (!defined(NANO_TINY) || !defined(DISABLE_JUSTIFY))
+#if !defined(DISABLE_NANORC) && (!defined(NANO_TINY) || !defined(DISABLE_JUSTIFY))
 bool has_blank_chars(const char *s);
 bool has_blank_mbchars(const char *s);
 #endif
 #ifdef ENABLE_UTF8
 bool is_valid_unicode(wchar_t wc);
 #endif
-#ifdef ENABLE_NANORC
+#ifndef DISABLE_NANORC
 bool is_valid_mbstring(const char *s);
 #endif
 
 /* All functions in color.c. */
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 void set_colorpairs(void);
 void color_init(void);
 void color_update(void);
@@ -234,6 +252,7 @@ void color_update(void);
 
 /* All functions in cut.c. */
 void cutbuffer_reset(void);
+bool keeping_cutbuffer(void);
 void cut_line(void);
 #ifndef NANO_TINY
 void cut_marked(void);
@@ -242,7 +261,7 @@ void cut_to_eof(void);
 #endif
 void do_cut_text(
 #ifndef NANO_TINY
-	bool copy_text, bool cut_till_end, bool undoing
+	bool copy_text, bool cut_till_eof, bool undoing
 #else
 	void
 #endif
@@ -250,7 +269,7 @@ void do_cut_text(
 void do_cut_text_void(void);
 #ifndef NANO_TINY
 void do_copy_text(void);
-void do_cut_till_end(void);
+void do_cut_till_eof(void);
 #endif
 void do_uncut_text(void);
 
@@ -263,16 +282,16 @@ void open_buffer(const char *filename, bool undoable);
 void replace_buffer(const char *filename);
 #endif
 void display_buffer(void);
-#ifdef ENABLE_MULTIBUFFER
-void switch_to_prevnext_buffer(bool next);
+#ifndef DISABLE_MULTIBUFFER
+void switch_to_prevnext_buffer(bool next, bool quiet);
 void switch_to_prev_buffer_void(void);
 void switch_to_next_buffer_void(void);
-bool close_buffer(void);
+bool close_buffer(bool quiet);
 #endif
 filestruct *read_line(char *buf, filestruct *prevnode, bool
 	*first_line_ins, size_t buf_len);
 void read_file(FILE *f, int fd, const char *filename, bool undoable, bool checkwritable);
-int open_file(const char *filename, bool newfie, FILE **f);
+int open_file(const char *filename, bool newfie, bool quiet, FILE **f);
 char *get_next_filename(const char *name, const char *suffix);
 void do_insertfile(
 #ifndef NANO_TINY
@@ -291,6 +310,8 @@ bool check_operating_dir(const char *currpath, bool allow_tabcomp);
 #endif
 #ifndef NANO_TINY
 void init_backup_dir(void);
+int delete_lockfile(const char *lockfilename);
+int write_lockfile(const char *lockfilename, const char *origfilename, bool modified);
 #endif
 int copy_file(FILE *inn, FILE *out);
 bool write_file(const char *name, FILE *f_open, bool tmp, append_type
@@ -316,46 +337,47 @@ char *input_tab(char *buf, bool allow_files, size_t *place, bool
 	*lastwastab, void (*refresh_func)(void), bool *list);
 #endif
 const char *tail(const char *foo);
-#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
+#ifndef DISABLE_HISTORIES
 char *histfilename(void);
 void load_history(void);
 bool writehist(FILE *hist, filestruct *histhead);
 void save_history(void);
+int check_dotnano(void);
+void load_poshistory(void);
+void save_poshistory(void);
+void update_poshistory(char *filename, ssize_t lineno, ssize_t xpos);
+int check_poshistory(const char *file, ssize_t *line, ssize_t *column);
 #endif
 
-/* All functions in global.c. */
+/* Some functions in global.c. */
 size_t length_of_list(int menu);
-#ifndef NANO_TINY
-void toggle_init_one(int val
-#ifndef DISABLE_HELP
-	, const char *desc, bool blank_after
-#endif
-	, long flag);
-void toggle_init(void);
-#endif
-void sc_init_one(shortcut **shortcutage, int ctrlval, const char *desc
-#ifndef DISABLE_HELP
-	, const char *help, bool blank_after
+key_type strtokeytype(const char *str);
+const sc *first_sc_for(int menu, void (*func)(void));
+int sc_seq_or(void (*func)(void), int defaultval);
+functionptrtype func_from_key(int *kbinput);
+void assign_keyinfo(sc *s);
+void print_sclist(void);
+void shortcut_init(void);
+#ifndef DISABLE_COLOR
+void set_lint_or_format_shortcuts(void);
+void set_spell_shortcuts(void);
 #endif
-	, int metaval, int funcval, int miscval, bool view, void
-	(*func)(void));
-void shortcut_init(bool unjustify);
-void free_shortcutage(shortcut **shortcutage);
+const subnfunc *sctofunc(sc *s);
+const char *flagtostr(int flag);
+sc *strtosc(char *input);
+int strtomenu(char *input);
 #ifdef DEBUG
 void thanks_for_all_the_fish(void);
 #endif
 
 /* All functions in help.c. */
-#ifndef DISABLE_BROWSER
-void do_browser_help(void);
-#endif
-void do_help_void(void);
 #ifndef DISABLE_HELP
 void do_help(void (*refresh_func)(void));
 void help_init(void);
-void parse_help_input(int *kbinput, bool *meta_key, bool *func_key);
+functionptrtype parse_help_input(int *kbinput);
 size_t help_line_len(const char *ptr);
 #endif
+void do_help_void(void);
 
 /* All functions in move.c. */
 void do_first_line(void);
@@ -416,7 +438,7 @@ partition *partition_filestruct(filestruct *top, size_t top_x,
 void unpartition_filestruct(partition **p);
 void move_to_filestruct(filestruct **file_top, filestruct **file_bot,
 	filestruct *top, size_t top_x, filestruct *bot, size_t bot_x);
-void copy_from_filestruct(filestruct *file_top, filestruct *file_bot);
+void copy_from_filestruct(filestruct *somebuffer);
 openfilestruct *make_new_opennode(void);
 void splice_opennode(openfilestruct *begin, openfilestruct *newnode,
 	openfilestruct *end);
@@ -446,7 +468,7 @@ void print_opt_full(const char *shortflag
 	, const char *desc);
 void usage(void);
 void version(void);
-int no_more_space(void);
+int more_space(void);
 int no_help(void);
 void nano_disabled_msg(void);
 void do_exit(void);
@@ -457,10 +479,9 @@ RETSIGTYPE do_continue(int signal);
 #ifndef NANO_TINY
 RETSIGTYPE handle_sigwinch(int signal);
 void allow_pending_sigwinch(bool allow);
-#endif
-#ifndef NANO_TINY
 void do_toggle(int flag);
 #endif
+void do_toggle_void(void);
 void disable_extended_io(void);
 #ifdef USE_SLANG
 void disable_signals(void);
@@ -471,17 +492,15 @@ void enable_signals(void);
 void disable_flow_control(void);
 void enable_flow_control(void);
 void terminal_init(void);
-int do_input(bool *meta_key, bool *func_key, bool *have_shortcut, bool
-	*ran_func, bool *finished, bool allow_funcs);
+int do_input(bool allow_funcs);
 #ifndef DISABLE_MOUSE
 int do_mouse(void);
 #endif
 void do_output(char *output, size_t output_len, bool allow_cntrls);
 
 /* All functions in prompt.c. */
-int do_statusbar_input(bool *meta_key, bool *func_key, bool *have_shortcut,
-	bool *ran_func, bool *finished, bool allow_funcs, void
-	(*refresh_func)(void));
+int do_statusbar_input(bool *ran_func, bool *finished,
+	void (*refresh_func)(void));
 #ifndef DISABLE_MOUSE
 int do_statusbar_mouse(void);
 #endif
@@ -499,66 +518,59 @@ bool do_statusbar_next_word(bool allow_punct);
 bool do_statusbar_prev_word(bool allow_punct);
 #endif
 void do_statusbar_verbatim_input(bool *got_enter);
-#ifndef NANO_TINY
-bool find_statusbar_bracket_match(bool reverse, const char
-	*bracket_set);
-void do_statusbar_find_bracket(void);
-#endif
 size_t statusbar_xplustabs(void);
 size_t get_statusbar_page_start(size_t start_col, size_t column);
 void reset_statusbar_cursor(void);
 void update_statusbar_line(const char *curranswer, size_t index);
 bool need_statusbar_horizontal_update(size_t pww_save);
 void total_statusbar_refresh(void (*refresh_func)(void));
-const sc *get_prompt_string(int *value, bool allow_tabs,
+functionptrtype get_prompt_string(int *value, bool allow_tabs,
 #ifndef DISABLE_TABCOMP
 	bool allow_files,
+	bool *list,
 #endif
 	const char *curranswer,
-	bool *meta_key, bool *func_key,
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
 	filestruct **history_list,
 #endif
-	void (*refresh_func)(void), int menu
-#ifndef DISABLE_TABCOMP
-	, bool *list
-#endif
-	);
+	void (*refresh_func)(void));
 int do_prompt(bool allow_tabs,
 #ifndef DISABLE_TABCOMP
 	bool allow_files,
 #endif
 	int menu, const char *curranswer,
-	bool *meta_key, bool *func_key,
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
 	filestruct **history_list,
 #endif
 	void (*refresh_func)(void), const char *msg, ...);
 void do_prompt_abort(void);
 int do_yesno_prompt(bool all, const char *msg);
 
-/* All functions in rcfile.c. */
-#ifdef ENABLE_NANORC
-void rcfile_error(const char *msg, ...);
+/* Most functions in rcfile.c. */
+#if !defined(DISABLE_NANORC) || !defined(DISABLE_HISTORIES)
 char *parse_next_word(char *ptr);
+#endif
+#ifndef DISABLE_NANORC
+void rcfile_error(const char *msg, ...);
 char *parse_argument(char *ptr);
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 char *parse_next_regex(char *ptr);
 bool nregcomp(const char *regex, int eflags);
 void parse_syntax(char *ptr);
 void parse_include(char *ptr);
 short color_to_short(const char *colorname, bool *bright);
 void parse_colors(char *ptr, bool icase);
+bool parse_color_names(char *combostr, short *fg, short *bg, bool *bright);
 void reset_multis(filestruct *fileptr, bool force);
 void alloc_multidata_if_needed(filestruct *fileptr);
 #endif
 void parse_rcfile(FILE *rcstream
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 	, bool syntax_only
 #endif
 	);
 void do_rcfile(void);
-#endif
+#endif /* !DISABLE_NANORC */
 
 /* All functions in search.c. */
 #ifdef HAVE_REGEX_H
@@ -577,7 +589,7 @@ bool findnextstr(
 	char *needle, size_t *needle_len);
 void findnextstr_wrap_reset(void);
 void do_search(void);
-#ifndef NANO_TINY
+#if !defined(NANO_TINY) || !defined(DISABLE_BROWSER)
 void do_research(void);
 #endif
 #ifdef HAVE_REGEX_H
@@ -598,12 +610,16 @@ void do_gotolinecolumn_void(void);
 void do_gotopos(ssize_t pos_line, size_t pos_x, ssize_t pos_y, size_t
 	pos_pww);
 #endif
+void goto_line_posx(ssize_t line, size_t pos_x);
 #ifndef NANO_TINY
 bool find_bracket_match(bool reverse, const char *bracket_set);
 void do_find_bracket(void);
-#ifdef ENABLE_NANORC
-bool history_has_changed(void);
+#ifndef DISABLE_TABCOMP
+char *get_history_completion(filestruct **h, const char *s, size_t len);
+#endif
 #endif
+#ifndef DISABLE_HISTORIES
+bool history_has_changed(void);
 void history_init(void);
 void history_reset(const filestruct *h);
 filestruct *find_history(const filestruct *h_start, const filestruct
@@ -611,9 +627,8 @@ filestruct *find_history(const filestruct *h_start, const filestruct
 void update_history(filestruct **h, const char *s);
 char *get_history_older(filestruct **h);
 char *get_history_newer(filestruct **h);
-#ifndef DISABLE_TABCOMP
-char *get_history_completion(filestruct **h, const char *s, size_t len);
-#endif
+void get_history_older_void(void);
+void get_history_newer_void(void);
 #endif
 
 /* All functions in text.c. */
@@ -631,13 +646,14 @@ void do_undo(void);
 void do_redo(void);
 #endif
 void do_enter(bool undoing);
+void do_enter_void(void);
 #ifndef NANO_TINY
 RETSIGTYPE cancel_command(int signal);
 bool execute_command(const char *command);
 #endif
 #ifndef DISABLE_WRAPPING
 void wrap_reset(void);
-bool do_wrap(filestruct *line, bool undoing);
+bool do_wrap(filestruct *line);
 #endif
 #if !defined(DISABLE_HELP) || !defined(DISABLE_WRAPJUSTIFY)
 ssize_t break_line(const char *line, ssize_t goal
@@ -670,6 +686,10 @@ const char *do_int_speller(const char *tempfile_name);
 const char *do_alt_speller(char *tempfile_name);
 void do_spell(void);
 #endif
+#ifndef DISABLE_COLOR
+void do_linter(void);
+void do_formatter(void);
+#endif
 #ifndef NANO_TINY
 void do_wordlinechar_count(void);
 #endif
@@ -684,7 +704,7 @@ void align(char **str);
 void null_at(char **data, size_t index);
 void unsunder(char *str, size_t true_len);
 void sunder(char *str);
-#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
+#if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
 #ifndef HAVE_GETLINE
 ssize_t ngetline(char **lineptr, size_t *n, FILE *stream);
 #endif
@@ -731,10 +751,10 @@ void dump_filestruct_reverse(void);
 void get_key_buffer(WINDOW *win);
 size_t get_key_buffer_len(void);
 void unget_input(int *input, size_t input_len);
-void unget_kbinput(int kbinput, bool meta_key, bool func_key);
+void unget_kbinput(int kbinput, bool metakey, bool funckey);
 int *get_input(WINDOW *win, size_t input_len);
-int get_kbinput(WINDOW *win, bool *meta_key, bool *func_key);
-int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key);
+int get_kbinput(WINDOW *win);
+int parse_kbinput(WINDOW *win);
 int get_escape_seq_kbinput(const int *seq, size_t seq_len);
 int get_escape_seq_abcd(int kbinput);
 int parse_escape_seq_kbinput(WINDOW *win, int kbinput);
@@ -750,9 +770,7 @@ int *parse_verbatim_kbinput(WINDOW *win, size_t *kbinput_len);
 #ifndef DISABLE_MOUSE
 int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts);
 #endif
-const sc *get_shortcut(int menu, int *kbinput, bool
-	*meta_key, bool *func_key);
-const sc *first_sc_for(int menu, short func);
+const sc *get_shortcut(int *kbinput);
 void blank_line(WINDOW *win, int y, int x, int n);
 void blank_titlebar(void);
 void blank_topbar(void);
@@ -763,7 +781,7 @@ void check_statusblank(void);
 char *display_string(const char *buf, size_t start_col, size_t len, bool
 	dollars);
 void titlebar(const char *path);
-void set_modified(void);
+extern void set_modified(void);
 void statusbar(const char *msg, ...);
 void bottombars(int menu);
 void onekey(const char *keystroke, const char *desc, size_t len);
@@ -783,53 +801,32 @@ void display_main_list(void);
 void do_cursorpos(bool constant);
 void do_cursorpos_void(void);
 void do_replace_highlight(bool highlight, const char *word);
-const char *flagtostr(int flag);
-const subnfunc *sctofunc(sc *s);
-const subnfunc *getfuncfromkey(WINDOW *win);
-void print_sclist(void);
-sc *strtosc(int menu, char *input);
-function_type strtokeytype(const char *str);
-int strtomenu(char *input);
-void assign_keyinfo(sc *s);
 void xon_complaint(void);
 void xoff_complaint(void);
-int sc_seq_or (short func, int defaultval);
 void do_suspend_void(void);
-
-extern const char *cancel_msg;
-#ifndef NANO_TINY
-extern const char *case_sens_msg;
-extern const char *backwards_msg;
-extern const char *prev_history_msg;
-extern const char *next_history_msg;
-#endif
-extern const char *replace_msg;
-extern const char *no_replace_msg;
-extern const char *go_to_line_msg;
-extern const char *whereis_next_msg;
-extern const char *first_file_msg;
-extern const char *last_file_msg;
-extern const char *goto_dir_msg;
-extern const char *ext_cmd_msg;
-extern const char *to_files_msg;
-extern const char *dos_format_msg;
-extern const char *mac_format_msg;
-extern const char *append_msg;
-extern const char *prepend_msg;
-extern const char *backup_file_msg;
-extern const char *gototext_msg;
-extern const char *new_buffer_msg;
-
-void iso_me_harder_funcmap(short func);
 void enable_nodelay(void);
 void disable_nodelay(void);
-
-#ifdef HAVE_REGEX_H
-extern const char *regexp_msg;
-#endif
-
-#ifdef NANO_EXTRA
+#ifndef DISABLE_EXTRA
 void do_credits(void);
 #endif
 
+/* May as well throw these here, since they are just placeholders. */
+void do_cancel(void);
+void do_page_up(void);
+void do_page_down(void);
+void case_sens_void(void);
+void regexp_void(void);
+void gototext_void(void);
+void to_files_void(void);
+void dos_format_void(void);
+void mac_format_void(void);
+void append_void(void);
+void prepend_void(void);
+void backup_file_void(void);
+void new_buffer_void(void);
+void backwards_void(void);
+void goto_dir_void(void);
+void flip_replace_void(void);
+void flip_execute_void(void);
+
 #endif /* !PROTO_H */
diff --git a/src/rcfile.c b/src/rcfile.c
index 5aff6d9..a60ea69 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -1,9 +1,9 @@
-/* $Id: rcfile.c 4508 2010-06-21 03:10:10Z astyanax $ */
+/* $Id: rcfile.c 5134 2015-03-08 15:42:52Z bens $ */
 /**************************************************************************
  *   rcfile.c                                                             *
  *                                                                        *
- *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009   *
- *   Free Software Foundation, Inc.                                       *
+ *   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,  *
+ *   2010, 2011, 2013, 2014 Free Software Foundation, Inc.                *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -23,6 +23,7 @@
 
 #include "proto.h"
 
+#include <glob.h>
 #include <stdarg.h>
 #include <string.h>
 #include <stdio.h>
@@ -30,7 +31,7 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#ifdef ENABLE_NANORC
+#ifndef DISABLE_NANORC
 
 static const rcoption rcopts[] = {
     {"boldtext", BOLD_TEXT},
@@ -41,10 +42,13 @@ static const rcoption rcopts[] = {
 #ifndef DISABLE_WRAPJUSTIFY
     {"fill", 0},
 #endif
+#ifndef NANO_TINY
+    {"locking", LOCKING},
+#endif
 #ifndef DISABLE_MOUSE
     {"mouse", USE_MOUSE},
 #endif
-#ifdef ENABLE_MULTIBUFFER
+#ifndef DISABLE_MULTIBUFFER
     {"multibuffer", MULTIBUFFER},
 #endif
     {"morespace", MORE_SPACE},
@@ -85,16 +89,22 @@ static const rcoption rcopts[] = {
     {"historylog", HISTORYLOG},
     {"matchbrackets", 0},
     {"noconvert", NO_CONVERT},
+    {"poslog", POS_HISTORY},
     {"quiet", QUIET},
     {"quickblank", QUICK_BLANK},
     {"smarthome", SMART_HOME},
     {"smooth", SMOOTH_SCROLL},
     {"tabstospaces", TABS_TO_SPACES},
-    {"undo", UNDOABLE},
     {"whitespace", 0},
     {"wordbounds", WORD_BOUNDS},
     {"softwrap", SOFTWRAP},
 #endif
+#ifndef DISABLE_COLOR
+    {"titlecolor", 0},
+    {"statuscolor", 0},
+    {"keycolor", 0},
+    {"functioncolor", 0},
+#endif
     {NULL, 0}
 };
 
@@ -104,14 +114,11 @@ static size_t lineno = 0;
 	/* If we did, the line number where the last error occurred. */
 static char *nanorc = NULL;
 	/* The path to the rcfile we're parsing. */
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 static syntaxtype *endsyntax = NULL;
 	/* The end of the list of syntaxes. */
-static exttype *endheader = NULL;
-	/* End of header list */
 static colortype *endcolor = NULL;
 	/* The end of the color list for the current syntax. */
-
 #endif
 
 /* We have an error in some part of the rcfile.  Print the error message
@@ -136,7 +143,9 @@ void rcfile_error(const char *msg, ...)
 
     fprintf(stderr, "\n");
 }
+#endif /* !DISABLE_NANORC */
 
+#if !defined(DISABLE_NANORC) || !defined(DISABLE_HISTORIES)
 /* Parse the next word from the string, null-terminate it, and return
  * a pointer to the first character after the null terminator.  The
  * returned pointer will point to '\0' if we hit the end of the line. */
@@ -156,7 +165,9 @@ char *parse_next_word(char *ptr)
 
     return ptr;
 }
+#endif /* !DISABLE_NANORC || !DISABLE_HISTORIES */
 
+#ifndef DISABLE_NANORC
 /* Parse an argument, with optional quotes, after a keyword that takes
  * one.  If the next word starts with a ", we say that it ends with the
  * last " of the line.  Otherwise, we interpret it as usual, so that the
@@ -193,7 +204,7 @@ char *parse_argument(char *ptr)
     return ptr;
 }
 
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 /* Parse the next regex string from the line at ptr, and return it. */
 char *parse_next_regex(char *ptr)
 {
@@ -248,8 +259,8 @@ bool nregcomp(const char *regex, int eflags)
 void parse_syntax(char *ptr)
 {
     const char *fileregptr = NULL, *nameptr = NULL;
-    syntaxtype *tmpsyntax;
-    exttype *endext = NULL;
+    syntaxtype *tmpsyntax, *prev_syntax;
+    regexlisttype *endext = NULL;
 	/* The end of the extensions list for this syntax. */
 
     assert(ptr != NULL);
@@ -275,15 +286,26 @@ void parse_syntax(char *ptr)
 
     /* Search for a duplicate syntax name.  If we find one, free it, so
      * that we always use the last syntax with a given name. */
+    prev_syntax = NULL;
     for (tmpsyntax = syntaxes; tmpsyntax != NULL;
 	tmpsyntax = tmpsyntax->next) {
 	if (strcmp(nameptr, tmpsyntax->desc) == 0) {
-	    syntaxtype *prev_syntax = tmpsyntax;
+	    syntaxtype *old_syntax = tmpsyntax;
+
+	    if (endsyntax == tmpsyntax)
+		endsyntax = prev_syntax;
 
 	    tmpsyntax = tmpsyntax->next;
-	    free(prev_syntax);
+	    if (prev_syntax != NULL)
+		prev_syntax->next = tmpsyntax;
+	    else
+		syntaxes = tmpsyntax;
+
+	    free(old_syntax->desc);
+	    free(old_syntax);
 	    break;
 	}
+	prev_syntax = tmpsyntax;
     }
 
     if (syntaxes == NULL) {
@@ -300,11 +322,13 @@ void parse_syntax(char *ptr)
     endsyntax->desc = mallocstrcpy(NULL, nameptr);
     endsyntax->color = NULL;
     endcolor = NULL;
-    endheader = NULL;
     endsyntax->extensions = NULL;
     endsyntax->headers = NULL;
+    endsyntax->magics = NULL;
     endsyntax->next = NULL;
     endsyntax->nmultis = 0;
+    endsyntax->linter = NULL;
+    endsyntax->formatter = NULL;
 
 #ifdef DEBUG
     fprintf(stderr, "Starting a new syntax type: \"%s\"\n", nameptr);
@@ -324,10 +348,9 @@ void parse_syntax(char *ptr)
 	return;
     }
 
-    /* Now load the extensions into their part of the struct. */
+    /* Now load the extension regexes into their part of the struct. */
     while (*ptr != '\0') {
-	exttype *newext;
-	    /* The new extension structure. */
+	regexlisttype *newext;
 
 	while (*ptr != '"' && *ptr != '\0')
 	    ptr++;
@@ -342,7 +365,7 @@ void parse_syntax(char *ptr)
 	if (ptr == NULL)
 	    break;
 
-	newext = (exttype *)nmalloc(sizeof(exttype));
+	newext = (regexlisttype *)nmalloc(sizeof(regexlisttype));
 
 	/* Save the extension regex if it's valid. */
 	if (nregcomp(fileregptr, REG_NOSUB)) {
@@ -359,29 +382,53 @@ void parse_syntax(char *ptr)
 	    free(newext);
     }
 }
+#endif /* !DISABLE_COLOR */
 
 int check_bad_binding(sc *s)
 {
 #define BADLISTLEN 1
-    int badtypes[BADLISTLEN] = {META};
+    key_type badtypes[BADLISTLEN] = {META};
     int badseqs[BADLISTLEN] = { 91 };
     int i;
 
     for (i = 0; i < BADLISTLEN; i++)
-        if (s->type == badtypes[i] && s->seq == badseqs[i])
+	if (s->type == badtypes[i] && s->seq == badseqs[i])
 	    return 1;
 
     return 0;
 }
 
-void parse_keybinding(char *ptr)
+/* Check whether the given executable function is "universal" (meaning
+ * any horizontal movement or deletion) and thus is present in almost
+ * all menus. */
+bool is_universal(void (*func))
+{
+    if (func == do_left || func == do_right ||
+	func == do_home || func == do_end ||
+#ifndef NANO_TINY
+	func == do_prev_word_void || func == do_next_word_void ||
+#endif
+	func == do_verbatim_input || func == do_cut_text_void ||
+	func == do_delete || func == do_backspace ||
+	func == do_tab || func == do_enter)
+	return TRUE;
+    else
+	return FALSE;
+}
+
+/* Bind or unbind a key combo, to or from a function. */
+void parse_binding(char *ptr, bool dobind)
 {
     char *keyptr = NULL, *keycopy = NULL, *funcptr = NULL, *menuptr = NULL;
-    sc *s, *newsc;
-    int i, menu;
+    sc *s, *newsc = NULL;
+    int menu;
 
     assert(ptr != NULL);
 
+#ifdef DEBUG
+    fprintf(stderr, "Starting the rebinding code...\n");
+#endif
+
     if (*ptr == '\0') {
 	rcfile_error(N_("Missing key name"));
 	return;
@@ -390,206 +437,206 @@ void parse_keybinding(char *ptr)
     keyptr = ptr;
     ptr = parse_next_word(ptr);
     keycopy = mallocstrcpy(NULL, keyptr);
-    for (i = 0; i < strlen(keycopy); i++)
-	keycopy[i] = toupper(keycopy[i]);
 
-    if (keycopy[0] != 'M' && keycopy[0] != '^' && keycopy[0] != 'F' && keycopy[0] != 'K') {
-	rcfile_error(
-		N_("keybindings must begin with \"^\", \"M\", or \"F\""));
+    if (strlen(keycopy) < 2) {
+	rcfile_error(N_("Key name is too short"));
 	return;
     }
 
-    funcptr = ptr;
-    ptr = parse_next_word(ptr);
-
-    if (!strcmp(funcptr, "")) {
-	rcfile_error(
-		N_("Must specify function to bind key to"));
-	return;
+    /* Uppercase only the first two or three characters of the key name. */
+    keycopy[0] = toupper(keycopy[0]);
+    keycopy[1] = toupper(keycopy[1]);
+    if (keycopy[0] == 'M' && keycopy[1] == '-') {
+	if (strlen(keycopy) > 2)
+	    keycopy[2] = toupper(keycopy[2]);
+	else {
+	    rcfile_error(N_("Key name is too short"));
+	    return;
+	}
     }
 
-    menuptr = ptr;
-    ptr = parse_next_word(ptr);
-
-    if (!strcmp(menuptr, "")) {
-	rcfile_error(
-		/* Note to translators, do not translate the word "all"
-		   in the sentence below, everything else is fine */
-		N_("Must specify menu to bind key to (or \"all\")"));
+    /* Allow the codes for Insert and Delete to be rebound, but apart
+     * from those two only Control, Meta and Function sequences. */
+    if (!strcasecmp(keycopy, "Ins") || !strcasecmp(keycopy, "Del"))
+	keycopy[1] = tolower(keycopy[1]);
+    else if (keycopy[0] != '^' && keycopy[0] != 'M' && keycopy[0] != 'F') {
+	rcfile_error(N_("Key name must begin with \"^\", \"M\", or \"F\""));
 	return;
     }
 
-    menu = strtomenu(menuptr);
-    newsc = strtosc(menu, funcptr);
-    if (newsc == NULL) {
-	rcfile_error(
-		N_("Could not map name \"%s\" to a function"), funcptr);
-	return;
-    }
+    if (dobind) {
+	funcptr = ptr;
+	ptr = parse_next_word(ptr);
 
-    if (menu < 1) {
-	rcfile_error(
-		N_("Could not map name \"%s\" to a menu"), menuptr);
-	return;
+	if (funcptr[0] == '\0') {
+	    rcfile_error(N_("Must specify a function to bind the key to"));
+	    return;
+	}
     }
 
+    menuptr = ptr;
+    ptr = parse_next_word(ptr);
 
-#ifdef DEBUG
-    fprintf(stderr, "newsc now address %d, menu func assigned = %d, menu = %d\n",
-	&newsc, newsc->scfunc, menu);
-#endif
-
-
-    newsc->keystr = keycopy;
-    newsc->menu = menu;
-    newsc->type = strtokeytype(newsc->keystr);
-    assign_keyinfo(newsc);
-#ifdef DEBUG
-    fprintf(stderr, "s->keystr = \"%s\"\n", newsc->keystr);
-    fprintf(stderr, "s->seq = \"%d\"\n", newsc->seq);
-#endif
-
-    if (check_bad_binding(newsc)) {
-	rcfile_error(
-		N_("Sorry, keystr \"%s\" is an illegal binding"), newsc->keystr);
+    if (menuptr[0] == '\0') {
+	/* TRANSLATORS: Do not translate the word "all". */
+	rcfile_error(N_("Must specify a menu (or \"all\") in which to bind/unbind the key"));
 	return;
     }
 
-    /* now let's have some fun.  Try and delete the other entries
-       we found for the same menu, then make this new new
-       beginning */
-    for (s = sclist; s != NULL; s = s->next) {
-        if (((s->menu & newsc->menu)) && s->seq == newsc->seq) {
-	    s->menu &= ~newsc->menu;
-#ifdef DEBUG
-	    fprintf(stderr, "replaced menu entry %d\n", s->menu);
-#endif
+    if (dobind) {
+	newsc = strtosc(funcptr);
+	if (newsc == NULL) {
+	    rcfile_error(N_("Cannot map name \"%s\" to a function"), funcptr);
+	    return;
 	}
     }
-    newsc->next = sclist;
-    sclist = newsc;
-}
-
-/* Let user unbind a sequence from a given (or all) menus */
-void parse_unbinding(char *ptr)
-{
-    char *keyptr = NULL, *keycopy = NULL, *menuptr = NULL;
-    sc *s;
-    int i, menu;
 
-    assert(ptr != NULL);
-
-    if (*ptr == '\0') {
-	rcfile_error(N_("Missing key name"));
+    menu = strtomenu(menuptr);
+    if (menu < 1) {
+	rcfile_error(N_("Cannot map name \"%s\" to a menu"), menuptr);
 	return;
     }
 
-    keyptr = ptr;
-    ptr = parse_next_word(ptr);
-    keycopy = mallocstrcpy(NULL, keyptr);
-    for (i = 0; i < strlen(keycopy); i++)
-	keycopy[i] = toupper(keycopy[i]);
-
 #ifdef DEBUG
-    fprintf(stderr, "Starting unbinding code");
+    if (dobind)
+	fprintf(stderr, "newsc address is now %ld, assigned func = %ld, menu = %x\n",
+	    (long)&newsc, (long)newsc->scfunc, menu);
+    else
+	fprintf(stderr, "unbinding \"%s\" from menu %x\n", keycopy, menu);
 #endif
 
-    if (keycopy[0] != 'M' && keycopy[0] != '^' && keycopy[0] != 'F' && keycopy[0] != 'K') {
-	rcfile_error(
-		N_("keybindings must begin with \"^\", \"M\", or \"F\""));
-	return;
-    }
+    if (dobind) {
+	subnfunc *f;
+	int mask = 0;
 
-    menuptr = ptr;
-    ptr = parse_next_word(ptr);
+	/* Tally up the menus where the function exists. */
+	for (f = allfuncs; f != NULL; f = f->next)
+	    if (f->scfunc == newsc->scfunc)
+		mask = mask | f->menus;
 
-    if (!strcmp(menuptr, "")) {
-	rcfile_error(
-		/* Note to translators, do not translate the word "all"
-		   in the sentence below, everything else is fine */
-		N_("Must specify menu to bind key to (or \"all\")"));
-	return;
-    }
+	/* Handle the special case of the toggles. */
+	if (newsc->scfunc == do_toggle_void)
+	    mask = MMAIN;
 
-    menu = strtomenu(menuptr);
-    if (menu < 1) {
-	rcfile_error(
-		N_("Could not map name \"%s\" to a menu"), menuptr);
-	return;
-    }
+	/* Now limit the given menu to those where the function exists. */
+	if (is_universal(newsc->scfunc))
+	    menu = menu & MMOST;
+	else
+	    menu = menu & mask;
 
+	if (!menu) {
+	    rcfile_error(N_("Function '%s' does not exist in menu '%s'"), funcptr, menuptr);
+	    free(newsc);
+	    return;
+	}
 
+	newsc->keystr = keycopy;
+	newsc->menu = menu;
+	newsc->type = strtokeytype(newsc->keystr);
+	assign_keyinfo(newsc);
 #ifdef DEBUG
-    fprintf(stderr, "unbinding \"%s\" from menu = %d\n", keycopy, menu);
+	fprintf(stderr, "s->keystr = \"%s\"\n", newsc->keystr);
+	fprintf(stderr, "s->seq = \"%d\"\n", newsc->seq);
 #endif
 
-    /* Now find the apropriate entries in the menu to delete */
+	if (check_bad_binding(newsc)) {
+	    rcfile_error(N_("Sorry, keystroke \"%s\" may not be rebound"), newsc->keystr);
+	    free(newsc);
+	    return;
+	}
+    }
+
+    /* Now find and delete any existing same shortcut in the menu(s). */
     for (s = sclist; s != NULL; s = s->next) {
-        if (((s->menu & menu)) && !strcmp(s->keystr,keycopy)) {
-	    s->menu &= ~menu;
+	if (((s->menu & menu)) && !strcmp(s->keystr, keycopy)) {
 #ifdef DEBUG
-	    fprintf(stderr, "deleted menu entry %d\n", s->menu);
+	    fprintf(stderr, "deleting entry from menu %x\n", s->menu);
 #endif
+	    s->menu &= ~menu;
 	}
     }
+
+    if (dobind) {
+	/* Add the new shortcut at the start of the list. */
+	newsc->next = sclist;
+	sclist = newsc;
+    }
 }
 
 
+#ifndef DISABLE_COLOR
 /* Read and parse additional syntax files. */
-void parse_include(char *ptr)
+static void _parse_include(char *file)
 {
     struct stat rcinfo;
     FILE *rcstream;
-    char *option, *nanorc_save = nanorc, *expanded;
-    size_t lineno_save = lineno;
 
-    option = ptr;
-    if (*option == '"')
-	option++;
-    ptr = parse_argument(ptr);
-
-    /* Can't get the specified file's full path cause it may screw up
-	our cwd depending on the parent dirs' permissions, (see Savannah bug 25297) */
+    /* Can't get the specified file's full path because it may screw up
+     * our cwd depending on the parent directories' permissions (see
+     * Savannah bug #25297). */
 
     /* Don't open directories, character files, or block files. */
-    if (stat(option, &rcinfo) != -1) {
+    if (stat(file, &rcinfo) != -1) {
 	if (S_ISDIR(rcinfo.st_mode) || S_ISCHR(rcinfo.st_mode) ||
 		S_ISBLK(rcinfo.st_mode)) {
 	    rcfile_error(S_ISDIR(rcinfo.st_mode) ?
 		_("\"%s\" is a directory") :
-		_("\"%s\" is a device file"), option);
+		_("\"%s\" is a device file"), file);
 	}
     }
 
-    expanded = real_dir_from_tilde(option);
-
     /* Open the new syntax file. */
-    if ((rcstream = fopen(expanded, "rb")) == NULL) {
-	rcfile_error(_("Error reading %s: %s"), expanded,
+    if ((rcstream = fopen(file, "rb")) == NULL) {
+	rcfile_error(_("Error reading %s: %s"), file,
 		strerror(errno));
 	return;
     }
 
     /* Use the name and line number position of the new syntax file
      * while parsing it, so we can know where any errors in it are. */
-    nanorc = expanded;
+    nanorc = file;
     lineno = 0;
 
 #ifdef DEBUG
-    fprintf(stderr, "Parsing file \"%s\" (expanded from \"%s\")\n", expanded, option);
+    fprintf(stderr, "Parsing file \"%s\"\n", file);
 #endif
 
     parse_rcfile(rcstream
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 	, TRUE
 #endif
 	);
+}
+
+void parse_include(char *ptr)
+{
+    char *option, *nanorc_save = nanorc, *expanded;
+    size_t lineno_save = lineno, i;
+    glob_t files;
+
+    option = ptr;
+    if (*option == '"')
+	option++;
+    ptr = parse_argument(ptr);
+
+    /* Expand tildes first, then the globs. */
+    expanded = real_dir_from_tilde(option);
+
+    if (glob(expanded, GLOB_ERR|GLOB_NOSORT, NULL, &files) == 0) {
+	for (i = 0; i < files.gl_pathc; ++i)
+	    _parse_include(files.gl_pathv[i]);
+    } else {
+	rcfile_error(_("Error expanding %s: %s"), option,
+		strerror(errno));
+    }
+
+    globfree(&files);
+    free(expanded);
 
     /* We're done with the new syntax file.  Restore the original
      * filename and line number position. */
     nanorc = nanorc_save;
     lineno = lineno_save;
-
 }
 
 /* Return the short value corresponding to the color named in colorname,
@@ -637,7 +684,7 @@ short color_to_short(const char *colorname, bool *bright)
 void parse_colors(char *ptr, bool icase)
 {
     short fg, bg;
-    bool bright = FALSE, no_fgcolor = FALSE;
+    bool bright = FALSE;
     char *fgstr;
 
     assert(ptr != NULL);
@@ -655,36 +702,8 @@ void parse_colors(char *ptr, bool icase)
 
     fgstr = ptr;
     ptr = parse_next_word(ptr);
-
-    if (strchr(fgstr, ',') != NULL) {
-	char *bgcolorname;
-
-	strtok(fgstr, ",");
-	bgcolorname = strtok(NULL, ",");
-	if (bgcolorname == NULL) {
-	    /* If we have a background color without a foreground color,
-	     * parse it properly. */
-	    bgcolorname = fgstr + 1;
-	    no_fgcolor = TRUE;
-	}
-	if (strncasecmp(bgcolorname, "bright", 6) == 0) {
-	    rcfile_error(
-		N_("Background color \"%s\" cannot be bright"),
-		bgcolorname);
-	    return;
-	}
-	bg = color_to_short(bgcolorname, &bright);
-    } else
-	bg = -1;
-
-    if (!no_fgcolor) {
-	fg = color_to_short(fgstr, &bright);
-
-	/* Don't try to parse screwed-up foreground colors. */
-	if (fg == -1)
-	    return;
-    } else
-	fg = -1;
+    if (!parse_color_names(fgstr, &fg, &bg, &bright))
+	return;
 
     if (*ptr == '\0') {
 	rcfile_error(N_("Missing regex string"));
@@ -695,7 +714,7 @@ void parse_colors(char *ptr, bool icase)
      * in the colorstrings array, woo! */
     while (ptr != NULL && *ptr != '\0') {
 	colortype *newcolor;
-	    /* The new color structure. */
+	    /* The container for a color plus its regexes. */
 	bool cancelled = FALSE;
 	    /* The start expression was bad. */
 	bool expectend = FALSE;
@@ -747,6 +766,10 @@ void parse_colors(char *ptr, bool icase)
 #ifdef DEBUG
 		fprintf(stderr, "Adding new entry for fg %hd, bg %hd\n", fg, bg);
 #endif
+		/* Need to recompute endcolor now so we can extend
+		 * colors to syntaxes. */
+		for (endcolor = endsyntax->color; endcolor->next != NULL; endcolor = endcolor->next)
+		    ;
 		endcolor->next = newcolor;
 	    }
 
@@ -776,8 +799,8 @@ void parse_colors(char *ptr, bool icase)
 	    if (ptr == NULL)
 		break;
 
-	    /* If the start regex was invalid, skip past the end regex to
-	     * stay in sync. */
+	    /* If the start regex was invalid, skip past the end regex
+	     * to stay in sync. */
 	    if (cancelled)
 		continue;
 
@@ -785,17 +808,55 @@ void parse_colors(char *ptr, bool icase)
 	    newcolor->end_regex = (nregcomp(fgstr, icase ? REG_ICASE :
 		0)) ? mallocstrcpy(NULL, fgstr) : NULL;
 
-	    /* Lame way to skip another static counter */
-            newcolor->id = endsyntax->nmultis;
-            endsyntax->nmultis++;
+	    /* Lame way to skip another static counter. */
+	    newcolor->id = endsyntax->nmultis;
+	    endsyntax->nmultis++;
 	}
     }
 }
 
-/* Parse the headers (1st line) of the file which may influence the regex used. */
-void parse_headers(char *ptr)
+/* Parse the color name, or pair of color names, in combostr. */
+bool parse_color_names(char *combostr, short *fg, short *bg, bool *bright)
 {
-    char *regstr;
+    bool no_fgcolor = FALSE;
+
+    if (combostr == NULL)
+	return FALSE;
+
+    if (strchr(combostr, ',') != NULL) {
+	char *bgcolorname;
+	strtok(combostr, ",");
+	bgcolorname = strtok(NULL, ",");
+	if (bgcolorname == NULL) {
+	    /* If we have a background color without a foreground color,
+	     * parse it properly. */
+	    bgcolorname = combostr + 1;
+	    no_fgcolor = TRUE;
+	}
+	if (strncasecmp(bgcolorname, "bright", 6) == 0) {
+	    rcfile_error(N_("Background color \"%s\" cannot be bright"), bgcolorname);
+	    return FALSE;
+	}
+	*bg = color_to_short(bgcolorname, bright);
+    } else
+	*bg = -1;
+
+    if (!no_fgcolor) {
+	*fg = color_to_short(combostr, bright);
+
+	/* Don't try to parse screwed-up foreground colors. */
+	if (*fg == -1)
+	    return FALSE;
+    } else
+	*fg = -1;
+
+    return TRUE;
+}
+
+/* Parse the header-line regexes that may influence the choice of syntax. */
+void parse_header_exp(char *ptr)
+{
+    regexlisttype *endheader = NULL;
 
     assert(ptr != NULL);
 
@@ -810,11 +871,9 @@ void parse_headers(char *ptr)
 	return;
     }
 
-    /* Now for the fun part.  Start adding regexes to individual strings
-     * in the colorstrings array, woo! */
-    while (ptr != NULL && *ptr != '\0') {
-	exttype *newheader;
-	    /* The new color structure. */
+    while (*ptr != '\0') {
+	const char *regexstring;
+	regexlisttype *newheader;
 
 	if (*ptr != '"') {
 	    rcfile_error(
@@ -825,60 +884,173 @@ void parse_headers(char *ptr)
 
 	ptr++;
 
-	regstr = ptr;
+	regexstring = ptr;
 	ptr = parse_next_regex(ptr);
 	if (ptr == NULL)
 	    break;
 
-	newheader = (exttype *)nmalloc(sizeof(exttype));
+	newheader = (regexlisttype *)nmalloc(sizeof(regexlisttype));
 
-	/* Save the regex string if it's valid */
-	if (nregcomp(regstr, 0)) {
-	    newheader->ext_regex = mallocstrcpy(NULL, regstr);
+	/* Save the regex string if it's valid. */
+	if (nregcomp(regexstring, 0)) {
+	    newheader->ext_regex = mallocstrcpy(NULL, regexstring);
 	    newheader->ext = NULL;
-	    newheader->next = NULL;
-
-#ifdef DEBUG
-	     fprintf(stderr, "Starting a new header entry: %s\n", newheader->ext_regex);
-#endif
 
-	    if (endheader == NULL) {
+	    if (endheader == NULL)
 		endsyntax->headers = newheader;
-	    } else {
+	    else
 		endheader->next = newheader;
-	    }
-
 	    endheader = newheader;
+	    endheader->next = NULL;
 	} else
 	    free(newheader);
+    }
+}
+
+#ifndef DISABLE_COLOR
+/* Parse the magic regexes that may influence the choice of syntax. */
+void parse_magic_exp(char *ptr)
+{
+#ifdef HAVE_LIBMAGIC
+    regexlisttype *endmagic = NULL;
 
+    assert(ptr != NULL);
+
+    if (syntaxes == NULL) {
+	rcfile_error(
+		N_("Cannot add a magic string regex without a syntax command"));
+	return;
+    }
+
+    if (*ptr == '\0') {
+	rcfile_error(N_("Missing magic string name"));
+	return;
     }
+
+    if (*ptr != '"') {
+	rcfile_error(
+		N_("Regex strings must begin and end with a \" character"));
+	return;
+    }
+
+#ifdef DEBUG
+    fprintf(stderr, "Starting a magic type: \"%s\"\n", ptr);
+#endif
+
+    /* Now load the magic regexes into their part of the struct. */
+    while (*ptr != '\0') {
+	const char *regexstring;
+	regexlisttype *newmagic;
+
+	while (*ptr != '"' && *ptr != '\0')
+	    ptr++;
+
+	if (*ptr == '\0')
+	    return;
+
+	ptr++;
+
+	regexstring = ptr;
+	ptr = parse_next_regex(ptr);
+	if (ptr == NULL)
+	    break;
+
+	newmagic = (regexlisttype *)nmalloc(sizeof(regexlisttype));
+
+	/* Save the regex string if it's valid. */
+	if (nregcomp(regexstring, REG_NOSUB)) {
+	    newmagic->ext_regex = mallocstrcpy(NULL, regexstring);
+	    newmagic->ext = NULL;
+
+	    if (endmagic == NULL)
+		endsyntax->magics = newmagic;
+	    else
+		endmagic->next = newmagic;
+	    endmagic = newmagic;
+	    endmagic->next = NULL;
+	} else
+	    free(newmagic);
+    }
+#endif /* HAVE_LIBMAGIC */
 }
-#endif /* ENABLE_COLOR */
+#endif /* !DISABLE_COLOR */
+
+/* Parse the linter requested for this syntax.  Simple? */
+void parse_linter(char *ptr)
+{
+    assert(ptr != NULL);
+
+    if (syntaxes == NULL) {
+	rcfile_error(
+		N_("Cannot add a linter without a syntax command"));
+	return;
+    }
+
+    if (*ptr == '\0') {
+	rcfile_error(N_("Missing linter command"));
+	return;
+    }
+
+    if (endsyntax->linter != NULL)
+	free(endsyntax->linter);
+
+    /* Let them unset the linter by using "". */
+    if (!strcmp(ptr, "\"\""))
+	endsyntax->linter = NULL;
+    else
+	endsyntax->linter = mallocstrcpy(syntaxes->linter, ptr);
+}
+
+void parse_formatter(char *ptr)
+{
+    assert(ptr != NULL);
+
+    if (syntaxes == NULL) {
+	rcfile_error(
+		N_("Cannot add formatter without a syntax command"));
+	return;
+    }
+
+    if (*ptr == '\0') {
+	rcfile_error(N_("Missing formatter command"));
+	return;
+    }
+
+    if (endsyntax->formatter != NULL)
+	free(endsyntax->formatter);
+
+    /* Let them unset the formatter by using "". */
+    if (!strcmp(ptr, "\"\""))
+	endsyntax->formatter = NULL;
+    else
+	endsyntax->formatter = mallocstrcpy(syntaxes->formatter, ptr);
+}
+#endif /* !DISABLE_COLOR */
 
 /* Check whether the user has unmapped every shortcut for a
-sequence we consider 'vital', like the exit function */
+ * sequence we consider 'vital', like the exit function. */
 static void check_vitals_mapped(void)
 {
     subnfunc *f;
     int v;
 #define VITALS 5
-    short vitals[VITALS] = { DO_EXIT, DO_EXIT, CANCEL_MSG, CANCEL_MSG, CANCEL_MSG };
+    void (*vitals[VITALS])(void) = { do_exit, do_exit, do_cancel, do_cancel, do_cancel };
     int inmenus[VITALS] = { MMAIN, MHELP, MWHEREIS, MREPLACE, MGOTOLINE };
 
     for  (v = 0; v < VITALS; v++) {
-       for (f = allfuncs; f != NULL; f = f->next) {
-           if (f->scfunc == vitals[v] && f->menus & inmenus[v]) {
-               const sc *s = first_sc_for(inmenus[v], f->scfunc);
-               if (!s) {
-                   rcfile_error(N_("Fatal error: no keys mapped for function \"%s\""),
-                       f->desc);
-                   fprintf(stderr, N_("Exiting.  Please use nano with the -I option if needed to adjust your nanorc settings\n"));
-                   exit(1);
-               }
-           break;
-           }
-       }
+	for (f = allfuncs; f != NULL; f = f->next) {
+	    if (f->scfunc == vitals[v] && f->menus & inmenus[v]) {
+		const sc *s = first_sc_for(inmenus[v], f->scfunc);
+		if (!s) {
+		    fprintf(stderr, _("Fatal error: no keys mapped for function "
+				     "\"%s\".  Exiting.\n"), f->desc);
+		    fprintf(stderr, _("If needed, use nano with the -I option "
+				     "to adjust your nanorc settings.\n"));
+		     exit(1);
+		}
+		break;
+	    }
+	}
     }
 }
 
@@ -886,7 +1058,7 @@ static void check_vitals_mapped(void)
  * and close it afterwards.  If syntax_only is TRUE, only allow the file
  * to contain color syntax commands: syntax, color, and icolor. */
 void parse_rcfile(FILE *rcstream
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 	, bool syntax_only
 #endif
 	)
@@ -894,6 +1066,9 @@ void parse_rcfile(FILE *rcstream
     char *buf = NULL;
     ssize_t len;
     size_t n = 0;
+#ifndef DISABLE_COLOR
+    syntaxtype *end_syn_save = NULL;
+#endif
 
     while ((len = getline(&buf, &n, rcstream)) > 0) {
 	char *ptr, *keyword, *option;
@@ -918,9 +1093,32 @@ void parse_rcfile(FILE *rcstream
 	keyword = ptr;
 	ptr = parse_next_word(ptr);
 
+#ifndef DISABLE_COLOR
+	/* Handle extending first... */
+	if (strcasecmp(keyword, "extendsyntax") == 0) {
+	    char *syntaxname = ptr;
+	    syntaxtype *ts = NULL;
+
+	    ptr = parse_next_word(ptr);
+	    for (ts = syntaxes; ts != NULL; ts = ts->next)
+		if (!strcmp(ts->desc, syntaxname))
+		    break;
+
+	    if (ts == NULL) {
+		rcfile_error(N_("Could not find syntax \"%s\" to extend"), syntaxname);
+		continue;
+	    } else {
+		end_syn_save = endsyntax;
+		endsyntax = ts;
+		keyword = ptr;
+		ptr = parse_next_word(ptr);
+	    }
+	}
+#endif
+
 	/* Try to parse the keyword. */
 	if (strcasecmp(keyword, "set") == 0) {
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 	    if (syntax_only)
 		rcfile_error(
 			N_("Command \"%s\" not allowed in included file"),
@@ -929,7 +1127,7 @@ void parse_rcfile(FILE *rcstream
 #endif
 		set = 1;
 	} else if (strcasecmp(keyword, "unset") == 0) {
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 	    if (syntax_only)
 		rcfile_error(
 			N_("Command \"%s\" not allowed in included file"),
@@ -938,7 +1136,7 @@ void parse_rcfile(FILE *rcstream
 #endif
 		set = -1;
 	}
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 	else if (strcasecmp(keyword, "include") == 0) {
 	    if (syntax_only)
 		rcfile_error(
@@ -951,25 +1149,41 @@ void parse_rcfile(FILE *rcstream
 		rcfile_error(N_("Syntax \"%s\" has no color commands"),
 			endsyntax->desc);
 	    parse_syntax(ptr);
-	} else if (strcasecmp(keyword, "header") == 0)
-	    parse_headers(ptr);
+	}
+	else if (strcasecmp(keyword, "magic") == 0)
+	    parse_magic_exp(ptr);
+	else if (strcasecmp(keyword, "header") == 0)
+	    parse_header_exp(ptr);
 	else if (strcasecmp(keyword, "color") == 0)
 	    parse_colors(ptr, FALSE);
 	else if (strcasecmp(keyword, "icolor") == 0)
 	    parse_colors(ptr, TRUE);
+	else if (strcasecmp(keyword, "linter") == 0)
+	    parse_linter(ptr);
+	else if (strcasecmp(keyword, "formatter") == 0)
+	    parse_formatter(ptr);
+#endif /* !DISABLE_COLOR */
 	else if (strcasecmp(keyword, "bind") == 0)
-	    parse_keybinding(ptr);
+	    parse_binding(ptr, TRUE);
 	else if (strcasecmp(keyword, "unbind") == 0)
-	    parse_unbinding(ptr);
-#endif /* ENABLE_COLOR */
+	    parse_binding(ptr, FALSE);
 	else
 	    rcfile_error(N_("Command \"%s\" not understood"), keyword);
 
+#ifndef DISABLE_COLOR
+	/* If we temporarily reset endsyntax to allow extending,
+	 * restore the value here. */
+	if (end_syn_save != NULL) {
+	    endsyntax = end_syn_save;
+	    end_syn_save = NULL;
+	}
+#endif
+
 	if (set == 0)
 	    continue;
 
 	if (*ptr == '\0') {
-	    rcfile_error(N_("Missing flag"));
+	    rcfile_error(N_("Missing option"));
 	    continue;
 	}
 
@@ -1013,6 +1227,17 @@ void parse_rcfile(FILE *rcstream
 			    break;
 			}
 
+#ifndef DISABLE_COLOR
+			if (strcasecmp(rcopts[i].name, "titlecolor") == 0)
+			    specified_color_combo[TITLE_BAR] = option;
+			else if (strcasecmp(rcopts[i].name, "statuscolor") == 0)
+			    specified_color_combo[STATUS_BAR] = option;
+			else if (strcasecmp(rcopts[i].name, "keycolor") == 0)
+			    specified_color_combo[KEY_COMBO] = option;
+			else if (strcasecmp(rcopts[i].name, "functioncolor") == 0)
+			    specified_color_combo[FUNCTION_TAG] = option;
+			else
+#endif
 #ifndef DISABLE_OPERATINGDIR
 			if (strcasecmp(rcopts[i].name, "operatingdir") == 0)
 			    operating_dir = option;
@@ -1111,19 +1336,16 @@ void parse_rcfile(FILE *rcstream
 		} else if (rcopts[i].flag != 0)
 		    UNSET(rcopts[i].flag);
 		else
-		    rcfile_error(N_("Cannot unset flag \"%s\""),
+		    rcfile_error(N_("Cannot unset option \"%s\""),
 			rcopts[i].name);
-		/* Looks like we still need this specific hack for undo */
-		if (strcasecmp(rcopts[i].name, "undo") == 0)
-		    shortcut_init(0);
 		break;
 	    }
 	}
 	if (rcopts[i].name == NULL)
-	    rcfile_error(N_("Unknown flag \"%s\""), option);
+	    rcfile_error(N_("Unknown option \"%s\""), option);
     }
 
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     if (endsyntax != NULL && endcolor == NULL)
 	rcfile_error(N_("Syntax \"%s\" has no color commands"),
 		endsyntax->desc);
@@ -1163,7 +1385,7 @@ void do_rcfile(void)
     rcstream = fopen(nanorc, "rb");
     if (rcstream != NULL)
 	parse_rcfile(rcstream
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 		, FALSE
 #endif
 		);
@@ -1205,7 +1427,7 @@ void do_rcfile(void)
 			strerror(errno));
 	} else
 	    parse_rcfile(rcstream
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 		, FALSE
 #endif
 		);
@@ -1221,10 +1443,6 @@ void do_rcfile(void)
 	while (getchar() != '\n')
 	    ;
     }
-
-#ifdef ENABLE_COLOR
-    set_colorpairs();
-#endif
 }
 
-#endif /* ENABLE_NANORC */
+#endif /* !DISABLE_NANORC */
diff --git a/src/search.c b/src/search.c
index 4b93045..eb3bfb2 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1,9 +1,9 @@
-/* $Id: search.c 4472 2010-01-05 23:35:50Z astyanax $ */
+/* $Id: search.c 5148 2015-03-22 11:42:29Z bens $ */
 /**************************************************************************
  *   search.c                                                             *
  *                                                                        *
  *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009 Free Software Foundation, Inc.                            *
+ *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -32,7 +32,7 @@
 
 static bool search_last_line = FALSE;
 	/* Have we gone past the last line while searching? */
-#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
+#ifndef DISABLE_HISTORIES
 static bool history_changed = FALSE;
 	/* Have any of the history lists changed? */
 #endif
@@ -137,9 +137,6 @@ int search_init(bool replacing, bool use_answer)
 {
     int i = 0;
     char *buf;
-    sc *s;
-    char func = 0;
-    bool meta_key = FALSE, func_key = FALSE;
     static char *backupstring = NULL;
 	/* The search string we'll be using. */
 
@@ -164,8 +161,7 @@ int search_init(bool replacing, bool use_answer)
 	char *disp = display_string(last_search, 0, COLS / 3, FALSE);
 
 	buf = charalloc(strlen(disp) + 7);
-	/* We use (COLS / 3) here because we need to see more on the
-	 * line. */
+	/* We use (COLS / 3) here because we need to see more on the line. */
 	sprintf(buf, " [%s%s]", disp,
 		(strlenpt(last_search) > COLS / 3) ? "..." : "");
 	free(disp);
@@ -178,30 +174,26 @@ int search_init(bool replacing, bool use_answer)
 	TRUE,
 #endif
 	replacing ? MREPLACE : MWHEREIS, backupstring,
-	&meta_key, &func_key,
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
 	&search_history,
 #endif
+	/* TRANSLATORS: This is the main search prompt. */
 	edit_refresh, "%s%s%s%s%s%s", _("Search"),
 #ifndef NANO_TINY
-	/* TRANSLATORS: This string is just a modifier for the search
-	 * prompt; no grammar is implied. */
+	/* TRANSLATORS: The next three strings are modifiers of the search prompt. */
 	ISSET(CASE_SENSITIVE) ? _(" [Case Sensitive]") :
 #endif
 	"",
 #ifdef HAVE_REGEX_H
-	/* TRANSLATORS: This string is just a modifier for the search
-	 * prompt; no grammar is implied. */
 	ISSET(USE_REGEXP) ? _(" [Regexp]") :
 #endif
 	"",
 #ifndef NANO_TINY
-	/* TRANSLATORS: This string is just a modifier for the search
-	 * prompt; no grammar is implied. */
 	ISSET(BACKWARDS_SEARCH) ? _(" [Backwards]") :
 #endif
 	"", replacing ?
 #ifndef NANO_TINY
+	/* TRANSLATORS: The next two strings are modifiers of the search prompt. */
 	openfile->mark_set ? _(" (to replace) in selection") :
 #endif
 	_(" (to replace)") : "", buf);
@@ -220,11 +212,7 @@ int search_init(bool replacing, bool use_answer)
 	statusbar(_("Cancelled"));
 	return -1;
     } else {
-	for  (s = sclist; s != NULL; s = s->next)
-	    if ((s->menu & currmenu) && i == s->seq) {
-	        func = s->scfunc;
-	  	break;
-	    }
+	functionptrtype func = func_from_key(&i);
 
 	if (i == -2 || i == 0 ) {
 #ifdef HAVE_REGEX_H
@@ -236,26 +224,25 @@ int search_init(bool replacing, bool use_answer)
 #endif
 		;
 #ifndef NANO_TINY
-	} else if (func == CASE_SENS_MSG) {
+	} else if (func == case_sens_void) {
 		TOGGLE(CASE_SENSITIVE);
 		backupstring = mallocstrcpy(backupstring, answer);
 		return 1;
-	} else if (func == BACKWARDS_MSG) {
+	} else if (func == backwards_void) {
 		TOGGLE(BACKWARDS_SEARCH);
 		backupstring = mallocstrcpy(backupstring, answer);
 		return 1;
 #endif
 #ifdef HAVE_REGEX_H
-	} else if (func == REGEXP_MSG) {
+	} else if (func == regexp_void) {
 		TOGGLE(USE_REGEXP);
 		backupstring = mallocstrcpy(backupstring, answer);
 		return 1;
 #endif
-	} else if (func == DO_REPLACE || 
-	  func == NO_REPLACE_MSG) {
+	} else if (func == do_replace || func == flip_replace_void) {
 		backupstring = mallocstrcpy(backupstring, answer);
 		return -2;	/* Call the opposite search function. */
-	} else if (func == DO_GOTOLINECOLUMN_VOID) {
+	} else if (func == do_gotolinecolumn_void) {
 		do_gotolinecolumn(openfile->current->lineno,
 			openfile->placewewant + 1, TRUE, TRUE, FALSE,
 			TRUE);
@@ -289,7 +276,6 @@ bool findnextstr(
     ssize_t current_y_find = openfile->current_y;
     filestruct *fileptr = openfile->current;
     const char *rev_start = fileptr->data, *found = NULL;
-    const subnfunc *f;
     time_t lastkbcheck = time(NULL);
 
     /* rev_start might end up 1 character before the start or after the
@@ -300,17 +286,19 @@ bool findnextstr(
     rev_start +=
 #ifndef NANO_TINY
 	ISSET(BACKWARDS_SEARCH) ?
-	openfile->current_x - 1 :
+	((openfile->current_x == 0) ? -1 : move_mbleft(fileptr->data, openfile->current_x)) :
 #endif
-	openfile->current_x + 1;
+	move_mbright(fileptr->data, openfile->current_x);
 
     /* Look for needle in the current line we're searching. */
     enable_nodelay();
     while (TRUE) {
-        if (time(NULL) - lastkbcheck > 1) {
-            lastkbcheck = time(NULL);
-	    f = getfuncfromkey(edit);
-            if (f && f->scfunc == CANCEL_MSG) {
+	if (time(NULL) - lastkbcheck > 1) {
+	    int input = parse_kbinput(edit);
+
+	    lastkbcheck = time(NULL);
+
+	    if (input && func_from_key(&input) == do_cancel) {
 		statusbar(_("Cancelled"));
 		return FALSE;
 	    }
@@ -358,10 +346,10 @@ bool findnextstr(
 		break;
 	}
 
-	/* We've finished processing the file, so get out. */
 	if (search_last_line) {
+	    /* We've finished processing the file, so get out. */
 	    not_found_msg(needle);
-            disable_nodelay();
+	    disable_nodelay();
 	    return FALSE;
 	}
 
@@ -378,9 +366,8 @@ bool findnextstr(
 	}
 #endif
 
-	/* We've reached the start or end of the buffer, so wrap
-	 * around. */
 	if (fileptr == NULL) {
+	    /* We've reached the start or end of the buffer, so wrap around. */
 #ifndef NANO_TINY
 	    if (ISSET(BACKWARDS_SEARCH)) {
 		fileptr = openfile->filebot;
@@ -395,8 +382,8 @@ bool findnextstr(
 	    statusbar(_("Search Wrapped"));
 	}
 
-	/* We've reached the original starting line. */
 	if (fileptr == begin)
+	    /* We've reached the original starting line. */
 	    search_last_line = TRUE;
 
 	rev_start = fileptr->data;
@@ -456,8 +443,7 @@ void do_search(void)
     i = search_init(FALSE, FALSE);
 
     if (i == -1)
-	/* Cancel, Go to Line, blank search string, or regcomp()
-	 * failed. */
+	/* Cancel, Go to Line, blank search string, or regcomp() failed. */
 	search_replace_abort();
     else if (i == -2)
 	/* Replace. */
@@ -477,7 +463,7 @@ void do_search(void)
     else
 	last_search = mallocstrcpy(last_search, answer);
 
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
     /* If answer is not "", add this search string to the search history
      * list. */
     if (answer[0] != '\0')
@@ -525,7 +511,7 @@ void do_search(void)
     search_replace_abort();
 }
 
-#ifndef NANO_TINY
+#if !defined(NANO_TINY) || !defined(DISABLE_BROWSER)
 /* Search for the last string without prompting. */
 void do_research(void)
 {
@@ -573,20 +559,20 @@ void do_research(void)
 			openfile->current_x && !didfind)
 		    statusbar(_("This is the only occurrence"));
 	    } else {
-#endif
+#endif /* HAVE_REGEX_H */
 		statusbar(_("This is the only occurrence"));
 #ifdef HAVE_REGEX_H
 	    }
 #endif
 	}
     } else
-        statusbar(_("No current search pattern"));
+	statusbar(_("No current search pattern"));
 
     openfile->placewewant = xplustabs();
     edit_redraw(fileptr, pww_save);
     search_replace_abort();
 }
-#endif
+#endif /* !NANO_TINY */
 
 #ifdef HAVE_REGEX_H
 int replace_regexp(char *string, bool create)
@@ -636,7 +622,7 @@ int replace_regexp(char *string, bool create)
 
     return new_line_size;
 }
-#endif
+#endif /* HAVE_REGEX_H */
 
 char *replace_line(const char *needle)
 {
@@ -719,12 +705,12 @@ ssize_t do_replace_loop(
 	filepart = partition_filestruct(top, top_x, bot, bot_x);
 	openfile->edittop = openfile->fileage;
 	openfile->mark_set = FALSE;
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 	reset_multis(openfile->current, TRUE);
 #endif
 	edit_refresh();
     }
-#endif
+#endif /* !NANO_TINY */
 
     if (canceled != NULL)
 	*canceled = FALSE;
@@ -751,12 +737,10 @@ ssize_t do_replace_loop(
 	 * beginning line already, and we're still on the beginning line
 	 * after the search, it means that we've wrapped around, so
 	 * we're done. */
-	if (bol_or_eol && begin_line && openfile->current ==
-		real_current)
+	if (bol_or_eol && begin_line && openfile->current == real_current)
 	    break;
 	/* Otherwise, set the begin_line flag if we've found a match on
-	 * the beginning line, reset the bol_or_eol flag, and
-	 * continue. */
+	 * the beginning line, reset the bol_or_eol flag, and continue. */
 	else {
 	    if (openfile->current == real_current)
 		begin_line = TRUE;
@@ -781,6 +765,7 @@ ssize_t do_replace_loop(
 
 	    do_replace_highlight(TRUE, exp_word);
 
+	    /* TRANSLATORS: This is a prompt. */
 	    i = do_yesno_prompt(TRUE, _("Replace this instance?"));
 
 	    do_replace_highlight(FALSE, exp_word);
@@ -860,18 +845,18 @@ ssize_t do_replace_loop(
 #endif
 		openfile->current_x += match_len + length_change - 1;
 
-	    /* Cleanup. */
+	    /* Clean up. */
 	    openfile->totsize += mbstrlen(copy) -
 		mbstrlen(openfile->current->data);
 	    free(openfile->current->data);
 	    openfile->current->data = copy;
 
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 	reset_multis(openfile->current, TRUE);
 #endif
 	edit_refresh();
 	    if (!replaceall) {
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
 		/* If color syntaxes are available and turned on, we
 		 * need to call edit_refresh(). */
 		if (openfile->colorstrings != NULL &&
@@ -912,7 +897,6 @@ void do_replace(void)
 {
     filestruct *edittop_save, *begin;
     size_t begin_x, pww_save;
-    bool meta_key = FALSE, func_key = FALSE;
     ssize_t numreplaced;
     int i;
 
@@ -924,8 +908,7 @@ void do_replace(void)
 
     i = search_init(TRUE, FALSE);
     if (i == -1) {
-	/* Cancel, Go to Line, blank search string, or regcomp()
-	 * failed. */
+	/* Cancel, Go to Line, blank search string, or regcomp() failed. */
 	search_replace_abort();
 	return;
     } else if (i == -2) {
@@ -942,7 +925,7 @@ void do_replace(void)
     /* If answer is not "", add answer to the search history list and
      * copy answer into last_search. */
     if (answer[0] != '\0') {
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
 	update_history(&search_history, answer);
 #endif
 	last_search = mallocstrcpy(last_search, answer);
@@ -954,16 +937,15 @@ void do_replace(void)
 #ifndef DISABLE_TABCOMP
 	TRUE,
 #endif
-	MREPLACE2, last_replace,
-	&meta_key, &func_key,
-#ifndef NANO_TINY
+	MREPLACEWITH, last_replace,
+#ifndef DISABLE_HISTORIES
 	&replace_history,
 #endif
+	/* TRANSLATORS: This is a prompt. */
 	edit_refresh, _("Replace with"));
 
-#ifndef NANO_TINY
-    /* Add this replace string to the replace history list.  i == 0
-     * means that the string is not "". */
+#ifndef DISABLE_HISTORIES
+    /* If the replace string is not "", add it to the replace history list. */
     if (i == 0)
 	update_history(&replace_history, answer);
 #endif
@@ -1008,6 +990,19 @@ void do_replace(void)
     search_replace_abort();
 }
 
+/* Go to the specified line and x position. */
+void goto_line_posx(ssize_t line, size_t pos_x)
+{
+    for (openfile->current = openfile->fileage; openfile->current != openfile->filebot &&
+					openfile->current->next != NULL && line > 1; line--)
+	openfile->current = openfile->current->next;
+
+    openfile->current_x = pos_x;
+    openfile->placewewant = xplustabs();
+
+    edit_refresh_needed = TRUE;
+}
+
 /* Go to the specified line and column, or ask for them if interactive
  * is TRUE.  Save the x-coordinate and y-coordinate if save_pos is TRUE.
  * Update the screen afterwards if allow_update is TRUE.  Note that both
@@ -1015,11 +1010,9 @@ void do_replace(void)
 void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 	bool interactive, bool save_pos, bool allow_update)
 {
-    bool meta_key = FALSE, func_key = FALSE;
-    const sc *s;
-
     if (interactive) {
 	char *ans = mallocstrcpy(NULL, answer);
+	functionptrtype func;
 
 	/* Ask for the line and column. */
 	int i = do_prompt(FALSE,
@@ -1027,10 +1020,10 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 		TRUE,
 #endif
 		MGOTOLINE, use_answer ? ans : "",
-		&meta_key, &func_key,
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
 		NULL,
 #endif
+		/* TRANSLATORS: This is a prompt. */
 		edit_refresh, _("Enter line number, column number"));
 
 	free(ans);
@@ -1042,9 +1035,9 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
 	    return;
 	}
 
+	func = func_from_key(&i);
 
-	s = get_shortcut(currmenu, &i, &meta_key, &func_key);
-	if (s && s->scfunc ==  GOTOTEXT_MSG) {
+	if (func == gototext_void) {
 	    /* Keep answer up on the statusbar. */
 	    search_init(TRUE, TRUE);
 
@@ -1083,10 +1076,10 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
     edit_update(save_pos ? NONE : CENTER);
 
     /* If allow_update is TRUE, update the screen. */
-    if (allow_update)
+    if (allow_update) {
 	edit_refresh();
-
-    display_main_list();
+	display_main_list();
+    }
 }
 
 /* Go to the specified line and column, asking for them beforehand. */
@@ -1143,8 +1136,8 @@ bool find_bracket_match(bool reverse, const char *bracket_set)
 		mbrevstrpbrk(fileptr->data, bracket_set, rev_start) :
 		mbstrpbrk(rev_start, bracket_set));
 
-	/* We've found a potential match. */
 	if (found != NULL)
+	    /* We've found a potential match. */
 	    break;
 
 	if (reverse) {
@@ -1155,8 +1148,8 @@ bool find_bracket_match(bool reverse, const char *bracket_set)
 	    current_y_find++;
 	}
 
-	/* We've reached the start or end of the buffer, so get out. */
 	if (fileptr == NULL)
+	    /* We've reached the start or end of the buffer, so get out. */
 	    return FALSE;
 
 	rev_start = fileptr->data;
@@ -1290,14 +1283,14 @@ void do_find_bracket(void)
     free(bracket_set);
     free(found_ch);
 }
+#endif /* !NANO_TINY */
 
-#ifdef ENABLE_NANORC
+#ifndef DISABLE_HISTORIES
 /* Indicate whether any of the history lists have changed. */
 bool history_has_changed(void)
 {
     return history_changed;
 }
-#endif
 
 /* Initialize the search and replace history lists. */
 void history_init(void)
@@ -1372,8 +1365,7 @@ void update_history(filestruct **h, const char *s)
 	bar = p->next;
 	unlink_node(foo);
 	delete_node(foo);
-	if (bar != NULL)
-	    renumber(bar);
+	renumber(bar);
     }
 
     /* If the history is full, delete the beginning entry to make room
@@ -1394,10 +1386,8 @@ void update_history(filestruct **h, const char *s)
     *hbot = (*hbot)->next;
     (*hbot)->data = mallocstrcpy(NULL, "");
 
-#ifdef ENABLE_NANORC
     /* Indicate that the history's been changed. */
     history_changed = TRUE;
-#endif
 
     /* Set the current position in the list to the bottom. */
     *h = *hbot;
@@ -1431,6 +1421,16 @@ char *get_history_newer(filestruct **h)
     return (*h)->data;
 }
 
+/* More placeholders. */
+void get_history_newer_void(void)
+{
+    ;
+}
+void get_history_older_void(void)
+{
+    ;
+}
+
 #ifndef DISABLE_TABCOMP
 /* Move h to the next string that's a tab completion of the string s,
  * looking at only the first len characters of s, and return that
@@ -1486,4 +1486,4 @@ char *get_history_completion(filestruct **h, const char *s, size_t len)
     return (char *)s;
 }
 #endif /* !DISABLE_TABCOMP */
-#endif /* !NANO_TINY */
+#endif /* !DISABLE_HISTORIES */
diff --git a/src/text.c b/src/text.c
index 54da3f0..dd72308 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1,9 +1,9 @@
-/* $Id: text.c 4520 2010-11-12 06:23:14Z astyanax $ */ 
+/* $Id: text.c 5145 2015-03-21 21:13:03Z bens $ */
 /**************************************************************************
  *   text.c                                                               *
  *                                                                        *
  *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009 Free Software Foundation, Inc.                            *
+ *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -64,12 +64,10 @@ void do_mark(void)
 #endif /* !NANO_TINY */
 
 /* Delete the character under the cursor. */
-void do_delete(void)
+void do_deletion(undo_type action)
 {
-    size_t orig_lenpt = 0;
-
 #ifndef NANO_TINY
-    update_undo(DEL);
+    size_t orig_lenpt = 0;
 #endif
 
     assert(openfile->current != NULL && openfile->current->data != NULL && openfile->current_x <= strlen(openfile->current->data));
@@ -84,8 +82,12 @@ void do_delete(void)
 
 	assert(openfile->current_x < strlen(openfile->current->data));
 
+#ifndef NANO_TINY
+	update_undo(action);
+
 	if (ISSET(SOFTWRAP))
 	    orig_lenpt = strlenpt(openfile->current->data);
+#endif
 
 	/* Let's get dangerous. */
 	charmove(&openfile->current->data[openfile->current_x],
@@ -106,15 +108,17 @@ void do_delete(void)
 
 	assert(openfile->current_x == strlen(openfile->current->data));
 
+#ifndef NANO_TINY
+	add_undo(action);
+#endif
 	/* If we're deleting at the end of a line, we need to call
 	 * edit_refresh(). */
 	if (openfile->current->data[openfile->current_x] == '\0')
 	    edit_refresh_needed = TRUE;
 
 	openfile->current->data = charealloc(openfile->current->data,
-		openfile->current_x + strlen(foo->data) + 1);
-	strcpy(openfile->current->data + openfile->current_x,
-		foo->data);
+		strlen(openfile->current->data) + strlen(foo->data) + 1);
+	strcat(openfile->current->data, foo->data);
 #ifndef NANO_TINY
 	if (openfile->mark_set && openfile->mark_begin ==
 		openfile->current->next) {
@@ -139,16 +143,23 @@ void do_delete(void)
     } else
 	return;
 
+#ifndef NANO_TINY
     if (ISSET(SOFTWRAP) && edit_refresh_needed == FALSE)
 	if (strlenpt(openfile->current->data) / COLS != orig_lenpt / COLS)
-	    edit_refresh_needed  = TRUE;
+	    edit_refresh_needed = TRUE;
+#endif
 
     set_modified();
 
-    if (edit_refresh_needed  == FALSE)
+    if (edit_refresh_needed == FALSE)
 	update_line(openfile->current, openfile->current_x);
 }
 
+void do_delete(void)
+{
+    do_deletion(DEL);
+}
+
 /* Backspace over one character.  That is, move the cursor left one
  * character, and then delete the character under the cursor. */
 void do_backspace(void)
@@ -156,7 +167,7 @@ void do_backspace(void)
     if (openfile->current != openfile->fileage ||
 	openfile->current_x > 0) {
 	do_left();
-	do_delete();
+	do_deletion(BACK);
     }
 }
 
@@ -216,8 +227,7 @@ void do_indent(ssize_t cols)
     if (cols == 0)
 	return;
 
-    /* If cols is negative, make it positive and set unindent to
-     * TRUE. */
+    /* If cols is negative, make it positive and set unindent to TRUE. */
     if (cols < 0) {
 	cols = -cols;
 	unindent = TRUE;
@@ -360,99 +370,79 @@ void do_unindent(void)
     do_indent(-tabsize);
 }
 
-/* undo a cut, or re-do an uncut */
+#define redo_paste undo_cut
+#define undo_paste redo_cut
+
+/* Undo a cut, or redo an uncut. */
 void undo_cut(undo *u)
 {
-    /* If we cut the magicline may was well not crash :/ */
+    /* If we cut the magicline, we may as well not crash. :/ */
     if (!u->cutbuffer)
 	return;
 
-    cutbuffer = copy_filestruct(u->cutbuffer);
-
-    /* Compute cutbottom for the uncut using out copy */
-    for (cutbottom = cutbuffer; cutbottom->next != NULL; cutbottom = cutbottom->next)
-	;
-
-    /* Get to where we need to uncut from */
-    if (u->mark_set && u->mark_begin_lineno < u->lineno)
-	do_gotolinecolumn(u->mark_begin_lineno, u->mark_begin_x+1, FALSE, FALSE, FALSE, FALSE);
+    /* Get to where we need to uncut from. */
+    if (u->xflags == UNcut_cutline)
+	goto_line_posx(u->mark_begin_lineno, 0);
     else
-	do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
+	goto_line_posx(u->mark_begin_lineno, u->mark_begin_x);
 
-    copy_from_filestruct(cutbuffer, cutbottom);
-    free_filestruct(cutbuffer);
-    cutbuffer = NULL;
+    copy_from_filestruct(u->cutbuffer);
 
+    if (u->xflags != UNcut_marked_forward && u->type != PASTE)
+	goto_line_posx(u->mark_begin_lineno, u->mark_begin_x);
 }
 
-/* Re-do a cut, or undo an uncut */
-void redo_cut(undo *u) {
-    int i;
-    filestruct *t, *c;
-
-    /* If we cut the magicline may was well not crash :/ */
+/* Redo a cut, or undo an uncut. */
+void redo_cut(undo *u)
+{
+    /* If we cut the magicline, we may as well not crash. :/ */
     if (!u->cutbuffer)
 	return;
 
-    do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
-    openfile->mark_set = u->mark_set;
-    if (cutbuffer)
-	free(cutbuffer);
+    filestruct *oldcutbuffer = cutbuffer, *oldcutbottom = cutbottom;
     cutbuffer = NULL;
+    cutbottom = NULL;
 
-    /* Move ahead the same # lines we had if a marked cut */
-    if (u->mark_set) {
-	for (i = 1, t = openfile->fileage; i != u->mark_begin_lineno; i++)
-	    t = t->next;
-	openfile->mark_begin = t;
-    } else if (!u->to_end) {
-	/* Here we have a regular old potentially multi-line ^K cut.  We'll
-	   need to trick nano into thinking it's a marked cut to cut more
-	   than one line again */
-	for (c = u->cutbuffer, t = openfile->current; c->next != NULL && t->next != NULL; ) {
+    goto_line_posx(u->lineno, u->begin);
 
-#ifdef DEBUG
-	fprintf(stderr, "Advancing, lineno  = %lu, data = \"%s\"\n", (unsigned long) t->lineno, t->data);
-#endif
-	    c = c->next;
-	    t = t->next;
-	 }
-	openfile->mark_begin = t;
- 	openfile->mark_begin_x = 0;
-	openfile->mark_set = TRUE;
+    if (ISSET(NO_NEWLINES) && openfile->current->lineno != u->lineno) {
+	openfile->current_x = strlen(openfile->current->data);
+	openfile->placewewant = xplustabs();
     }
 
-    openfile->mark_begin_x = u->mark_begin_x;
-    do_cut_text(FALSE, u->to_end, TRUE);
+    openfile->mark_set = TRUE;
+    openfile->mark_begin = fsfromline(u->mark_begin_lineno);
+    openfile->mark_begin_x = (u->xflags == UNcut_cutline) ? 0 : u->mark_begin_x;
+
+    do_cut_text(FALSE, FALSE, TRUE);
+
     openfile->mark_set = FALSE;
     openfile->mark_begin = NULL;
     openfile->mark_begin_x = 0;
     edit_refresh_needed = TRUE;
+
+    if (cutbuffer != NULL)
+	free_filestruct(cutbuffer);
+    cutbuffer = oldcutbuffer;
+    cutbottom = oldcutbottom;
 }
 
-/* Undo the last thing(s) we did */
+/* Undo the last thing(s) we did. */
 void do_undo(void)
 {
     undo *u = openfile->current_undo;
-    filestruct *f = openfile->current, *t;
-    int len = 0;
-    char *undidmsg, *data;
-    filestruct *oldcutbuffer = cutbuffer, *oldcutbottom = cutbottom;
+    filestruct *t = 0;
+    size_t len = 0;
+    char *data, *undidmsg = NULL;
 
     if (!u) {
 	statusbar(_("Nothing in undo buffer!"));
 	return;
     }
 
-
-    if (u->lineno <= f->lineno)
-        for (; f->prev != NULL && f->lineno != u->lineno; f = f->prev)
-	    ;
-    else
-        for (; f->next != NULL && f->lineno != u->lineno; f = f->next)
-	    ;
-    if (f->lineno != u->lineno) {
-        statusbar(_("Internal error: can't match line %d.  Please save your work"), u->lineno);
+    filestruct *f = fsfromline(u->mark_begin_lineno);
+    if (!f) {
+	statusbar(_("Internal error: can't match line %d.  Please save your work."), u->mark_begin_lineno);
 	return;
     }
 #ifdef DEBUG
@@ -461,85 +451,94 @@ void do_undo(void)
 #endif
 
     openfile->current_x = u->begin;
-    switch(u->type) {
+    switch (u->type) {
     case ADD:
 	undidmsg = _("text add");
 	len = strlen(f->data) - strlen(u->strdata) + 1;
-        data = charalloc(len);
-        strncpy(data, f->data, u->begin);
+	data = charalloc(len);
+	strncpy(data, f->data, u->begin);
 	strcpy(&data[u->begin], &f->data[u->begin + strlen(u->strdata)]);
 	free(f->data);
 	f->data = data;
+	goto_line_posx(u->lineno, u->begin);
 	break;
+    case BACK:
     case DEL:
 	undidmsg = _("text delete");
 	len = strlen(f->data) + strlen(u->strdata) + 1;
 	data = charalloc(len);
-
 	strncpy(data, f->data, u->begin);
 	strcpy(&data[u->begin], u->strdata);
 	strcpy(&data[u->begin + strlen(u->strdata)], &f->data[u->begin]);
 	free(f->data);
 	f->data = data;
-	if (u->xflags == UNDO_DEL_BACKSPACE)
-	    openfile->current_x += strlen(u->strdata);
+	goto_line_posx(u->mark_begin_lineno, u->mark_begin_x);
 	break;
 #ifndef DISABLE_WRAPPING
-    case SPLIT:
-	undidmsg = _("line wrap");
-	f->data = (char *) nrealloc(f->data, strlen(f->data) + strlen(u->strdata) + 1);
-	strcpy(&f->data[strlen(f->data) - 1], u->strdata);
-	if (u->strdata2 != NULL)
-	    f->next->data = mallocstrcpy(f->next->data, u->strdata2);
-	else {
-	    filestruct *foo = openfile->current->next;
-	    unlink_node(foo);
-	    delete_node(foo);
-	}
-	renumber(f);
+    case SPLIT_END:
+	goto_line_posx(u->lineno, u->begin);
+	openfile->current_undo = openfile->current_undo->next;
+	openfile->last_action = OTHER;
+	while (openfile->current_undo->type != SPLIT_BEGIN)
+	    do_undo();
+	u = openfile->current_undo;
+	f = openfile->current;
+    case SPLIT_BEGIN:
+	undidmsg = _("text add");
 	break;
-#endif /* DISABLE_WRAPPING */
-    case UNSPLIT:
+#endif /* !DISABLE_WRAPPING */
+    case JOIN:
 	undidmsg = _("line join");
 	t = make_new_node(f);
 	t->data = mallocstrcpy(NULL, u->strdata);
-	data = mallocstrncpy(NULL, f->data, u->begin);
-	data[u->begin] = '\0';
+	data = mallocstrncpy(NULL, f->data, u->mark_begin_x + 1);
+	data[u->mark_begin_x] = '\0';
 	free(f->data);
 	f->data = data;
 	splice_node(f, t, f->next);
-	renumber(f);
+	if (f == openfile->filebot)
+	    openfile->filebot = t;
+	goto_line_posx(u->lineno, u->begin);
 	break;
+    case CUT_EOF:
     case CUT:
 	undidmsg = _("text cut");
-        undo_cut(u);
+	undo_cut(u);
+	f = fsfromline(u->lineno);
 	break;
-    case UNCUT:
+    case PASTE:
 	undidmsg = _("text uncut");
-	redo_cut(u);
+	undo_paste(u);
+	f = fsfromline(u->lineno);
 	break;
     case ENTER:
 	undidmsg = _("line break");
 	if (f->next) {
 	    filestruct *foo = f->next;
-	    f->data = (char *) nrealloc(f->data, strlen(f->data) + strlen(f->next->data) + 1);
-	    strcat(f->data,  f->next->data);
+	    f->data = charealloc(f->data, strlen(f->data) + strlen(&f->next->data[u->mark_begin_x]) + 1);
+	    strcat(f->data, &f->next->data[u->mark_begin_x]);
+	    if (foo == openfile->filebot)
+		openfile->filebot = f;
 	    unlink_node(foo);
 	    delete_node(foo);
 	}
+	goto_line_posx(u->lineno, u->begin);
 	break;
     case INSERT:
 	undidmsg = _("text insert");
+	filestruct *oldcutbuffer = cutbuffer, *oldcutbottom = cutbottom;
 	cutbuffer = NULL;
 	cutbottom = NULL;
-	/* When we updated mark_begin_lineno in update_undo, it was effectively how many line
-	   were inserted due to being partitioned before read_file was called.  So we
-	   add its value here */
+	/* When we updated mark_begin_lineno in update_undo, it was effectively
+	 * how many lines were inserted due to being partitioned before read_file
+	 * was called.  So we add its value here. */
 	openfile->mark_begin = fsfromline(u->lineno + u->mark_begin_lineno - 1);
 	openfile->mark_begin_x = 0;
 	openfile->mark_set = TRUE;
-	do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
+	goto_line_posx(u->lineno, u->begin);
 	cut_marked();
+	if (u->cutbuffer != NULL)
+	    free_filestruct(u->cutbuffer);
 	u->cutbuffer = cutbuffer;
 	u->cutbottom = cutbottom;
 	cutbuffer = oldcutbuffer;
@@ -548,29 +547,32 @@ void do_undo(void)
 	break;
     case REPLACE:
 	undidmsg = _("text replace");
+	goto_line_posx(u->lineno, u->begin);
 	data = u->strdata;
 	u->strdata = f->data;
 	f->data = data;
 	break;
-
     default:
-	undidmsg = _("Internal error: unknown type.  Please save your work");
+	undidmsg = _("Internal error: unknown type.  Please save your work.");
 	break;
-
     }
+
+    if (undidmsg)
+	statusbar(_("Undid action (%s)"), undidmsg);
+
     renumber(f);
-    do_gotolinecolumn(u->lineno, u->begin, FALSE, FALSE, FALSE, TRUE);
-    statusbar(_("Undid action (%s)"), undidmsg);
     openfile->current_undo = openfile->current_undo->next;
     openfile->last_action = OTHER;
+    openfile->placewewant = xplustabs();
+    set_modified();
 }
 
+/* Redo the last thing(s) we undid. */
 void do_redo(void)
 {
     undo *u = openfile->undotop;
-    filestruct *f = openfile->current;
-    int len = 0;
-    char *undidmsg, *data;
+    size_t len = 0;
+    char *data, *redidmsg = NULL;
 
     for (; u != NULL && u->next != openfile->current_undo; u = u->next)
 	;
@@ -579,18 +581,13 @@ void do_redo(void)
 	return;
     }
     if (u->next != openfile->current_undo) {
-	statusbar(_("Internal error: Redo setup failed.  Please save your work"));
+	statusbar(_("Internal error: cannot set up redo.  Please save your work."));
 	return;
     }
 
-    if (u->lineno <= f->lineno)
-        for (; f->prev != NULL && f->lineno != u->lineno; f = f->prev)
-	    ;
-    else
-        for (; f->next != NULL && f->lineno != u->lineno; f = f->next)
-	    ;
-    if (f->lineno != u->lineno) {
-        statusbar(_("Internal error: can't match line %d.  Please save your work"), u->lineno);
+    filestruct *f = fsfromline(u->mark_begin_lineno);
+    if (!f) {
+	statusbar(_("Internal error: can't match line %d.  Please save your work."), u->mark_begin_lineno);
 	return;
     }
 #ifdef DEBUG
@@ -598,86 +595,98 @@ void do_redo(void)
     fprintf(stderr, "Redo running for type %d\n", u->type);
 #endif
 
-    switch(u->type) {
+    switch (u->type) {
     case ADD:
-	undidmsg = _("text add");
+	redidmsg = _("text add");
 	len = strlen(f->data) + strlen(u->strdata) + 1;
-        data = charalloc(len);
+	data = charalloc(len);
 	strncpy(data, f->data, u->begin);
 	strcpy(&data[u->begin], u->strdata);
 	strcpy(&data[u->begin + strlen(u->strdata)], &f->data[u->begin]);
 	free(f->data);
 	f->data = data;
+	goto_line_posx(u->mark_begin_lineno, u->mark_begin_x);
 	break;
+    case BACK:
     case DEL:
-	undidmsg = _("text delete");
+	redidmsg = _("text delete");
 	len = strlen(f->data) + strlen(u->strdata) + 1;
 	data = charalloc(len);
-        strncpy(data, f->data, u->begin);
+	strncpy(data, f->data, u->begin);
 	strcpy(&data[u->begin], &f->data[u->begin + strlen(u->strdata)]);
 	free(f->data);
 	f->data = data;
+	openfile->current_x = u->begin;
+	goto_line_posx(u->lineno, u->begin);
 	break;
     case ENTER:
-	undidmsg = _("line break");
-	do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
+	redidmsg = _("line break");
+	goto_line_posx(u->lineno, u->begin);
 	do_enter(TRUE);
 	break;
 #ifndef DISABLE_WRAPPING
-    case SPLIT:
-	undidmsg = _("line wrap");
-	if (u->xflags & UNDO_SPLIT_MADENEW)
-	    prepend_wrap = TRUE;
-        do_wrap(f, TRUE);
-	renumber(f);
+    case SPLIT_BEGIN:
+	goto_line_posx(u->lineno, u->begin);
+	openfile->current_undo = u;
+	openfile->last_action = OTHER;
+	while (openfile->current_undo->type != SPLIT_END)
+	    do_redo();
+	u = openfile->current_undo;
+	goto_line_posx(u->lineno, u->begin);
+    case SPLIT_END:
+	redidmsg = _("text add");
 	break;
-#endif /* DISABLE_WRAPPING */
-    case UNSPLIT:
-	undidmsg = _("line join");
-	len = strlen(f->data) + strlen(u->strdata + 1);
-	data = charalloc(len);
-	strcpy(data, f->data);
-	strcat(data, u->strdata);
-	free(f->data);
-	f->data = data;
+#endif /* !DISABLE_WRAPPING */
+    case JOIN:
+	redidmsg = _("line join");
+	len = strlen(f->data) + strlen(u->strdata) + 1;
+	f->data = charealloc(f->data, len);
+	strcat(f->data, u->strdata);
 	if (f->next != NULL) {
 	    filestruct *tmp = f->next;
+	    if (tmp == openfile->filebot)
+		openfile->filebot = f;
 	    unlink_node(tmp);
 	    delete_node(tmp);
 	}
 	renumber(f);
+	goto_line_posx(u->mark_begin_lineno, u->mark_begin_x);
 	break;
+    case CUT_EOF:
     case CUT:
-	undidmsg = _("text cut");
+	redidmsg = _("text cut");
 	redo_cut(u);
 	break;
-    case UNCUT:
-	undidmsg = _("text uncut");
-	undo_cut(u);
+    case PASTE:
+	redidmsg = _("text uncut");
+	redo_paste(u);
 	break;
     case REPLACE:
-	undidmsg = _("text replace");
+	redidmsg = _("text replace");
 	data = u->strdata;
 	u->strdata = f->data;
 	f->data = data;
+	goto_line_posx(u->lineno, u->begin);
 	break;
     case INSERT:
-	undidmsg = _("text insert");
-	do_gotolinecolumn(u->lineno, u->begin+1, FALSE, FALSE, FALSE, FALSE);
-        copy_from_filestruct(u->cutbuffer, u->cutbottom);
-	openfile->placewewant = xplustabs();
+	redidmsg = _("text insert");
+	goto_line_posx(u->lineno, u->begin);
+	copy_from_filestruct(u->cutbuffer);
+	free_filestruct(u->cutbuffer);
+	u->cutbuffer = NULL;
 	break;
     default:
-	undidmsg = _("Internal error: unknown type.  Please save your work");
+	redidmsg = _("Internal error: unknown type.  Please save your work.");
 	break;
-
     }
-    do_gotolinecolumn(u->lineno, u->begin, FALSE, FALSE, FALSE, TRUE);
-    statusbar(_("Redid action (%s)"), undidmsg);
+
+    if (redidmsg)
+	statusbar(_("Redid action (%s)"), redidmsg);
 
     openfile->current_undo = u;
     openfile->last_action = OTHER;
-
+    openfile->placewewant = xplustabs();
+    set_modified();
 }
 #endif /* !NANO_TINY */
 
@@ -693,7 +702,6 @@ void do_enter(bool undoing)
     if (!undoing)
 	add_undo(ENTER);
 
-
     /* Do auto-indenting, like the neolithic Turbo Pascal editor. */
     if (ISSET(AUTOINDENT)) {
 	/* If we are breaking the line in the indentation, the new
@@ -711,7 +719,7 @@ void do_enter(bool undoing)
 #ifndef NANO_TINY
     if (ISSET(AUTOINDENT)) {
 	strncpy(newnode->data, openfile->current->data, extra);
-	openfile->totsize += mbstrlen(newnode->data);
+	openfile->totsize += extra;
     }
 #endif
     null_at(&openfile->current->data, openfile->current_x);
@@ -738,9 +746,20 @@ void do_enter(bool undoing)
 
     openfile->placewewant = xplustabs();
 
+#ifndef NANO_TINY
+    if (!undoing)
+	update_undo(ENTER);
+#endif
+
     edit_refresh_needed = TRUE;
 }
 
+/* Need this again... */
+void do_enter_void(void)
+{
+    do_enter(FALSE);
+}
+
 #ifndef NANO_TINY
 /* Send a SIGKILL (unconditional kill) to the forked process in
  * execute_command(). */
@@ -763,13 +782,12 @@ bool execute_command(const char *command)
 
     /* Make our pipes. */
     if (pipe(fd) == -1) {
-	statusbar(_("Could not pipe"));
+	statusbar(_("Could not create pipe"));
 	return FALSE;
     }
 
-    /* Check $SHELL for the shell to use.  If it isn't set, use
-     * /bin/sh.  Note that $SHELL should contain only a path, with no
-     * arguments. */
+    /* Check $SHELL for the shell to use.  If it isn't set, use /bin/sh.
+     * Note that $SHELL should contain only a path, with no arguments. */
     shellenv = getenv("SHELL");
     if (shellenv == NULL)
 	shellenv = (char *) "/bin/sh";
@@ -835,26 +853,23 @@ bool execute_command(const char *command)
     return TRUE;
 }
 
-/* Add a new undo struct to the top of the current pile */
+/* Add a new undo struct to the top of the current pile. */
 void add_undo(undo_type current_action)
 {
     undo *u;
     char *data;
     openfilestruct *fs = openfile;
-    static undo *last_cutu = NULL; /* Last thing we cut to set up the undo for uncut */
-    ssize_t wrap_loc;	/* For calculating split beginning */
-
-    if (!ISSET(UNDOABLE))
-	return;
+	/* Last thing we cut to set up the undo for uncut. */
 
-    /* Ugh, if we were called while cutting not-to-end, non-marked and on the same lineno,
-       we need to  abort here */
+    /* Ugh, if we were called while cutting not-to-end, non-marked, and
+     * on the same lineno, we need to abort here. */
     u = fs->current_undo;
-    if (current_action == CUT && u && u->type == CUT 
-	&& !u->mark_set && u->lineno == fs->current->lineno)
+    if (u && u->mark_begin_lineno == fs->current->lineno &&
+	((current_action == CUT && u->type == CUT && !u->mark_set && keeping_cutbuffer()) ||
+	(current_action == ADD && u->type == ADD && u->mark_begin_x == fs->current_x)))
 	return;
 
-    /* Blow away the old undo stack if we are starting from the middle */
+    /* Blow away the old undo stack if we are starting from the middle. */
     while (fs->undotop != NULL && fs->undotop != fs->current_undo) {
 	undo *u2 = fs->undotop;
 	fs->undotop = fs->undotop->next;
@@ -865,83 +880,101 @@ void add_undo(undo_type current_action)
 	free(u2);
     }
 
-    /* Allocate and initialize a new undo type */
+    /* Allocate and initialize a new undo type. */
     u = (undo *) nmalloc(sizeof(undo));
     u->type = current_action;
     u->lineno = fs->current->lineno;
     u->begin = fs->current_x;
-    u->next = fs->undotop;
-    fs->undotop = u;
-    fs->current_undo = u;
+#ifndef DISABLE_WRAPPING
+    if (u->type == SPLIT_BEGIN) {
+	/* Some action, most likely an ADD, was performed that invoked
+	 * do_wrap().  Rearrange the undo order so that this previous
+	 * action is after the SPLIT_BEGIN undo. */
+	u->next = fs->undotop->next ;
+	fs->undotop->next = u;
+    } else
+#endif
+    {
+	u->next = fs->undotop;
+	fs->undotop = u;
+	fs->current_undo = u;
+    }
     u->strdata = NULL;
-    u->strdata2 = NULL;
     u->cutbuffer = NULL;
-    u->cutbottom  = NULL;
-    u->mark_set = 0;
-    u->mark_begin_lineno = 0;
-    u->mark_begin_x = 0;
+    u->cutbottom = NULL;
+    u->mark_set = FALSE;
+    u->mark_begin_lineno = fs->current->lineno;
+    u->mark_begin_x = fs->current_x;
     u->xflags = 0;
-    u->to_end = FALSE;
 
     switch (u->type) {
-    /* We need to start copying data into the undo buffer or we wont be able
-       to restore it later */
+    /* We need to start copying data into the undo buffer
+     * or we won't be able to restore it later. */
     case ADD:
-        data = charalloc(2);
-        data[0] = fs->current->data[fs->current_x];
-        data[1] = '\0';
-        u->strdata = data;
 	break;
+    case BACK:
     case DEL:
 	if (u->begin != strlen(fs->current->data)) {
-            data = mallocstrncpy(NULL, &fs->current->data[u->begin], 2);
-            data[1] = '\0';
-            u->strdata = data;
+	    char *char_buf = charalloc(mb_cur_max() + 1);
+	    int char_buf_len = parse_mbchar(&fs->current->data[u->begin], char_buf, NULL);
+	    null_at(&char_buf, char_buf_len);
+	    u->strdata = char_buf;
+	    if (u->type == BACK)
+		u->mark_begin_x += char_buf_len;
 	    break;
 	}
-	/* Else purposely fall into unsplit code */
-	current_action = u->type = UNSPLIT;
-    case UNSPLIT:
+	/* Else purposely fall into the line-joining code. */
+    case JOIN:
 	if (fs->current->next) {
+	    if (u->type == BACK) {
+		u->lineno = fs->current->next->lineno;
+		u->begin = 0;
+	    }
 	    data = mallocstrcpy(NULL, fs->current->next->data);
 	    u->strdata = data;
 	}
+	current_action = u->type = JOIN;
 	break;
 #ifndef DISABLE_WRAPPING
-    case SPLIT:
-	wrap_loc = break_line(openfile->current->data, fill
-#ifndef DISABLE_HELP
-	, FALSE
-#endif
-	);
-	u->strdata = mallocstrcpy(NULL, &openfile->current->data[wrap_loc]);
-	/* Don't both saving the next line if we're not prepending as a new line
-	   will be created */
-	if (prepend_wrap)
-	    u->strdata2 = mallocstrcpy(NULL, fs->current->next->data);
-	u->begin = wrap_loc;
+    case SPLIT_BEGIN:
+	current_action = fs->undotop->type;
+	break;
+    case SPLIT_END:
 	break;
-#endif /* DISABLE_WRAPPING */
+#endif /* !DISABLE_WRAPPING */
     case INSERT:
+	break;
     case REPLACE:
 	data = mallocstrcpy(NULL, fs->current->data);
 	u->strdata = data;
 	break;
+    case CUT_EOF:
+	cutbuffer_reset();
+	break;
     case CUT:
+	cutbuffer_reset();
 	u->mark_set = openfile->mark_set;
 	if (u->mark_set) {
 	    u->mark_begin_lineno = openfile->mark_begin->lineno;
 	    u->mark_begin_x = openfile->mark_begin_x;
 	}
-	u->to_end = (ISSET(CUT_TO_END)) ? TRUE : FALSE;
-	last_cutu = u;
+	else if (!ISSET(CUT_TO_END)) {
+	    /* The entire line is being cut regardless of the cursor position. */
+	    u->begin = 0;
+	    u->xflags = UNcut_cutline;
+	}
 	break;
-    case UNCUT:
-	if (!last_cutu)
-	    statusbar(_("Internal error: can't setup uncut.  Please save your work."));
-	else if (last_cutu->type == CUT) {
-	    u->cutbuffer = last_cutu->cutbuffer;
-	    u->cutbottom = last_cutu->cutbottom;
+    case PASTE:
+	if (!cutbuffer)
+	    statusbar(_("Internal error: cannot set up uncut.  Please save your work."));
+	else {
+	    if (u->cutbuffer)
+		free_filestruct(u->cutbuffer);
+	    u->cutbuffer = copy_filestruct(cutbuffer);
+	    u->mark_begin_lineno = fs->current->lineno;
+	    u->mark_begin_x = fs->current_x;
+	    u->lineno = fs->current->lineno + cutbottom->lineno - cutbuffer->lineno;
+	    u->mark_set = TRUE;
 	}
 	break;
     case ENTER:
@@ -952,43 +985,37 @@ void add_undo(undo_type current_action)
     }
 
 #ifdef DEBUG
-    fprintf(stderr, "fs->current->data = \"%s\", current_x = %lu, u->begin = %d, type = %d\n",
-			fs->current->data,  (unsigned long) fs->current_x, u->begin, current_action);
+    fprintf(stderr, "fs->current->data = \"%s\", current_x = %lu, u->begin = %lu, type = %d\n",
+			fs->current->data, (unsigned long)fs->current_x, (unsigned long)u->begin, current_action);
     fprintf(stderr, "left add_undo...\n");
 #endif
     fs->last_action = current_action;
 }
 
-/* Update an undo item, or determine whether a new one
-   is really needed and bounce the data to add_undo
-   instead.  The latter functionality just feels
-   gimmicky and may just be more hassle than
-   it's worth, so it should be axed if needed. */
+/* Update an undo item, or determine whether a new one is really needed
+ * and bounce the data to add_undo instead.  The latter functionality
+ * just feels gimmicky and may just be more hassle than it's worth,
+ * so it should be axed if needed. */
 void update_undo(undo_type action)
 {
     undo *u;
-    char *data;
-    int len = 0;
     openfilestruct *fs = openfile;
 
-    if (!ISSET(UNDOABLE))
-	return;
-
 #ifdef DEBUG
-        fprintf(stderr, "action = %d, fs->last_action = %d,  openfile->current->lineno = %lu",
-		action, fs->last_action, (unsigned long) openfile->current->lineno);
+fprintf(stderr, "action = %d, fs->last_action = %d, openfile->current->lineno = %ld",
+		action, fs->last_action, (long)openfile->current->lineno);
 	if (fs->current_undo)
-	    fprintf(stderr, "fs->current_undo->lineno = %lu\n",  (unsigned long) fs->current_undo->lineno);
+	    fprintf(stderr, "fs->current_undo->lineno = %ld\n", (long)fs->current_undo->lineno);
 	else
 	    fprintf(stderr, "\n");
 #endif
 
     /* Change to an add if we're not using the same undo struct
-       that we should be using */
+     * that we should be using. */
     if (action != fs->last_action
-	|| (action != CUT && action != INSERT && action != SPLIT
+	|| (action != ENTER && action != CUT && action != INSERT
 	    && openfile->current->lineno != fs->current_undo->lineno)) {
-        add_undo(action);
+	add_undo(action);
 	return;
     }
 
@@ -996,103 +1023,103 @@ void update_undo(undo_type action)
     u = fs->undotop;
 
     switch (u->type) {
-    case ADD:
+    case ADD: {
 #ifdef DEBUG
-        fprintf(stderr, "fs->current->data = \"%s\", current_x = %lu, u->begin = %d\n",
-			fs->current->data, (unsigned long) fs->current_x, u->begin);
-#endif
-        len = strlen(u->strdata) + 2;
-        data = (char *) nrealloc((void *) u->strdata, len * sizeof(char *));
-        data[len-2] = fs->current->data[fs->current_x];
-        data[len-1] = '\0';
-        u->strdata = (char *) data;
+	fprintf(stderr, "fs->current->data = \"%s\", current_x = %lu, u->begin = %lu\n",
+			fs->current->data, (unsigned long)fs->current_x, (unsigned long)u->begin);
+#endif
+	char *char_buf = charalloc(mb_cur_max());
+	size_t char_buf_len = parse_mbchar(&fs->current->data[u->mark_begin_x], char_buf, NULL);
+	u->strdata = addstrings(u->strdata, u->strdata ? strlen(u->strdata) : 0, char_buf, char_buf_len);
 #ifdef DEBUG
 	fprintf(stderr, "current undo data now \"%s\"\n", u->strdata);
 #endif
+	u->mark_begin_lineno = fs->current->lineno;
+	u->mark_begin_x = fs->current_x;
 	break;
-    case DEL:
-	len = strlen(u->strdata) + 2;
-	assert(len > 2);
-        if (fs->current_x == u->begin) {
-	    /* They're deleting */
-	    if (!u->xflags)
-		u->xflags = UNDO_DEL_DEL;
-	    else if (u->xflags != UNDO_DEL_DEL) {
-		add_undo(action);
-		return;
-	    }
-	    data = charalloc(len);
-	    strcpy(data, u->strdata);
-	    data[len-2] = fs->current->data[fs->current_x];;
-	    data[len-1] = '\0';
-	    free(u->strdata);
-	    u->strdata = data;
-	} else if (fs->current_x == u->begin - 1) {
-	    /* They're backspacing */
-	    if (!u->xflags)
-		u->xflags = UNDO_DEL_BACKSPACE;
-	    else if (u->xflags != UNDO_DEL_BACKSPACE) {
-		add_undo(action);
-		return;
-	    }
-	    data = charalloc(len);
-	    data[0] = fs->current->data[fs->current_x];
-	    strcpy(&data[1], u->strdata);
-	    free(u->strdata);
-	    u->strdata = data;
-	    u->begin--;
+    }
+    case BACK:
+    case DEL: {
+	char *char_buf = charalloc(mb_cur_max());
+	size_t char_buf_len = parse_mbchar(&fs->current->data[fs->current_x], char_buf, NULL);
+	if (fs->current_x == u->begin) {
+	    /* They're deleting. */
+	    u->strdata = addstrings(u->strdata, strlen(u->strdata), char_buf, char_buf_len);
+	    u->mark_begin_x = fs->current_x;
+	} else if (fs->current_x == u->begin - char_buf_len) {
+	    /* They're backspacing. */
+	    u->strdata = addstrings(char_buf, char_buf_len, u->strdata, strlen(u->strdata));
+	    u->begin = fs->current_x;
 	} else {
-	    /* They deleted something else on the line */
-	    add_undo(DEL);
+	    /* They deleted something else on the line. */
+	    free(char_buf);
+	    add_undo(u->type);
 	    return;
 	}
 #ifdef DEBUG
-	fprintf(stderr, "current undo data now \"%s\"\nu->begin = %d\n", u->strdata, u->begin);
+	fprintf(stderr, "current undo data now \"%s\"\nu->begin = %lu\n", u->strdata, (unsigned long)u->begin);
 #endif
 	break;
+    }
+    case CUT_EOF:
     case CUT:
 	if (!cutbuffer)
 	    break;
 	if (u->cutbuffer)
-	    free(u->cutbuffer);
+	    free_filestruct(u->cutbuffer);
 	u->cutbuffer = copy_filestruct(cutbuffer);
-        /* Compute cutbottom for the uncut using out copy */
-        for (u->cutbottom = u->cutbuffer; u->cutbottom->next != NULL; u->cutbottom = u->cutbottom->next)
-            ;
+	if (u->mark_set) {
+	    /* If the "marking" operation was from right-->left or
+	     * bottom-->top, then swap the mark points. */
+	    if ((u->lineno == u->mark_begin_lineno && u->begin < u->mark_begin_x)
+			|| u->lineno < u->mark_begin_lineno) {
+		size_t x_loc = u->begin;
+		u->begin = u->mark_begin_x;
+		u->mark_begin_x = x_loc;
+
+		ssize_t line = u->lineno;
+		u->lineno = u->mark_begin_lineno;
+		u->mark_begin_lineno = line;
+	    } else
+		u->xflags = UNcut_marked_forward;
+	} else {
+	    /* Compute cutbottom for the uncut using our copy. */
+	    u->cutbottom = u->cutbuffer;
+	    while (u->cutbottom->next != NULL)
+		u->cutbottom = u->cutbottom->next;
+	    u->lineno = u->mark_begin_lineno + u->cutbottom->lineno - u->cutbuffer->lineno;
+	    if (ISSET(CUT_TO_END) || u->type == CUT_EOF) {
+		u->begin = strlen(u->cutbottom->data);
+		if(u->lineno == u->mark_begin_lineno)
+		u->begin += u->mark_begin_x;
+	    }
+	}
 	break;
     case REPLACE:
-    case UNCUT:
-	add_undo(action);
+    case PASTE:
+	u->begin = fs->current_x;
+	u->lineno = openfile->current->lineno;
 	break;
     case INSERT:
 	u->mark_begin_lineno = openfile->current->lineno;
 	break;
-#ifndef DISABLE_WRAPPING
-    case SPLIT:
-	/* This will only be called if we made a completely new line,
-	   and as such we should note that so we can destroy it later */
-	u->xflags = UNDO_SPLIT_MADENEW;
-	break;
-#endif /* DISABLE_WRAPPING */
-    case UNSPLIT:
-	/* These cases are handled by the earlier check for a new line and action */
     case ENTER:
+	u->mark_begin_x = fs->current_x;
+	break;
+#ifndef DISABLE_WRAPPING
+    case SPLIT_BEGIN:
+    case SPLIT_END:
+#endif /* !DISABLE_WRAPPING */
+    case JOIN:
+	/* These cases are handled by the earlier check for a new line and action. */
     case OTHER:
 	break;
     }
 
 #ifdef DEBUG
-    fprintf(stderr, "Done in udpate_undo (type was %d)\n", action);
-#endif
-    if (fs->last_action != action) {
-#ifdef DEBUG
-	fprintf(stderr, "Starting add_undo for new action as it does not match last_action\n");
+    fprintf(stderr, "Done in update_undo (type was %d)\n", action);
 #endif
-	add_undo(action);
-    }
-    fs->last_action = action;
 }
-
 #endif /* !NANO_TINY */
 
 #ifndef DISABLE_WRAPPING
@@ -1103,10 +1130,8 @@ void wrap_reset(void)
     prepend_wrap = FALSE;
 }
 
-/* We wrap the given line.  Precondition: we assume the cursor has been
- * moved forward since the last typed character.  Return TRUE if we
- * wrapped, and FALSE otherwise. */
-bool do_wrap(filestruct *line, bool undoing)
+/* Try wrapping the given line.  Return TRUE if wrapped, FALSE otherwise. */
+bool do_wrap(filestruct *line)
 {
     size_t line_len;
 	/* The length of the line we wrap. */
@@ -1122,16 +1147,10 @@ bool do_wrap(filestruct *line, bool undoing)
 	/* The text after the wrap point. */
     size_t after_break_len;
 	/* The length of after_break. */
-    bool prepending = FALSE;
-	/* Do we prepend to the next line? */
     const char *next_line = NULL;
 	/* The next line, minus indentation. */
     size_t next_line_len = 0;
 	/* The length of next_line. */
-    char *new_line = NULL;
-	/* The line we create. */
-    size_t new_line_len = 0;
-	/* The eventual length of new_line. */
 
     /* There are three steps.  First, we decide where to wrap.  Then, we
      * create the new wrap line.  Finally, we clean up. */
@@ -1171,9 +1190,6 @@ bool do_wrap(filestruct *line, bool undoing)
 	return FALSE;
 
 #ifndef NANO_TINY
-    if (!undoing)
-	add_undo(SPLIT);
-
     /* If autoindent is turned on, and we're on the character just after
      * the indentation, we don't wrap. */
     if (ISSET(AUTOINDENT)) {
@@ -1184,8 +1200,14 @@ bool do_wrap(filestruct *line, bool undoing)
 	if (wrap_loc == indent_len)
 	    return FALSE;
     }
+
+    add_undo(SPLIT_BEGIN);
 #endif
 
+    size_t old_x = openfile->current_x;
+    filestruct * oldLine = openfile->current;
+    openfile->current = line;
+
     /* Step 2, making the new wrap line.  It will consist of indentation
      * followed by the text after the wrap point, optionally followed by
      * a space (if the text after the wrap point doesn't end in a blank)
@@ -1205,9 +1227,15 @@ bool do_wrap(filestruct *line, bool undoing)
 	const char *end = after_break + move_mbleft(after_break,
 		after_break_len);
 
+	/* Go to the end of the line. */
+	openfile->current_x = line_len;
+
 	/* If after_break doesn't end in a blank, make sure it ends in a
 	 * space. */
 	if (!is_blank_mbchar(end)) {
+#ifndef NANO_TINY
+	    add_undo(ADD);
+#endif
 	    line_len++;
 	    line->data = charealloc(line->data, line_len + 1);
 	    line->data[line_len - 1] = ' ';
@@ -1215,126 +1243,42 @@ bool do_wrap(filestruct *line, bool undoing)
 	    after_break = line->data + wrap_loc;
 	    after_break_len++;
 	    openfile->totsize++;
+	    openfile->current_x++;
+#ifndef NANO_TINY
+	    update_undo(ADD);
+#endif
 	}
 
 	next_line = line->next->data;
 	next_line_len = strlen(next_line);
 
 	if (after_break_len + next_line_len <= fill) {
-	    prepending = TRUE;
-	    new_line_len += next_line_len;
+	    /* Delete the LF to join the two lines. */
+	    do_delete();
+	    /* Delete any leading blanks from the joined-on line. */
+	    while (is_blank_mbchar(&line->data[openfile->current_x]))
+		do_delete();
+	    renumber(line);
 	}
     }
 
-    /* new_line_len is now the length of the text that will be wrapped
-     * to the next line, plus (if we're prepending to it) the length of
-     * the text of the next line. */
-    new_line_len += after_break_len;
+    /* Go to the wrap location and split the line there. */
+    openfile->current_x = wrap_loc;
+    do_enter(FALSE);
 
-#ifndef NANO_TINY
-    if (ISSET(AUTOINDENT)) {
-	if (prepending) {
-	    /* If we're prepending, the indentation will come from the
-	     * next line. */
-	    indent_string = next_line;
-	    indent_len = indent_length(indent_string);
-	    next_line += indent_len;
-	} else {
-	    /* Otherwise, it will come from this line, in which case
-	     * we should increase new_line_len to make room for it. */
-	    new_line_len += indent_len;
-	    openfile->totsize += mbstrnlen(indent_string, indent_len);
-	}
-    }
-#endif
-
-    /* Now we allocate the new line and copy the text into it. */
-    new_line = charalloc(new_line_len + 1);
-    new_line[0] = '\0';
-
-#ifndef NANO_TINY
-    if (ISSET(AUTOINDENT)) {
-	/* Copy the indentation. */
-	strncpy(new_line, indent_string, indent_len);
-	new_line[indent_len] = '\0';
-	new_line_len += indent_len;
-    }
-#endif
-
-    /* Copy all the text after the wrap point of the current line. */
-    strcat(new_line, after_break);
-
-    /* Break the current line at the wrap point. */
-    null_at(&line->data, wrap_loc);
-
-    if (prepending) {
-	if (!undoing)
-	    update_undo(SPLIT);
-	/* If we're prepending, copy the text from the next line, minus
-	 * the indentation that we already copied above. */
-	strcat(new_line, next_line);
-
-	free(line->next->data);
-	line->next->data = new_line;
-
-	/* If the NO_NEWLINES flag isn't set, and text has been added to
-	 * the magicline, make a new magicline. */
-	if (!ISSET(NO_NEWLINES) && openfile->filebot->data[0] != '\0')
-	    new_magicline();
+    if (old_x < wrap_loc) {
+	openfile->current_x = old_x;
+	openfile->current = oldLine;
+	prepend_wrap = TRUE;
     } else {
-	/* Otherwise, make a new line and copy the text after where we
-	 * broke this line to the beginning of the new line. */
-	splice_node(openfile->current, make_new_node(openfile->current),
-		openfile->current->next);
-
-	/* If the current line is the last line of the file, move the
-	 * last line of the file down to the next line. */
-	if (openfile->filebot == openfile->current)
-	    openfile->filebot = openfile->current->next;
-
-	openfile->current->next->data = new_line;
-
-	openfile->totsize++;
-    }
-
-    /* Step 3, clean up.  Reposition the cursor and mark, and do some
-     * other sundry things. */
-
-    /* Set the prepend_wrap flag, so that later wraps of this line will
-     * be prepended to the next line. */
-    prepend_wrap = TRUE;
-
-    /* Each line knows its number.  We recalculate these if we inserted
-     * a new line. */
-    if (!prepending)
-	renumber(line);
-
-    /* If the cursor was after the break point, we must move it.  We
-     * also clear the prepend_wrap flag in this case. */
-    if (openfile->current_x > wrap_loc) {
+	openfile->current_x += (old_x - wrap_loc);
 	prepend_wrap = FALSE;
-
-	openfile->current = openfile->current->next;
-	openfile->current_x -= wrap_loc
-#ifndef NANO_TINY
-		- indent_len
-#endif
-		;
-	openfile->placewewant = xplustabs();
     }
 
+    openfile->placewewant = xplustabs();
+
 #ifndef NANO_TINY
-    /* If the mark was on this line after the wrap point, we move it
-     * down.  If it was on the next line and we prepended to that line,
-     * we move it right. */
-    if (openfile->mark_set) {
-	if (openfile->mark_begin == line && openfile->mark_begin_x >
-		wrap_loc) {
-	    openfile->mark_begin = line->next;
-	    openfile->mark_begin_x -= wrap_loc - indent_len + 1;
-	} else if (prepending && openfile->mark_begin == line->next)
-	    openfile->mark_begin_x += after_break_len;
-    }
+    add_undo(SPLIT_END);
 #endif
 
     return TRUE;
@@ -1346,7 +1290,7 @@ bool do_wrap(filestruct *line, bool undoing)
  * that the display length to there is at most (goal + 1).  If there is
  * no such blank, then we find the first blank.  We then take the last
  * blank in that group of blanks.  The terminating '\0' counts as a
- * blank, as does a '\n' if newline is TRUE. */
+ * blank, as does a '\n' if newln is TRUE. */
 ssize_t break_line(const char *line, ssize_t goal
 #ifndef DISABLE_HELP
 	, bool newln
@@ -1355,17 +1299,18 @@ ssize_t break_line(const char *line, ssize_t goal
 {
     ssize_t blank_loc = -1;
 	/* Current tentative return value.  Index of the last blank we
-	 * found with short enough display width.  */
+	 * found with short enough display width. */
     ssize_t cur_loc = 0;
 	/* Current index in line. */
     size_t cur_pos = 0;
 	/* Current column position in line. */
-    int line_len;
+    int char_len = 0;
+	/* Length of current character, in bytes. */
 
     assert(line != NULL);
 
     while (*line != '\0' && goal >= cur_pos) {
-	line_len = parse_mbchar(line, NULL, &cur_pos);
+	char_len = parse_mbchar(line, NULL, &cur_pos);
 
 	if (is_blank_mbchar(line)
 #ifndef DISABLE_HELP
@@ -1380,8 +1325,8 @@ ssize_t break_line(const char *line, ssize_t goal
 #endif
 	}
 
-	line += line_len;
-	cur_loc += line_len;
+	line += char_len;
+	cur_loc += char_len;
     }
 
     if (goal >= cur_pos)
@@ -1390,34 +1335,34 @@ ssize_t break_line(const char *line, ssize_t goal
 
 #ifndef DISABLE_HELP
     if (newln && blank_loc <= 0) {
-       /* If blank was not found or was found only first character,
-        * force line break. */
-       cur_loc -= line_len;
-       return cur_loc;
+	/* If no blank was found, or was found only as the first
+	 * character, force a line break. */
+	cur_loc -= char_len;
+	return cur_loc;
     }
 #endif
 
     if (blank_loc == -1) {
-	/* No blank was found that was short enough. */
+	/* No blank was found within the goal width,
+	 * so now try and find a blank beyond it. */
 	bool found_blank = FALSE;
 	ssize_t found_blank_loc = 0;
 
 	while (*line != '\0') {
-	    line_len = parse_mbchar(line, NULL, NULL);
+	    char_len = parse_mbchar(line, NULL, NULL);
 
 	    if (is_blank_mbchar(line)
 #ifndef DISABLE_HELP
 		|| (newln && *line == '\n')
 #endif
 		) {
-		if (!found_blank)
-		    found_blank = TRUE;
+		found_blank = TRUE;
 		found_blank_loc = cur_loc;
 	    } else if (found_blank)
 		return found_blank_loc;
 
-	    line += line_len;
-	    cur_loc += line_len;
+	    line += char_len;
+	    cur_loc += char_len;
 	}
 
 	return -1;
@@ -1426,23 +1371,14 @@ ssize_t break_line(const char *line, ssize_t goal
     /* Move to the last blank after blank_loc, if there is one. */
     line -= cur_loc;
     line += blank_loc;
-    line_len = parse_mbchar(line, NULL, NULL);
-    line += line_len;
-
-    while (*line != '\0' && (is_blank_mbchar(line)
-#ifndef DISABLE_HELP
-	|| (newln && *line == '\n')
-#endif
-	)) {
-#ifndef DISABLE_HELP
-	if (newln && *line == '\n')
-	    break;
-#endif
+    char_len = parse_mbchar(line, NULL, NULL);
+    line += char_len;
 
-	line_len = parse_mbchar(line, NULL, NULL);
+    while (*line != '\0' && is_blank_mbchar(line)) {
+	char_len = parse_mbchar(line, NULL, NULL);
 
-	line += line_len;
-	blank_loc += line_len;
+	line += char_len;
+	blank_loc += char_len;
     }
 
     return blank_loc;
@@ -1804,7 +1740,7 @@ void backup_lines(filestruct *first_line, size_t par_len)
 
     /* Copy the paragraph back to the current buffer's filestruct from
      * the justify buffer. */
-    copy_from_filestruct(jusbuffer, jusbottom);
+    copy_from_filestruct(jusbuffer);
 
     /* Move upward from the last line of the paragraph to the first
      * line, putting first_line, edittop, current, and mark_begin at the
@@ -1947,6 +1883,10 @@ void do_justify(bool full_justify)
     bool filebot_inpar = FALSE;
 	/* Whether the text at filebot is part of the current
 	 * paragraph. */
+    int kbinput;
+	/* The first keystroke after a justification. */
+    functionptrtype func;
+	/* The function associated with that keystroke. */
 
     /* We save these variables to be restored if the user
      * unjustifies. */
@@ -1961,10 +1901,6 @@ void do_justify(bool full_justify)
 #endif
     bool modified_save = openfile->modified;
 
-    int kbinput;
-    bool meta_key, func_key, s_or_t, ran_func, finished;
-    const sc *s;
-
     /* Move to the beginning of the current line, so that justifying at
      * the end of the last line of the file, if that line isn't blank,
      * will work the first time through. */
@@ -1974,6 +1910,10 @@ void do_justify(bool full_justify)
     if (full_justify)
 	openfile->current = openfile->fileage;
 
+#ifndef NANO_TINY
+    allow_pending_sigwinch(FALSE);
+#endif
+
     while (TRUE) {
 	size_t i;
 	    /* Generic loop variable. */
@@ -2272,16 +2212,16 @@ void do_justify(bool full_justify)
 	do_cursorpos(TRUE);
 
     /* Display the shortcut list with UnJustify. */
-    shortcut_init(TRUE);
+    uncutfunc->desc = unjust_tag;
+    currmenu = MMAIN;
     display_main_list();
 
     /* Now get a keystroke and see if it's unjustify.  If not, put back
      * the keystroke and return. */
-    kbinput = do_input(&meta_key, &func_key, &s_or_t, &ran_func,
-	&finished, FALSE);
-    s = get_shortcut(currmenu, &kbinput, &meta_key, &func_key);
+    kbinput = do_input(FALSE);
+    func = func_from_key(&kbinput);
 
-    if (s && s->scfunc == DO_UNCUT_TEXT) {
+    if (func == do_uncut_text) {
 	/* Splice the justify buffer back into the file, but only if we
 	 * actually justified something. */
 	if (first_par_line != NULL) {
@@ -2342,8 +2282,12 @@ void do_justify(bool full_justify)
     blank_statusbar();
 
     /* Display the shortcut list with UnCut. */
-    shortcut_init(FALSE);
+    uncutfunc->desc = uncut_tag;
     display_main_list();
+
+#ifndef NANO_TINY
+    allow_pending_sigwinch(TRUE);
+#endif
 }
 
 /* Justify the current paragraph. */
@@ -2367,7 +2311,6 @@ bool do_int_spell_fix(const char *word)
     char *save_search, *save_replace;
     size_t match_len, current_x_save = openfile->current_x;
     size_t pww_save = openfile->placewewant;
-    bool meta_key = FALSE, func_key = FALSE;
     filestruct *edittop_save = openfile->edittop;
     filestruct *current_save = openfile->current;
 	/* Save where we are. */
@@ -2455,8 +2398,7 @@ bool do_int_spell_fix(const char *word)
 		TRUE,
 #endif
 		MSPELL, word,
-		&meta_key, &func_key,
-#ifndef NANO_TINY
+#ifndef DISABLE_HISTORIES
 		NULL,
 #endif
 		edit_refresh, _("Edit a replacement")) == -1);
@@ -2692,7 +2634,7 @@ const char *do_int_speller(const char *tempfile_name)
     if (WIFEXITED(spell_status) == 0 || WEXITSTATUS(spell_status))
 	return _("Error invoking \"spell\"");
 
-    if (WIFEXITED(sort_status)  == 0 || WEXITSTATUS(sort_status))
+    if (WIFEXITED(sort_status) == 0 || WEXITSTATUS(sort_status))
 	return _("Error invoking \"sort -f\"");
 
     if (WIFEXITED(uniq_status) == 0 || WEXITSTATUS(uniq_status))
@@ -2719,9 +2661,10 @@ const char *do_alt_speller(char *tempfile_name)
 {
     int alt_spell_status;
     size_t current_x_save = openfile->current_x;
-    size_t pww_save = openfile->placewewant;
     ssize_t current_y_save = openfile->current_y;
     ssize_t lineno_save = openfile->current->lineno;
+    struct stat spellfileinfo;
+    __time_t timestamp;
     pid_t pid_spell;
     char *ptr;
     static int arglen = 3;
@@ -2730,9 +2673,6 @@ const char *do_alt_speller(char *tempfile_name)
     bool old_mark_set = openfile->mark_set;
     bool added_magicline = FALSE;
 	/* Whether we added a magicline after filebot. */
-    bool right_side_up = FALSE;
-	/* TRUE if (mark_begin, mark_begin_x) is the top of the mark,
-	 * FALSE if (current, current_x) is. */
     filestruct *top, *bot;
     size_t top_x, bot_x;
     ssize_t mb_lineno_save = 0;
@@ -2757,6 +2697,10 @@ const char *do_alt_speller(char *tempfile_name)
 	return NULL;
     }
 
+    /* Get the timestamp of the temporary file. */
+    stat(tempfile_name, &spellfileinfo);
+    timestamp = spellfileinfo.st_mtime;
+
     endwin();
 
     /* Set up an argument list to pass execvp(). */
@@ -2834,7 +2778,7 @@ const char *do_alt_speller(char *tempfile_name)
 	 * added when we're done correcting misspelled words; and
 	 * turn the mark off. */
 	mark_order((const filestruct **)&top, &top_x,
-		(const filestruct **)&bot, &bot_x, &right_side_up);
+		(const filestruct **)&bot, &bot_x, NULL);
 	filepart = partition_filestruct(top, top_x, bot, bot_x);
 	if (!ISSET(NO_NEWLINES))
 	    added_magicline = (openfile->filebot->data[0] != '\0');
@@ -2858,18 +2802,6 @@ const char *do_alt_speller(char *tempfile_name)
 	if (!ISSET(NO_NEWLINES) && added_magicline)
 	    remove_magicline();
 
-	/* Put the beginning and the end of the mark at the beginning
-	 * and the end of the spell-checked text. */
-	if (openfile->fileage == openfile->filebot)
-	    bot_x += top_x;
-	if (right_side_up) {
-	    openfile->mark_begin_x = top_x;
-	    current_x_save = bot_x;
-	} else {
-	    current_x_save = top_x;
-	    openfile->mark_begin_x = bot_x;
-	}
-
 	/* Unpartition the filestruct so that it contains all the text
 	 * again.  Note that we've replaced the marked text originally
 	 * in the partition with the spell-checked marked text in the
@@ -2885,8 +2817,7 @@ const char *do_alt_speller(char *tempfile_name)
 	openfile->totsize = totsize_save;
 
 	/* Assign mark_begin to the line where the mark began before. */
-	do_gotopos(mb_lineno_save, openfile->mark_begin_x,
-		current_y_save, 0);
+	goto_line_posx(mb_lineno_save, openfile->mark_begin_x);
 	openfile->mark_begin = openfile->current;
 
 	/* Assign mark_begin_x to the location in mark_begin where the
@@ -2899,9 +2830,16 @@ const char *do_alt_speller(char *tempfile_name)
     }
 #endif
 
-    /* Go back to the old position, and mark the file as modified. */
-    do_gotopos(lineno_save, current_x_save, current_y_save, pww_save);
-    set_modified();
+    /* Go back to the old position. */
+    goto_line_posx(lineno_save, current_x_save);
+    openfile->current_y = current_y_save;
+    edit_update(NONE);
+
+    /* Stat the temporary file again, and mark the buffer as modified only
+     * if this file was changed since it was written. */
+    stat(tempfile_name, &spellfileinfo);
+    if (spellfileinfo.st_mtime != timestamp)
+	set_modified();
 
 #ifndef NANO_TINY
     /* Handle a pending SIGWINCH again. */
@@ -2921,7 +2859,7 @@ void do_spell(void)
     const char *spell_msg;
 
     if (ISSET(RESTRICTED)) {
-        nano_disabled_msg();
+	nano_disabled_msg();
 	return;
     }
 
@@ -2943,6 +2881,10 @@ void do_spell(void)
 	return;
     }
 
+    blank_bottombars();
+    statusbar(_("Invoking spell checker, please wait"));
+    doupdate();
+
     spell_msg = (alt_speller != NULL) ? do_alt_speller(temp) :
 	do_int_speller(temp);
     unlink(temp);
@@ -2966,6 +2908,472 @@ void do_spell(void)
 }
 #endif /* !DISABLE_SPELLER */
 
+#ifndef DISABLE_COLOR
+/* Cleanup things to do after leaving the linter. */
+void lint_cleanup(void)
+{
+    currmenu = MMAIN;
+    display_main_list();
+}
+
+
+/* Run linter.  Based on alt-speller code.  Return NULL for normal
+ * termination, and the error string otherwise. */
+void do_linter(void)
+{
+    char *read_buff, *read_buff_ptr, *read_buff_word, *ptr;
+    size_t pipe_buff_size, read_buff_size, read_buff_read, bytesread;
+    size_t parsesuccess = 0;
+    int lint_fd[2];
+    pid_t pid_lint;
+    int lint_status;
+    static int arglen = 3;
+    static char **lintargs = NULL;
+    char *lintcopy;
+    char *convendptr = NULL;
+    lintstruct *lints = NULL, *tmplint = NULL, *curlint = NULL;
+
+    if (!openfile->syntax || !openfile->syntax->linter) {
+	statusbar(_("No linter defined for this type of file!"));
+	return;
+    }
+
+    if (ISSET(RESTRICTED)) {
+	nano_disabled_msg();
+	return;
+    }
+
+    if (openfile->modified) {
+	int i = do_yesno_prompt(FALSE, _("Save modified buffer before linting?"));
+	if (i == -1) {
+	    statusbar(_("Cancelled"));
+	    lint_cleanup();
+	    return;
+	} else if (i == 1) {
+	    if (do_writeout(FALSE) != TRUE) {
+		lint_cleanup();
+		return;
+	    }
+	}
+    }
+
+    lintcopy = mallocstrcpy(NULL, openfile->syntax->linter);
+    /* Create pipe up front. */
+    if (pipe(lint_fd) == -1) {
+	statusbar(_("Could not create pipe"));
+	lint_cleanup();
+	return;
+    }
+
+    blank_bottombars();
+    statusbar(_("Invoking linter, please wait"));
+    doupdate();
+
+    /* Set up an argument list to pass execvp(). */
+    if (lintargs == NULL) {
+	lintargs = (char **)nmalloc(arglen * sizeof(char *));
+
+	lintargs[0] = strtok(lintcopy, " ");
+	while ((ptr = strtok(NULL, " ")) != NULL) {
+	    arglen++;
+	    lintargs = (char **)nrealloc(lintargs, arglen *
+		sizeof(char *));
+	    lintargs[arglen - 3] = ptr;
+	}
+	lintargs[arglen - 1] = NULL;
+    }
+    lintargs[arglen - 2] = openfile->filename;
+
+    /* A new process to run linter. */
+    if ((pid_lint = fork()) == 0) {
+
+	/* Child continues (i.e. future spell process). */
+	close(lint_fd[0]);
+
+	/* Send spell's standard output/err to the pipe. */
+	if (dup2(lint_fd[1], STDOUT_FILENO) != STDOUT_FILENO)
+	    exit(1);
+	if (dup2(lint_fd[1], STDERR_FILENO) != STDERR_FILENO)
+	    exit(1);
+
+	close(lint_fd[1]);
+
+	/* Start the linter program; we are using $PATH. */
+	execvp(lintargs[0], lintargs);
+
+	/* This should not be reached if linter is found. */
+	exit(1);
+    }
+
+    /* Parent continues here. */
+    close(lint_fd[1]);
+
+    /* The child process was not forked successfully. */
+    if (pid_lint < 0) {
+	close(lint_fd[0]);
+	statusbar(_("Could not fork"));
+	lint_cleanup();
+	return;
+    }
+
+    /* Get the system pipe buffer size. */
+    if ((pipe_buff_size = fpathconf(lint_fd[0], _PC_PIPE_BUF)) < 1) {
+	close(lint_fd[0]);
+	statusbar(_("Could not get size of pipe buffer"));
+	lint_cleanup();
+	return;
+    }
+
+    /* Read in the returned spelling errors. */
+    read_buff_read = 0;
+    read_buff_size = pipe_buff_size + 1;
+    read_buff = read_buff_ptr = charalloc(read_buff_size);
+
+    while ((bytesread = read(lint_fd[0], read_buff_ptr,
+	pipe_buff_size)) > 0) {
+#ifdef DEBUG
+	fprintf(stderr, "text.c:do_linter:%ld bytes (%s)\n", (long)bytesread, read_buff_ptr);
+#endif
+	read_buff_read += bytesread;
+	read_buff_size += pipe_buff_size;
+	read_buff = read_buff_ptr = charealloc(read_buff,
+		read_buff_size);
+	read_buff_ptr += read_buff_read;
+    }
+
+    *read_buff_ptr = '\0';
+    close(lint_fd[0]);
+
+#ifdef DEBUG
+		fprintf(stderr, "text.c:do_lint:Raw output: %s\n", read_buff);
+#endif
+
+    /* Process output. */
+    read_buff_word = read_buff_ptr = read_buff;
+
+    while (*read_buff_ptr != '\0') {
+	if ((*read_buff_ptr == '\r') || (*read_buff_ptr == '\n')) {
+	    *read_buff_ptr = '\0';
+	    if (read_buff_word != read_buff_ptr) {
+		char *filename = NULL, *linestr = NULL, *maybecol = NULL;
+		char *message = mallocstrcpy(NULL, read_buff_word);
+
+		/* At the moment we're assuming the following formats:
+		 *
+		 * filenameorcategory:line:column:message (e.g. splint)
+		 * filenameorcategory:line:message        (e.g. pyflakes)
+		 * filenameorcategory:line,col:message    (e.g. pylint)
+		 *
+		 * This could be turned into some scanf() based parser,
+		 * but ugh. */
+		if ((filename = strtok(read_buff_word, ":")) != NULL) {
+		    if ((linestr = strtok(NULL, ":")) != NULL) {
+			if ((maybecol = strtok(NULL, ":")) != NULL) {
+			    ssize_t tmplineno = 0, tmpcolno = 0;
+			    char *tmplinecol;
+
+			    tmplineno = strtol(linestr, NULL, 10);
+			    if (tmplineno <= 0) {
+				read_buff_ptr++;
+				free(message);
+				continue;
+			    }
+
+			    tmpcolno = strtol(maybecol, &convendptr, 10);
+			    if (*convendptr != '\0') {
+				/* Previous field might still be
+				 * line,col format. */
+				strtok(linestr, ",");
+				if ((tmplinecol = strtok(NULL, ",")) != NULL)
+				    tmpcolno = strtol(tmplinecol, NULL, 10);
+			    }
+
+#ifdef DEBUG
+			    fprintf(stderr, "text.c:do_lint:Successful parse! %ld:%ld:%s\n", (long)tmplineno, (long)tmpcolno, message);
+#endif
+			    /* Nice.  We have a lint message we can use. */
+			    parsesuccess++;
+			    tmplint = curlint;
+			    curlint = nmalloc(sizeof(lintstruct));
+			    curlint->next = NULL;
+			    curlint->prev = tmplint;
+			    if (curlint->prev != NULL)
+				curlint->prev->next = curlint;
+			    curlint->msg = mallocstrcpy(NULL, message);
+			    curlint->lineno = tmplineno;
+			    curlint->colno = tmpcolno;
+			    curlint->filename = mallocstrcpy(NULL, filename);
+
+			    if (lints == NULL)
+				lints = curlint;
+			}
+		    }
+		} else
+		    free(message);
+	    }
+	    read_buff_word = read_buff_ptr + 1;
+	}
+	read_buff_ptr++;
+    }
+
+    /* Process the end of the lint process. */
+    waitpid(pid_lint, &lint_status, 0);
+
+    free(read_buff);
+
+    if (parsesuccess == 0) {
+	statusbar(_("Got 0 parsable lines from command: %s"), openfile->syntax->linter);
+	lint_cleanup();
+	return;
+    }
+
+    currmenu = MLINTER;
+    bottombars(MLINTER);
+    tmplint = NULL;
+    curlint = lints;
+    while (TRUE) {
+	ssize_t tmpcol = 1;
+	int kbinput;
+	functionptrtype func;
+
+	if (curlint->colno > 0)
+	    tmpcol = curlint->colno;
+
+	if (tmplint != curlint) {
+#ifndef NANO_TINY
+	    struct stat lintfileinfo;
+
+	    new_lint_loop:
+	    if (stat(curlint->filename, &lintfileinfo) != -1) {
+		if (openfile->current_stat->st_ino != lintfileinfo.st_ino) {
+		    openfilestruct *tmpof = openfile;
+		    while (tmpof != openfile->next) {
+			if (tmpof->current_stat->st_ino == lintfileinfo.st_ino)
+			    break;
+			tmpof = tmpof->next;
+		    }
+		    if (tmpof->current_stat->st_ino != lintfileinfo.st_ino) {
+			char *msg = charalloc(1024 + strlen(curlint->filename));
+			int i;
+
+			sprintf(msg, _("This message is for unopened file %s, open it in a new buffer?"),
+				curlint->filename);
+			i = do_yesno_prompt(FALSE, msg);
+			free(msg);
+			if (i == -1) {
+			    statusbar(_("Cancelled"));
+			    goto free_lints_and_return;
+			} else if (i == 1) {
+			    SET(MULTIBUFFER);
+			    open_buffer(curlint->filename, FALSE);
+			} else {
+			    char *dontwantfile = curlint->filename;
+
+			    while (curlint != NULL && !strcmp(curlint->filename, dontwantfile))
+				curlint = curlint->next;
+			    if (curlint == NULL) {
+				statusbar("No more errors in un-opened filed, cancelling");
+				break;
+			    } else
+				goto new_lint_loop;
+			}
+		    } else
+			openfile = tmpof;
+		}
+	    }
+#endif /* !NANO_TINY */
+	    do_gotolinecolumn(curlint->lineno, tmpcol, FALSE, FALSE, FALSE, FALSE);
+	    titlebar(NULL);
+	    edit_refresh();
+	    statusbar(curlint->msg);
+	    bottombars(MLINTER);
+	}
+
+	kbinput = get_kbinput(bottomwin);
+	func = func_from_key(&kbinput);
+	tmplint = curlint;
+
+	if (func == do_cancel)
+	    break;
+	else if (func == do_help_void) {
+	    tmplint = NULL;
+	    do_help_void();
+	} else if (func == do_page_down) {
+	    if (curlint->next != NULL)
+		curlint = curlint->next;
+	    else
+		statusbar(_("At last message"));
+	} else if (func == do_page_up) {
+	    if (curlint->prev != NULL)
+		curlint = curlint->prev;
+	    else
+		statusbar(_("At first message"));
+	}
+    }
+    blank_statusbar();
+#ifndef NANO_TINY
+free_lints_and_return:
+#endif
+    for (tmplint = lints; tmplint != NULL; tmplint = tmplint->next) {
+	free(tmplint->msg);
+	free(tmplint->filename);
+	free(tmplint);
+    }
+    lint_cleanup();
+}
+
+/* Run a formatter for the given syntax.
+ * Expects the formatter to be non-interactive and
+ * operate on a file in-place, which we'll pass it
+ * on the command line.  Another mashup of the speller
+ * and alt_speller routines.
+ */
+void do_formatter(void)
+{
+    bool status;
+    FILE *temp_file;
+    char *temp = safe_tempfile(&temp_file);
+    int format_status;
+    size_t current_x_save = openfile->current_x;
+    size_t pww_save = openfile->placewewant;
+    ssize_t current_y_save = openfile->current_y;
+    ssize_t lineno_save = openfile->current->lineno;
+    pid_t pid_format;
+    char *ptr;
+    static int arglen = 3;
+    static char **formatargs = NULL;
+    char *finalstatus = NULL;
+
+   /* Check whether we're using syntax highlighting
+    * and the formatter option is set. */
+    if (openfile->syntax == NULL || openfile->syntax->formatter == NULL) {
+	statusbar(_("Error: no formatter defined"));
+	return;
+    }
+
+    if (ISSET(RESTRICTED)) {
+	nano_disabled_msg();
+	return;
+    }
+
+    if (temp == NULL) {
+	statusbar(_("Error writing temp file: %s"), strerror(errno));
+	return;
+    }
+
+    /* We're not supporting partial formatting, oi vey. */
+    openfile->mark_set = FALSE;
+    status = write_file(temp, temp_file, TRUE, OVERWRITE, FALSE);
+
+    if (!status) {
+	statusbar(_("Error writing temp file: %s"), strerror(errno));
+	free(temp);
+	return;
+    }
+
+    if (openfile->totsize == 0) {
+	statusbar(_("Finished"));
+	return;
+    }
+
+    blank_bottombars();
+    statusbar(_("Invoking formatter, please wait"));
+    doupdate();
+
+    endwin();
+
+    /* Set up an argument list to pass execvp(). */
+    if (formatargs == NULL) {
+	formatargs = (char **)nmalloc(arglen * sizeof(char *));
+
+	formatargs[0] = strtok(openfile->syntax->formatter, " ");
+	while ((ptr = strtok(NULL, " ")) != NULL) {
+	    arglen++;
+	    formatargs = (char **)nrealloc(formatargs, arglen *
+		sizeof(char *));
+	    formatargs[arglen - 3] = ptr;
+	}
+	formatargs[arglen - 1] = NULL;
+    }
+    formatargs[arglen - 2] = temp;
+
+    /* Start a new process for the formatter. */
+    if ((pid_format = fork()) == 0) {
+	/* Start the formatting program; we are using $PATH. */
+	execvp(formatargs[0], formatargs);
+
+	/* Should not be reached, if the formatter is found! */
+	exit(1);
+    }
+
+    /* If we couldn't fork, get out. */
+    if (pid_format < 0) {
+	statusbar(_("Could not fork"));
+	return;
+    }
+
+#ifndef NANO_TINY
+    /* Don't handle a pending SIGWINCH until the alternate format checker
+     * is finished and we've loaded the format-checked file back in. */
+    allow_pending_sigwinch(FALSE);
+#endif
+
+    /* Wait for the formatter to finish. */
+    wait(&format_status);
+
+    /* Reenter curses mode. */
+    doupdate();
+
+    /* Restore the terminal to its previous state. */
+    terminal_init();
+
+    /* Turn the cursor back on for sure. */
+    curs_set(1);
+
+    /* The screen might have been resized.  If it has, reinitialize all
+     * the windows based on the new screen dimensions. */
+    window_init();
+
+    if (!WIFEXITED(format_status) ||
+		WEXITSTATUS(format_status) != 0) {
+	char *format_error;
+	char *invoke_error = _("Error invoking \"%s\"");
+
+	format_error =
+		charalloc(strlen(invoke_error) +
+		strlen(openfile->syntax->formatter) + 1);
+	sprintf(format_error, invoke_error, openfile->syntax->formatter);
+	finalstatus = format_error;
+    } else {
+	/* Replace the text of the current buffer with the formatted text. */
+	replace_buffer(temp);
+
+	/* Go back to the old position, and mark the file as modified. */
+	do_gotopos(lineno_save, current_x_save, current_y_save, pww_save);
+	set_modified();
+
+#ifndef NANO_TINY
+	/* Handle a pending SIGWINCH again. */
+	allow_pending_sigwinch(TRUE);
+#endif
+
+	finalstatus = _("Finished formatting");
+    }
+
+    unlink(temp);
+    free(temp);
+
+    currmenu = MMAIN;
+
+    /* If the formatter printed any error messages onscreen, make
+     * sure that they're cleared off. */
+    total_refresh();
+
+    statusbar(finalstatus);
+}
+
+#endif /* !DISABLE_COLOR */
+
 #ifndef NANO_TINY
 /* Our own version of "wc".  Note that its character counts are in
  * multibyte characters instead of single-byte characters. */
@@ -3071,4 +3479,3 @@ void do_verbatim_input(void)
 
     free(output);
 }
-
diff --git a/src/utils.c b/src/utils.c
index ff13a41..bed5f91 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,9 +1,9 @@
-/* $Id: utils.c 4453 2009-12-02 03:36:22Z astyanax $ */
+/* $Id: utils.c 4948 2014-06-09 14:23:53Z bens $ */
 /**************************************************************************
  *   utils.c                                                              *
  *                                                                        *
  *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009 Free Software Foundation, Inc.                            *
+ *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -72,6 +72,10 @@ bool parse_num(const char *str, ssize_t *val)
 
     assert(str != NULL);
 
+    /* The manual page for strtol() says this is required, and
+     * it looks like it is! */
+    errno = 0;
+
     j = (ssize_t)strtol(str, &first_error, 10);
 
     if (errno == ERANGE || *str == '\0' || *first_error != '\0')
@@ -183,7 +187,7 @@ void sunder(char *str)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301, USA. */
 
-#ifdef ENABLE_NANORC
+#ifndef DISABLE_NANORC
 
 #ifndef HAVE_GETDELIM
 /* This function is equivalent to getdelim(). */
@@ -243,7 +247,7 @@ ssize_t ngetline(char **lineptr, size_t *n, FILE *stream)
     return getdelim(lineptr, n, '\n', stream);
 }
 #endif
-#endif /* ENABLE_NANORC */
+#endif /* !DISABLE_NANORC */
 
 #ifdef HAVE_REGEX_H
 /* Do the compiled regex in preg and the regex in string match the
@@ -255,9 +259,10 @@ bool regexp_bol_or_eol(const regex_t *preg, const char *string)
 	REG_NOMATCH);
 }
 
-/* Fix the regex if we're on platforms which requires an adjustment
- * from GNU-style to BSD-style word boundaries.  */
-const char *fixbounds(const char *r) {
+/* Fix the regex if we're on platforms which require an adjustment
+ * from GNU-style to BSD-style word boundaries. */
+const char *fixbounds(const char *r)
+{
 #ifndef GNU_WORDBOUNDS
     int i, j = 0;
     char *r2 = charalloc(strlen(r) * 5);
@@ -268,15 +273,15 @@ const char *fixbounds(const char *r) {
 #endif
 
     for (i = 0; i < strlen(r); i++) {
-        if (r[i] != '\0' && r[i] == '\\' && (r[i+1] == '>' || r[i+1] == '<')) {
-            strcpy(&r2[j], "[[:");
-            r2[j+3] = r[i+1];
-            strcpy(&r2[j+4], ":]]");
-            i++;
-            j += 6;
-        } else
-            r2[j] = r[i];
-        j++;
+	if (r[i] != '\0' && r[i] == '\\' && (r[i + 1] == '>' || r[i + 1] == '<')) {
+	    strcpy(&r2[j], "[[:");
+	    r2[j + 3] = r[i + 1];
+	    strcpy(&r2[j + 4], ":]]");
+	    i++;
+	    j += 6;
+	} else
+	    r2[j] = r[i];
+	j++;
     }
     r2[j] = '\0';
     r3 = mallocstrcpy(NULL, r2);
@@ -472,7 +477,10 @@ size_t get_page_start(size_t column)
  * current_x. */
 size_t xplustabs(void)
 {
-    return strnlenpt(openfile->current->data, openfile->current_x);
+    if (openfile->current)
+	return strnlenpt(openfile->current->data, openfile->current_x);
+    else
+	return 0;
 }
 
 /* Return the index in s of the character displayed at the given column,
@@ -542,7 +550,7 @@ void new_magicline(void)
     openfile->filebot->next->prev = openfile->filebot;
     openfile->filebot->next->next = NULL;
     openfile->filebot->next->lineno = openfile->filebot->lineno + 1;
-#ifdef ENABLE_COLOR
+#ifndef DISABLE_COLOR
     openfile->filebot->next->multidata = NULL;
 #endif
     openfile->filebot = openfile->filebot->next;
@@ -594,7 +602,7 @@ void mark_order(const filestruct **top, size_t *top_x, const filestruct
 	    *right_side_up = FALSE;
     }
 }
-#endif
+#endif /* !NANO_TINY */
 
 /* Calculate the number of characters between begin and end, and return
  * it. */
@@ -626,7 +634,7 @@ size_t get_totsize(const filestruct *begin, const filestruct *end)
     return totsize;
 }
 
-/* Get back a pointer given a line number in the current openfilestruct */
+/* Get back a pointer given a line number in the current openfilestruct. */
 filestruct *fsfromline(ssize_t lineno)
 {
     filestruct *f = openfile->current;
diff --git a/src/winio.c b/src/winio.c
index 1aef2a9..086af41 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -1,9 +1,9 @@
-/* $Id: winio.c 4484 2010-03-07 19:35:46Z astyanax $ */
+/* $Id: winio.c 5149 2015-03-22 13:23:42Z bens $ */
 /**************************************************************************
  *   winio.c                                                              *
  *                                                                        *
  *   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,  *
- *   2008, 2009 Free Software Foundation, Inc.                            *
+ *   2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc.    *
  *   This program is free software; you can redistribute it and/or modify *
  *   it under the terms of the GNU General Public License as published by *
  *   the Free Software Foundation; either version 3, or (at your option)  *
@@ -112,7 +112,6 @@ void get_key_buffer(WINDOW *win)
     if (key_buffer != NULL)
 	return;
 
-    /* Read in the first character using blocking input. */
 #ifndef NANO_TINY
     allow_pending_sigwinch(TRUE);
 #endif
@@ -121,10 +120,11 @@ void get_key_buffer(WINDOW *win)
      * screen updates. */
     doupdate();
 
+    /* Read in the first character using whatever mode we're in. */
     errcount = 0;
     if (nodelay_mode) {
-	if ((input =  wgetch(win)) == ERR)
-           return;
+	if ((input = wgetch(win)) == ERR)
+	    return;
     } else
 	while ((input = wgetch(win)) == ERR) {
 	    errcount++;
@@ -174,7 +174,7 @@ void get_key_buffer(WINDOW *win)
 #endif
     }
 
-    /* Switch back to non-blocking input. */
+    /* Switch back to waiting mode for input. */
     nodelay(win, FALSE);
 
 #ifdef DEBUG
@@ -224,17 +224,17 @@ void unget_input(int *input, size_t input_len)
 }
 
 /* Put back the character stored in kbinput, putting it in byte range
- * beforehand.  If meta_key is TRUE, put back the Escape character after
- * putting back kbinput.  If func_key is TRUE, put back the function key
+ * beforehand.  If metakey is TRUE, put back the Escape character after
+ * putting back kbinput.  If funckey is TRUE, put back the function key
  * (a value outside byte range) without putting it in byte range. */
-void unget_kbinput(int kbinput, bool meta_key, bool func_key)
+void unget_kbinput(int kbinput, bool metakey, bool funckey)
 {
-    if (!func_key)
+    if (!funckey)
 	kbinput = (char)kbinput;
 
     unget_input(&kbinput, 1);
 
-    if (meta_key) {
+    if (metakey) {
 	kbinput = NANO_CONTROL_3;
 	unget_input(&kbinput, 1);
     }
@@ -298,20 +298,20 @@ int *get_input(WINDOW *win, size_t input_len)
 
 /* Read in a single character.  If it's ignored, swallow it and go on.
  * Otherwise, try to translate it from ASCII, meta key sequences, escape
- * sequences, and/or extended keypad values.  Set meta_key to TRUE when
- * we get a meta key sequence, and set func_key to TRUE when we get an
- * extended keypad value.  Supported extended keypad values consist of
+ * sequences, and/or extended keypad values.  Supported extended keypad
+ * values consist of
  * [arrow key], Ctrl-[arrow key], Shift-[arrow key], Enter, Backspace,
  * the editing keypad (Insert, Delete, Home, End, PageUp, and PageDown),
  * the function keypad (F1-F16), and the numeric keypad with NumLock
- * off.  Assume nodelay(win) is FALSE. */
-int get_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
+ * off. */
+int get_kbinput(WINDOW *win)
 {
     int kbinput;
 
     /* Read in a character and interpret it.  Continue doing this until
      * we get a recognized value or sequence. */
-    while ((kbinput = parse_kbinput(win, meta_key, func_key)) == ERR);
+    while ((kbinput = parse_kbinput(win)) == ERR)
+	;
 
     /* If we read from the edit window, blank the statusbar if we need
      * to. */
@@ -324,14 +324,14 @@ int get_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 /* Translate ASCII characters, extended keypad values, and escape
  * sequences into their corresponding key values.  Set meta_key to TRUE
  * when we get a meta key sequence, and set func_key to TRUE when we get
- * a function key.  Assume nodelay(win) is FALSE. */
-int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
+ * a function key. */
+int parse_kbinput(WINDOW *win)
 {
     static int escapes = 0, byte_digits = 0;
     int *kbinput, retval = ERR;
 
-    *meta_key = FALSE;
-    *func_key = FALSE;
+    meta_key = FALSE;
+    func_key = FALSE;
 
     /* Read in a character. */
     if (nodelay_mode) {
@@ -339,7 +339,8 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 	if (kbinput == 0)
 	    return 0;
     } else
-	while ((kbinput = get_input(win, 1)) == NULL);
+	while ((kbinput = get_input(win, 1)) == NULL)
+	    ;
 
     switch (*kbinput) {
 	case ERR:
@@ -377,7 +378,7 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 			 * meta key sequence mode.  Set meta_key to
 			 * TRUE, and save the lowercase version of the
 			 * non-escape character as the result. */
-			*meta_key = TRUE;
+			meta_key = TRUE;
 			retval = tolower(*kbinput);
 		    } else
 			/* One escape followed by a non-escape, and
@@ -467,7 +468,7 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 			 * escape counter, set meta_key to TRUE, and
 			 * interpret the escape sequence. */
 			escapes = 0;
-			*meta_key = TRUE;
+			meta_key = TRUE;
 			retval = parse_escape_seq_kbinput(win,
 				*kbinput);
 		    }
@@ -497,36 +498,36 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
     if (retval != ERR) {
 	switch (retval) {
 	    case NANO_CONTROL_8:
-		retval = ISSET(REBIND_DELETE) ? sc_seq_or(DO_DELETE, 0) :
-			sc_seq_or(DO_BACKSPACE, 0);
+		retval = ISSET(REBIND_DELETE) ? sc_seq_or(do_delete, 0) :
+			sc_seq_or(do_backspace, 0);
 		break;
 	    case KEY_DOWN:
 #ifdef KEY_SDOWN
 	    /* ncurses and Slang don't support KEY_SDOWN. */
 	    case KEY_SDOWN:
 #endif
-		retval = sc_seq_or(DO_DOWN_VOID, *kbinput);
+		retval = sc_seq_or(do_down_void, *kbinput);
 		break;
 	    case KEY_UP:
 #ifdef KEY_SUP
 	    /* ncurses and Slang don't support KEY_SUP. */
 	    case KEY_SUP:
 #endif
-		retval = sc_seq_or(DO_UP_VOID, *kbinput);
+		retval = sc_seq_or(do_up_void, *kbinput);
 		break;
 	    case KEY_LEFT:
 #ifdef KEY_SLEFT
 	    /* Slang doesn't support KEY_SLEFT. */
 	    case KEY_SLEFT:
 #endif
-		retval = sc_seq_or(DO_LEFT, *kbinput);
+		retval = sc_seq_or(do_left, *kbinput);
 		break;
 	    case KEY_RIGHT:
 #ifdef KEY_SRIGHT
 	    /* Slang doesn't support KEY_SRIGHT. */
 	    case KEY_SRIGHT:
 #endif
-		retval = sc_seq_or(DO_RIGHT, *kbinput);
+		retval = sc_seq_or(do_right, *kbinput);
 		break;
 #ifdef KEY_SHOME
 	    /* HP-UX 10-11 and Slang don't support KEY_SHOME. */
@@ -534,36 +535,36 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 #endif
 	    case KEY_A1:	/* Home (7) on numeric keypad with
 				 * NumLock off. */
-		retval = sc_seq_or(DO_HOME, *kbinput);
+		retval = sc_seq_or(do_home, *kbinput);
 		break;
 	    case KEY_BACKSPACE:
-		retval = sc_seq_or(DO_BACKSPACE, *kbinput);
+		retval = sc_seq_or(do_backspace, *kbinput);
 		break;
 #ifdef KEY_SDC
 	    /* Slang doesn't support KEY_SDC. */
 	    case KEY_SDC:
 		if (ISSET(REBIND_DELETE))
-		   retval = sc_seq_or(DO_DELETE, *kbinput);
+		    retval = sc_seq_or(do_delete, *kbinput);
 		else
-		   retval = sc_seq_or(DO_BACKSPACE, *kbinput);
+		    retval = sc_seq_or(do_backspace, *kbinput);
 		break;
 #endif
 #ifdef KEY_SIC
 	    /* Slang doesn't support KEY_SIC. */
 	    case KEY_SIC:
-		retval = sc_seq_or(DO_INSERTFILE_VOID, *kbinput);
+		retval = sc_seq_or(do_insertfile_void, *kbinput);
 		break;
 #endif
 	    case KEY_C3:	/* PageDown (4) on numeric keypad with
 				 * NumLock off. */
-		retval = sc_seq_or(DO_PAGE_DOWN, *kbinput);
+		retval = sc_seq_or(do_page_down, *kbinput);
 		break;
 	    case KEY_A3:	/* PageUp (9) on numeric keypad with
 				 * NumLock off. */
-		retval = sc_seq_or(DO_PAGE_UP, *kbinput);
+		retval = sc_seq_or(do_page_up, *kbinput);
 		break;
 	    case KEY_ENTER:
-		retval = sc_seq_or(DO_ENTER, *kbinput);
+		retval = sc_seq_or(do_enter_void, *kbinput);
 		break;
 	    case KEY_B2:	/* Center (5) on numeric keypad with
 				 * NumLock off. */
@@ -575,7 +576,7 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 	    /* HP-UX 10-11 and Slang don't support KEY_SEND. */
 	    case KEY_SEND:
 #endif
-		retval = sc_seq_or(DO_END, *kbinput);
+		retval = sc_seq_or(do_end, *kbinput);
 		break;
 #ifdef KEY_BEG
 	    /* Slang doesn't support KEY_BEG. */
@@ -591,7 +592,7 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 	    /* Slang doesn't support KEY_SCANCEL. */
 	    case KEY_SCANCEL:
 #endif
-		retval = first_sc_for(currmenu, CANCEL_MSG)->seq;
+		retval = first_sc_for(currmenu, do_cancel)->seq;
 		break;
 #endif
 #ifdef KEY_SBEG
@@ -604,13 +605,13 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 #ifdef KEY_SSUSPEND
 	    /* Slang doesn't support KEY_SSUSPEND. */
 	    case KEY_SSUSPEND:
-		retval = sc_seq_or(DO_SUSPEND_VOID, 0);
+		retval = sc_seq_or(do_suspend_void, 0);
 		break;
 #endif
 #ifdef KEY_SUSPEND
 	    /* Slang doesn't support KEY_SUSPEND. */
 	    case KEY_SUSPEND:
-		retval =  sc_seq_or(DO_SUSPEND_VOID, 0);
+		retval = sc_seq_or(do_suspend_void, 0);
 		break;
 #endif
 #ifdef PDCURSES
@@ -632,16 +633,26 @@ int parse_kbinput(WINDOW *win, bool *meta_key, bool *func_key)
 		retval = ERR;
 		break;
 #endif
+	    case CONTROL_LEFT:
+#ifndef NANO_TINY
+		retval = sc_seq_or(do_prev_word_void, 0);
+#endif
+		break;
+	    case CONTROL_RIGHT:
+#ifndef NANO_TINY
+		retval = sc_seq_or(do_next_word_void, 0);
+#endif
+		break;
 	}
 
 	/* If our result is an extended keypad value (i.e. a value
 	 * outside of byte range), set func_key to TRUE. */
 	if (retval != ERR)
-	    *func_key = !is_byte(retval);
+	    func_key = !is_byte(retval);
     }
 
 #ifdef DEBUG
-    fprintf(stderr, "parse_kbinput(): kbinput = %d, meta_key = %s, func_key = %s, escapes = %d, byte_digits = %d, retval = %d\n", *kbinput, *meta_key ? "TRUE" : "FALSE", *func_key ? "TRUE" : "FALSE", escapes, byte_digits, retval);
+    fprintf(stderr, "parse_kbinput(): kbinput = %d, meta_key = %s, func_key = %s, escapes = %d, byte_digits = %d, retval = %d\n", *kbinput, meta_key ? "TRUE" : "FALSE", func_key ? "TRUE" : "FALSE", escapes, byte_digits, retval);
 #endif
 
     free(kbinput);
@@ -707,11 +718,15 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 				   * Terminal. */
 			case 'B': /* Esc O 1 ; 5 B == Ctrl-Down on
 				   * Terminal. */
+			    retval = get_escape_seq_abcd(seq[4]);
+			    break;
 			case 'C': /* Esc O 1 ; 5 C == Ctrl-Right on
 				   * Terminal. */
+			    retval = CONTROL_RIGHT;
+			    break;
 			case 'D': /* Esc O 1 ; 5 D == Ctrl-Left on
 				   * Terminal. */
-			    retval = get_escape_seq_abcd(seq[4]);
+			    retval = CONTROL_LEFT;
 			    break;
 		    }
 		}
@@ -758,15 +773,15 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 			retval = KEY_B2;
 			break;
 		    case 'F': /* Esc O F == End on xterm/Terminal. */
-			retval = sc_seq_or(DO_END, 0);
+			retval = sc_seq_or(do_end, 0);
 			break;
 		    case 'H': /* Esc O H == Home on xterm/Terminal. */
-			retval = sc_seq_or(DO_HOME, 0);;
+			retval = sc_seq_or(do_home, 0);
 			break;
 		    case 'M': /* Esc O M == Enter on numeric keypad with
 			       * NumLock off on VT100/VT220/VT320/xterm/
 			       * rxvt/Eterm. */
-			retval = sc_seq_or(DO_HOME, 0);;
+			retval = sc_seq_or(do_home, 0);
 			break;
 		    case 'P': /* Esc O P == F1 on VT100/VT220/VT320/Mach
 			       * console. */
@@ -804,9 +819,13 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 			break;
 		    case 'a': /* Esc O a == Ctrl-Up on rxvt. */
 		    case 'b': /* Esc O b == Ctrl-Down on rxvt. */
+			retval = get_escape_seq_abcd(seq[1]);
+			break;
 		    case 'c': /* Esc O c == Ctrl-Right on rxvt. */
+			retval = CONTROL_RIGHT;
+			break;
 		    case 'd': /* Esc O d == Ctrl-Left on rxvt. */
-			retval = get_escape_seq_abcd(seq[1]);
+			retval = CONTROL_LEFT;
 			break;
 		    case 'j': /* Esc O j == '*' on numeric keypad with
 			       * NumLock off on VT100/VT220/VT320/xterm/
@@ -831,7 +850,7 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 		    case 'n': /* Esc O n == Delete (.) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
 			       * xterm/rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(DO_DELETE, 0);;
+			retval = sc_seq_or(do_delete, 0);
 			break;
 		    case 'o': /* Esc O o == '/' on numeric keypad with
 			       * NumLock off on VT100/VT220/VT320/xterm/
@@ -841,27 +860,27 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 		    case 'p': /* Esc O p == Insert (0) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
 			       * rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(DO_INSERTFILE_VOID, 0);;
+			retval = sc_seq_or(do_insertfile_void, 0);
 			break;
 		    case 'q': /* Esc O q == End (1) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
 			       * rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(DO_END, 0);;
+			retval = sc_seq_or(do_end, 0);
 			break;
 		    case 'r': /* Esc O r == Down (2) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
 			       * rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(DO_DOWN_VOID, 0);;
+			retval = sc_seq_or(do_down_void, 0);
 			break;
 		    case 's': /* Esc O s == PageDown (3) on numeric
 			       * keypad with NumLock off on VT100/VT220/
 			       * VT320/rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(DO_PAGE_DOWN, 0);;
+			retval = sc_seq_or(do_page_down, 0);
 			break;
 		    case 't': /* Esc O t == Left (4) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
 			       * rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(DO_LEFT, 0);;
+			retval = sc_seq_or(do_left, 0);
 			break;
 		    case 'u': /* Esc O u == Center (5) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
@@ -871,22 +890,22 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 		    case 'v': /* Esc O v == Right (6) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
 			       * rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(DO_RIGHT, 0);
+			retval = sc_seq_or(do_right, 0);
 			break;
 		    case 'w': /* Esc O w == Home (7) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
 			       * rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(DO_HOME, 0);
+			retval = sc_seq_or(do_home, 0);
 			break;
 		    case 'x': /* Esc O x == Up (8) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
 			       * rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(DO_UP_VOID, 0);
+			retval = sc_seq_or(do_up_void, 0);
 			break;
 		    case 'y': /* Esc O y == PageUp (9) on numeric keypad
 			       * with NumLock off on VT100/VT220/VT320/
 			       * rxvt/Eterm/Terminal. */
-			retval = sc_seq_or(DO_PAGE_UP, 0);
+			retval = sc_seq_or(do_page_up, 0);
 			break;
 		}
 		break;
@@ -894,9 +913,13 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 		switch (seq[1]) {
 		    case 'a': /* Esc o a == Ctrl-Up on Eterm. */
 		    case 'b': /* Esc o b == Ctrl-Down on Eterm. */
+			retval = get_escape_seq_abcd(seq[1]);
+			break;
 		    case 'c': /* Esc o c == Ctrl-Right on Eterm. */
+			retval = CONTROL_RIGHT;
+			break;
 		    case 'd': /* Esc o d == Ctrl-Left on Eterm. */
-			retval = get_escape_seq_abcd(seq[1]);
+			retval = CONTROL_LEFT;
 			break;
 		}
 		break;
@@ -966,11 +989,15 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 				   * xterm. */
 			case 'B': /* Esc [ 1 ; 5 B == Ctrl-Down on
 				   * xterm. */
+			    retval = get_escape_seq_abcd(seq[4]);
+			    break;
 			case 'C': /* Esc [ 1 ; 5 C == Ctrl-Right on
 				   * xterm. */
+			    retval = CONTROL_RIGHT;
+			    break;
 			case 'D': /* Esc [ 1 ; 5 D == Ctrl-Left on
 				   * xterm. */
-			    retval = get_escape_seq_abcd(seq[4]);
+			    retval = CONTROL_LEFT;
 			    break;
 		    }
 		}
@@ -980,7 +1007,7 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 				    break;
 				default: /* Esc [ 1 ~ == Home on
 					  * VT320/Linux console. */
-				    retval = sc_seq_or(DO_HOME, 0);;
+				    retval = sc_seq_or(do_home, 0);
 				    break;
 			    }
 			}
@@ -1031,40 +1058,40 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 				default: /* Esc [ 2 ~ == Insert on
 					  * VT220/VT320/Linux console/
 					  * xterm/Terminal. */
-				    retval = sc_seq_or(DO_INSERTFILE_VOID, 0);;
+				    retval = sc_seq_or(do_insertfile_void, 0);
 				    break;
 			    }
 			}
 			break;
 		    case '3': /* Esc [ 3 ~ == Delete on VT220/VT320/
 			       * Linux console/xterm/Terminal. */
-			retval = sc_seq_or(DO_DELETE, 0);;
+			retval = sc_seq_or(do_delete, 0);
 			break;
 		    case '4': /* Esc [ 4 ~ == End on VT220/VT320/Linux
 			       * console/xterm. */
-			retval = sc_seq_or(DO_END, 0);;
+			retval = sc_seq_or(do_end, 0);
 			break;
 		    case '5': /* Esc [ 5 ~ == PageUp on VT220/VT320/
 			       * Linux console/xterm/Terminal;
 			       * Esc [ 5 ^ == PageUp on Eterm. */
-			retval = sc_seq_or(DO_PAGE_UP, 0);;
+			retval = sc_seq_or(do_page_up, 0);
 			break;
 		    case '6': /* Esc [ 6 ~ == PageDown on VT220/VT320/
 			       * Linux console/xterm/Terminal;
-			        * Esc [ 6 ^ == PageDown on Eterm. */
-			retval = sc_seq_or(DO_PAGE_DOWN, 0);;
+			       * Esc [ 6 ^ == PageDown on Eterm. */
+			retval = sc_seq_or(do_page_down, 0);
 			break;
 		    case '7': /* Esc [ 7 ~ == Home on rxvt. */
-			retval = sc_seq_or(DO_HOME, 0);
+			retval = sc_seq_or(do_home, 0);
 			break;
 		    case '8': /* Esc [ 8 ~ == End on rxvt. */
-			retval = sc_seq_or(DO_END, 0);
+			retval = sc_seq_or(do_end, 0);
 			break;
 		    case '9': /* Esc [ 9 == Delete on Mach console. */
-			retval = sc_seq_or(DO_DELETE, 0);;
+			retval = sc_seq_or(do_delete, 0);
 			break;
 		    case '@': /* Esc [ @ == Insert on Mach console. */
-			retval = sc_seq_or(DO_INSERTFILE_VOID, 0);;
+			retval = sc_seq_or(do_insertfile_void, 0);
 			break;
 		    case 'A': /* Esc [ A == Up on ANSI/VT220/Linux
 			       * console/FreeBSD console/Mach console/
@@ -1087,23 +1114,23 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 			break;
 		    case 'F': /* Esc [ F == End on FreeBSD
 			       * console/Eterm. */
-			retval = sc_seq_or(DO_END, 0);
+			retval = sc_seq_or(do_end, 0);
 			break;
 		    case 'G': /* Esc [ G == PageDown on FreeBSD
 			       * console. */
-			retval = sc_seq_or(DO_PAGE_DOWN, 0);
+			retval = sc_seq_or(do_page_down, 0);
 			break;
 		    case 'H': /* Esc [ H == Home on ANSI/VT220/FreeBSD
 			       * console/Mach console/Eterm. */
-			retval = sc_seq_or(DO_HOME, 0);
+			retval = sc_seq_or(do_home, 0);
 			break;
 		    case 'I': /* Esc [ I == PageUp on FreeBSD
 			       * console. */
-			retval = sc_seq_or(DO_PAGE_UP, 0);
+			retval = sc_seq_or(do_page_up, 0);
 			break;
 		    case 'L': /* Esc [ L == Insert on ANSI/FreeBSD
 			       * console. */
-			retval = sc_seq_or(DO_INSERTFILE_VOID, 0);
+			retval = sc_seq_or(do_insertfile_void, 0);
 			break;
 		    case 'M': /* Esc [ M == F1 on FreeBSD console. */
 			retval = KEY_F(1);
@@ -1151,10 +1178,10 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 			retval = KEY_F(8);
 			break;
 		    case 'U': /* Esc [ U == PageDown on Mach console. */
-			retval = sc_seq_or(DO_PAGE_DOWN, 0);
+			retval = sc_seq_or(do_page_down, 0);
 			break;
 		    case 'V': /* Esc [ V == PageUp on Mach console. */
-			retval = sc_seq_or(DO_PAGE_UP, 0);
+			retval = sc_seq_or(do_page_up, 0);
 			break;
 		    case 'W': /* Esc [ W == F11 on FreeBSD console. */
 			retval = KEY_F(11);
@@ -1163,7 +1190,7 @@ int get_escape_seq_kbinput(const int *seq, size_t seq_len)
 			retval = KEY_F(12);
 			break;
 		    case 'Y': /* Esc [ Y == End on Mach console. */
-			retval = sc_seq_or(DO_END, 0);
+			retval = sc_seq_or(do_end, 0);
 			break;
 		    case 'Z': /* Esc [ Z == F14 on FreeBSD console. */
 			retval = KEY_F(14);
@@ -1220,13 +1247,13 @@ int get_escape_seq_abcd(int kbinput)
 {
     switch (tolower(kbinput)) {
 	case 'a':
-	    return sc_seq_or(DO_UP_VOID, 0);;
+	    return sc_seq_or(do_up_void, 0);
 	case 'b':
-	    return sc_seq_or(DO_DOWN_VOID, 0);;
+	    return sc_seq_or(do_down_void, 0);
 	case 'c':
-	    return sc_seq_or(DO_RIGHT, 0);;
+	    return sc_seq_or(do_right, 0);
 	case 'd':
-	    return sc_seq_or(DO_LEFT, 0);;
+	    return sc_seq_or(do_left, 0);
 	default:
 	    return ERR;
     }
@@ -1301,15 +1328,13 @@ int get_byte_kbinput(int kbinput)
 	    break;
 	case 3:
 	    /* Third digit: This must be from zero to five if the first
-	     * was two and the second was between zero and five, and may
-	     * be any decimal value if the first was zero or one and the
-	     * second was between six and nine.  Put it in the 1's
-	     * position of the byte sequence holder. */
+	     * was two and the second was five, and may be any decimal
+	     * value otherwise.  Put it in the 1's position of the byte
+	     * sequence holder. */
 	    if (('0' <= kbinput && kbinput <= '5') || (byte < 250 &&
 		'6' <= kbinput && kbinput <= '9')) {
 		byte += kbinput - '0';
-		/* If this character is a valid decimal value, then the
-		 * byte sequence is complete. */
+		/* The byte sequence is complete. */
 		retval = byte;
 	    } else
 		/* This isn't the third digit of a byte sequence.
@@ -1531,7 +1556,8 @@ int *parse_verbatim_kbinput(WINDOW *win, size_t *kbinput_len)
     int *kbinput, *retval;
 
     /* Read in the first keystroke. */
-    while ((kbinput = get_input(win, 1)) == NULL);
+    while ((kbinput = get_input(win, 1)) == NULL)
+	;
 
 #ifdef ENABLE_UTF8
     if (using_utf8()) {
@@ -1557,8 +1583,8 @@ int *parse_verbatim_kbinput(WINDOW *win, size_t *kbinput_len)
 		statusbar(_("Unicode Input"));
 
 	    while (uni == ERR) {
-		while ((kbinput = get_input(win, 1)) == NULL);
-
+		while ((kbinput = get_input(win, 1)) == NULL)
+		    ;
 		uni = get_unicode_kbinput(*kbinput);
 	    }
 
@@ -1638,8 +1664,7 @@ int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts)
 		/* The width of all the shortcuts, except for the last
 		 * two, in the shortcut list in bottomwin. */
 	    int j;
-		/* The y-coordinate relative to the beginning of the
-		 * shortcut list in bottomwin. */
+		/* The calculated index number of the clicked item. */
 	    size_t currslen;
 		/* The number of shortcuts in the current shortcut
 		 * list. */
@@ -1659,10 +1684,6 @@ int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts)
 		return 0;
 	    }
 
-	    /* Calculate the y-coordinate relative to the beginning of
-	     * the shortcut list in bottomwin. */
-	    j = *mouse_y - 1;
-
 	    /* Get the shortcut lists' length. */
 	    if (currmenu == MMAIN)
 		currslen = MAIN_VISIBLE;
@@ -1683,44 +1704,46 @@ int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts)
 	    else
 		i = COLS / ((currslen / 2) + (currslen % 2));
 
-	    /* Calculate the x-coordinate relative to the beginning of
-	     * the shortcut list in bottomwin, and add it to j.  j
-	     * should now be the index in the shortcut list of the
-	     * shortcut we released/clicked on. */
-	    j = (*mouse_x / i) * 2 + j;
+	    /* Calculate the one-based index in the shortcut list. */
+	    j = (*mouse_x / i) * 2 + *mouse_y;
 
-	    /* Adjust j if we released on the last two shortcuts. */
-	    if ((j >= currslen) && (*mouse_x % i < COLS % i))
+	    /* Adjust the index if we hit the last two wider ones. */
+	    if ((j > currslen) && (*mouse_x % i < COLS % i))
 		j -= 2;
-
+#ifdef DEBUG
+	    fprintf(stderr, "Calculated %i as index in shortcut list, currmenu = %x.\n", j, currmenu);
+#endif
 	    /* Ignore releases/clicks of the first mouse button beyond
 	     * the last shortcut. */
-	    if (j >= currslen)
+	    if (j > currslen)
 		return 2;
 
-	    /* Go through the shortcut list to determine which shortcut
-	     * we released/clicked on. */
-	    f = allfuncs;
-
-	    for (; j > 0; j--) {
-		if (f->next != NULL)
-		    f = f->next;
-
-                while (f->next != NULL && ((f->menus & currmenu) == 0
+	    /* Go through the list of functions to determine which
+	     * shortcut in the current menu we released/clicked on. */
+	    for (f = allfuncs; f != NULL; f = f->next) {
+		if ((f->menus & currmenu) == 0)
+		    continue;
 #ifndef DISABLE_HELP
-                       || strlen(f->help) == 0
+		if (!f->help || strlen(f->help) == 0)
+		    continue;
 #endif
-		))
-		     f = f->next;
+		if (first_sc_for(currmenu, f->scfunc) == NULL)
+		    continue;
+		/* Tick off an actually shown shortcut. */
+		j -= 1;
+		if (j == 0)
+		    break;
 	    }
+#ifdef DEBUG
+	    fprintf(stderr, "Stopped on func %ld present in menus %x\n", (long)f->scfunc, f->menus);
+#endif
 
-
-	    /* And put back the equivalent key. */
+	    /* And put the corresponding key into the keyboard buffer. */
 	    if (f != NULL) {
-                const sc *s = first_sc_for(currmenu, f->scfunc);
-		if (s != NULL)
-		    unget_kbinput(s->seq, s->type == META, FALSE);
+		const sc *s = first_sc_for(currmenu, f->scfunc);
+		unget_kbinput(s->seq, s->type == META, s->type == FKEY);
 	    }
+	    return 1;
 	} else
 	    /* Handle releases/clicks of the first mouse button that
 	     * aren't on the current shortcut list elsewhere. */
@@ -1746,8 +1769,8 @@ int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts)
 	     * wheel is equivalent to moving down three lines. */
 	    for (i = 0; i < 3; i++)
 		unget_kbinput((mevent.bstate & BUTTON4_PRESSED) ?
-			 sc_seq_or(DO_UP_VOID, 0) : sc_seq_or(DO_DOWN_VOID, 0), FALSE,
-			FALSE);
+			sc_seq_or(do_up_void, 0) : sc_seq_or(do_down_void, 0),
+			FALSE, FALSE);
 
 	    return 1;
 	} else
@@ -1763,67 +1786,35 @@ int get_mouseinput(int *mouse_x, int *mouse_y, bool allow_shortcuts)
 }
 #endif /* !DISABLE_MOUSE */
 
-/* Return the shortcut corresponding to the values of kbinput (the key
- * itself), meta_key (whether the key is a meta sequence), and func_key
- * (whether the key is a function key), if any.  The shortcut will be
- * the first one in the list (control key, meta key sequence, function
- * key, other meta key sequence) for the corresponding function.  For
- * example, passing in a meta key sequence that corresponds to a
- * function with a control key, a function key, and a meta key sequence
- * will return the control key corresponding to that function. */
-const sc *get_shortcut(int menu, int *kbinput, bool
-	*meta_key, bool *func_key)
+/* Return the shortcut that corresponds to the values of kbinput (the
+ * key itself) and meta_key (whether the key is a meta sequence).  The
+ * returned shortcut will be the first in the list that corresponds to
+ * the given sequence. */
+const sc *get_shortcut(int *kbinput)
 {
     sc *s;
 
 #ifdef DEBUG
-    fprintf(stderr, "get_shortcut(): kbinput = %d, meta_key = %s, func_key = %s\n", *kbinput, *meta_key ? "TRUE" : "FALSE", *func_key ? "TRUE" : "FALSE");
+    fprintf(stderr, "get_shortcut(): kbinput = %d, meta_key = %s -- ", *kbinput, meta_key ? "TRUE" : "FALSE");
 #endif
 
-    /* Check for shortcuts. */
     for (s = sclist; s != NULL; s = s->next) {
-        if ((menu & s->menu)
-		&& ((s->type == META && *meta_key == TRUE && *kbinput == s->seq)
-		|| (s->type != META && *kbinput == s->seq))) {
+	if ((currmenu & s->menu) && *kbinput == s->seq
+		&& meta_key == (s->type == META)) {
 #ifdef DEBUG
-	    fprintf (stderr, "matched seq \"%s\" and btw meta was %d (menus %d = %d)\n", s->keystr, *meta_key, menu, s->menu);
+	    fprintf (stderr, "matched seq \"%s\", and btw meta was %d (menu is %x from %x)\n",
+			     s->keystr, meta_key, currmenu, s->menu);
 #endif
 	    return s;
 	}
     }
 #ifdef DEBUG
-    fprintf (stderr, "matched nothing btw meta was %d\n", *meta_key);
+    fprintf (stderr, "matched nothing, btw meta was %d\n", meta_key);
 #endif
 
     return NULL;
 }
 
-
-/* Try to get a function back from a window.  Just a wrapper so
-   functions to need to create function_key meta_key blah blah 
-    mmenu - what menu name to look through for valid funcs */
-const subnfunc *getfuncfromkey(WINDOW *win)
-{
-    int kbinput;
-    bool func_key = FALSE, meta_key = FALSE;
-    const sc *s;
-    const subnfunc *f;
-
-    kbinput = parse_kbinput(win, &meta_key, &func_key);
-    if (kbinput == 0)
-	return NULL;
-
-    s = get_shortcut(currmenu, &kbinput, &meta_key, &func_key);
-    if (!s)
-	return NULL;
-
-    f = sctofunc((sc *) s);
-    return f;
-
-}
-
-
-
 /* Move to (x, y) in win, and display a line of n spaces with the
  * current attributes. */
 void blank_line(WINDOW *win, int y, int x, int n)
@@ -1999,7 +1990,7 @@ char *display_string(const char *buf, size_t start_col, size_t len, bool
 
 	/* If buf contains a tab character, interpret it. */
 	if (*buf_mb == '\t') {
-#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
+#if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
 	    if (ISSET(WHITESPACE_DISPLAY)) {
 		int i;
 
@@ -2015,7 +2006,7 @@ char *display_string(const char *buf, size_t start_col, size_t len, bool
 	    }
 	/* If buf contains a control character, interpret it.  If buf
 	 * contains an invalid multibyte control character, display it
-	 * as such.*/
+	 * as such. */
 	} else if (is_cntrl_mbchar(buf_mb)) {
 	    char *ctrl_buf_mb = charalloc(mb_cur_max());
 	    int ctrl_buf_mb_len, i;
@@ -2034,7 +2025,7 @@ char *display_string(const char *buf, size_t start_col, size_t len, bool
 	    free(ctrl_buf_mb);
 	/* If buf contains a space character, interpret it. */
 	} else if (*buf_mb == ' ') {
-#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
+#if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
 	    if (ISSET(WHITESPACE_DISPLAY)) {
 		int i;
 
@@ -2113,7 +2104,9 @@ void titlebar(const char *path)
 
     assert(path != NULL || openfile->filename != NULL);
 
-    wattron(topwin, reverse_attr);
+    if (interface_color_pair[TITLE_BAR].bright)
+	wattron(topwin, A_BOLD);
+    wattron(topwin, interface_color_pair[TITLE_BAR].pairnum);
 
     blank_titlebar();
 
@@ -2244,7 +2237,8 @@ void titlebar(const char *path)
 	}
     }
 
-    wattroff(topwin, reverse_attr);
+    wattroff(topwin, A_BOLD);
+    wattroff(topwin, interface_color_pair[TITLE_BAR].pairnum);
 
     wnoutrefresh(topwin);
     reset_cursor();
@@ -2258,6 +2252,19 @@ void set_modified(void)
     if (!openfile->modified) {
 	openfile->modified = TRUE;
 	titlebar(NULL);
+#ifndef NANO_TINY
+	if (ISSET(LOCKING)) {
+	    if (openfile->filename[0] == '\0')
+		return;
+	    else if (openfile->lock_filename == NULL) {
+		/* TRANSLATORS: Try to keep this at most 76 characters. */
+		statusbar(_("Warning: Modifying a file which is not locked, check directory permission?"));
+	    } else {
+		write_lockfile(openfile->lock_filename,
+				get_full_path(openfile->filename), TRUE);
+	    }
+	}
+#endif
     }
 }
 
@@ -2268,8 +2275,8 @@ void statusbar(const char *msg, ...)
 {
     va_list ap;
     char *bar, *foo;
-    size_t start_x, foo_len;
-#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
+    size_t start_x;
+#if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
     bool old_whitespace;
 #endif
 
@@ -2285,7 +2292,7 @@ void statusbar(const char *msg, ...)
 
     blank_statusbar();
 
-#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
+#if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
     old_whitespace = ISSET(WHITESPACE_DISPLAY);
     UNSET(WHITESPACE_DISPLAY);
 #endif
@@ -2293,21 +2300,23 @@ void statusbar(const char *msg, ...)
     vsnprintf(bar, mb_cur_max() * (COLS - 3), msg, ap);
     va_end(ap);
     foo = display_string(bar, 0, COLS - 4, FALSE);
-#if !defined(NANO_TINY) && defined(ENABLE_NANORC)
+    free(bar);
+#if !defined(NANO_TINY) && !defined(DISABLE_NANORC)
     if (old_whitespace)
 	SET(WHITESPACE_DISPLAY);
 #endif
-    free(bar);
-    foo_len = strlenpt(foo);
-    start_x = (COLS - foo_len - 4) / 2;
+    start_x = (COLS - strlenpt(foo) - 4) / 2;
 
     wmove(bottomwin, 0, start_x);
-    wattron(bottomwin, reverse_attr);
+    if (interface_color_pair[STATUS_BAR].bright)
+	wattron(bottomwin, A_BOLD);
+    wattron(bottomwin, interface_color_pair[STATUS_BAR].pairnum);
     waddstr(bottomwin, "[ ");
     waddstr(bottomwin, foo);
     free(foo);
     waddstr(bottomwin, " ]");
-    wattroff(bottomwin, reverse_attr);
+    wattroff(bottomwin, A_BOLD);
+    wattroff(bottomwin, interface_color_pair[STATUS_BAR].pairnum);
     wnoutrefresh(bottomwin);
     reset_cursor();
     wnoutrefresh(edit);
@@ -2365,30 +2374,27 @@ void bottombars(int menu)
     for (f = allfuncs, i = 0; i < slen && f != NULL; f = f->next) {
 
 #ifdef DEBUG
-        fprintf(stderr, "Checking menu items....");
+	fprintf(stderr, "Checking menu items....");
 #endif
-        if ((f->menus & menu) == 0)
-	    continue;
-
-        if (!f->desc || strlen(f->desc) == 0)
+	if ((f->menus & menu) == 0)
 	    continue;
 
 #ifdef DEBUG
-        fprintf(stderr, "found one! f->menus = %d, desc = \"%s\"\n", f->menus, f->desc);
+	fprintf(stderr, "found one! f->menus = %x, desc = \"%s\"\n", f->menus, f->desc);
 #endif
-        s = first_sc_for(menu, f->scfunc);
-        if (s == NULL) {
+	s = first_sc_for(menu, f->scfunc);
+	if (s == NULL) {
 #ifdef DEBUG
 	    fprintf(stderr, "Whoops, guess not, no shortcut key found for func!\n");
 #endif
-            continue;
-        }
+	    continue;
+	}
 	wmove(bottomwin, 1 + i % 2, (i / 2) * colwidth);
 #ifdef DEBUG
-        fprintf(stderr, "Calling onekey with keystr \"%s\" and desc \"%s\"\n", s->keystr, f->desc);
+	fprintf(stderr, "Calling onekey with keystr \"%s\" and desc \"%s\"\n", s->keystr, f->desc);
 #endif
 	onekey(s->keystr, _(f->desc), colwidth + (COLS % colwidth));
-        i++;
+	i++;
     }
 
     wnoutrefresh(bottomwin);
@@ -2407,9 +2413,12 @@ void onekey(const char *keystroke, const char *desc, size_t len)
 
     assert(keystroke != NULL && desc != NULL);
 
-    wattron(bottomwin, reverse_attr);
+    if (interface_color_pair[KEY_COMBO].bright)
+	wattron(bottomwin, A_BOLD);
+    wattron(bottomwin, interface_color_pair[KEY_COMBO].pairnum);
     waddnstr(bottomwin, keystroke, actual_x(keystroke, len));
-    wattroff(bottomwin, reverse_attr);
+    wattroff(bottomwin, A_BOLD);
+    wattroff(bottomwin, interface_color_pair[KEY_COMBO].pairnum);
 
     if (len > keystroke_len)
 	len -= keystroke_len;
@@ -2418,7 +2427,12 @@ void onekey(const char *keystroke, const char *desc, size_t len)
 
     if (len > 0) {
 	waddch(bottomwin, ' ');
+	if (interface_color_pair[FUNCTION_TAG].bright)
+	    wattron(bottomwin, A_BOLD);
+	wattron(bottomwin, interface_color_pair[FUNCTION_TAG].pairnum);
 	waddnstr(bottomwin, desc, actual_x(desc, len));
+	wattroff(bottomwin, A_BOLD);
+	wattroff(bottomwin, interface_color_pair[FUNCTION_TAG].pairnum);
     }
 }
 
@@ -2436,17 +2450,20 @@ void reset_cursor(void)
 
     xpt = xplustabs();
 
+#ifndef NANO_TINY
     if (ISSET(SOFTWRAP)) {
 	filestruct *tmp;
 	openfile->current_y = 0;
 
 	for (tmp = openfile->edittop; tmp && tmp != openfile->current; tmp = tmp->next)
-	    openfile->current_y += 1 + strlenpt(tmp->data) / COLS;
+	    openfile->current_y += (strlenpt(tmp->data) / COLS) + 1;
 
 	openfile->current_y += xplustabs() / COLS;
 	if (openfile->current_y < editwinrows)
 	    wmove(edit, openfile->current_y, xpt % COLS);
-    } else {
+    } else
+#endif
+    {
 	openfile->current_y = openfile->current->lineno -
 	    openfile->edittop->lineno;
 
@@ -2466,7 +2483,7 @@ void reset_cursor(void)
 void edit_draw(filestruct *fileptr, const char *converted, int
 	line, size_t start)
 {
-#if !defined(NANO_TINY) || defined(ENABLE_COLOR)
+#if !defined(NANO_TINY) || !defined(DISABLE_COLOR)
     size_t startpos = actual_x(fileptr->data, start);
 	/* The position in fileptr->data of the leftmost character
 	 * that displays at least partially on the window. */
@@ -2481,23 +2498,32 @@ void edit_draw(filestruct *fileptr, const char *converted, int
     assert(openfile != NULL && fileptr != NULL && converted != NULL);
     assert(strlenpt(converted) <= COLS);
 
-    /* Just paint the string in any case (we'll add color or reverse on
-     * just the text that needs it). */
+    /* First simply paint the line -- then we'll add colors or the
+     * marking highlight on just the pieces that need it. */
     mvwaddstr(edit, line, 0, converted);
 
-#ifdef ENABLE_COLOR
+#ifndef USE_SLANG
+    /* Tell ncurses to really redraw the line without trying to optimize
+     * for what it thinks is already there, because it gets it wrong in
+     * the case of a wide character in column zero.  See bug #31743. */
+    wredrawln(edit, line, 1);
+#endif
+
+#ifndef DISABLE_COLOR
     /* If color syntaxes are available and turned on, we need to display
      * them. */
     if (openfile->colorstrings != NULL && !ISSET(NO_COLOR_SYNTAX)) {
 	const colortype *tmpcolor = openfile->colorstrings;
 
-	/* Set up multi-line color data for this line if it's not yet calculated  */
-        if (fileptr->multidata == NULL && openfile->syntax
+	/* Set up multi-line color data for this line if it's not yet
+	 * calculated. */
+	if (fileptr->multidata == NULL && openfile->syntax
 		&& openfile->syntax->nmultis > 0) {
- 	    int i;
-	    fileptr->multidata = (short *) nmalloc(openfile->syntax->nmultis * sizeof(short));
-            for (i = 0; i < openfile->syntax->nmultis; i++)
-		fileptr->multidata[i] = -1;	/* Assue this applies until we know otherwise */
+	    int i;
+	    fileptr->multidata = (short *)nmalloc(openfile->syntax->nmultis * sizeof(short));
+	    for (i = 0; i < openfile->syntax->nmultis; i++)
+		/* Assume this applies until we know otherwise. */
+		fileptr->multidata[i] = -1;
 	}
 	for (; tmpcolor != NULL; tmpcolor = tmpcolor->next) {
 	    int x_start;
@@ -2584,18 +2610,19 @@ void edit_draw(filestruct *fileptr, const char *converted, int
 		short md = fileptr->multidata[tmpcolor->id];
 
 		if (md == -1)
-		    fileptr->multidata[tmpcolor->id] = CNONE; /* until we find out otherwise */
+		    /* Assume this until we know otherwise. */
+		    fileptr->multidata[tmpcolor->id] = CNONE;
 		else if (md == CNONE)
-		    continue;
+		    goto end_of_loop;
 		else if (md == CWHOLELINE) {
 		    mvwaddnstr(edit, line, 0, converted, -1);
-		    continue;
+		    goto end_of_loop;
 		} else if (md == CBEGINBEFORE) {
 		    regexec(tmpcolor->end, fileptr->data, 1, &endmatch, 0);
 		    paintlen = actual_x(converted, strnlenpt(fileptr->data,
 			endmatch.rm_eo) - start);
 		    mvwaddnstr(edit, line, 0, converted, paintlen);
-		    continue;
+		    goto end_of_loop;
 		}
 
 		while (start_line != NULL && regexec(tmpcolor->start,
@@ -2745,12 +2772,12 @@ void edit_draw(filestruct *fileptr, const char *converted, int
 		    }
 		}
 	    }
-
+  end_of_loop:
 	    wattroff(edit, A_BOLD);
 	    wattroff(edit, COLOR_PAIR(tmpcolor->pairnum));
 	}
     }
-#endif /* ENABLE_COLOR */
+#endif /* !DISABLE_COLOR */
 
 #ifndef NANO_TINY
     /* If the mark is on, we need to display it. */
@@ -2815,10 +2842,10 @@ void edit_draw(filestruct *fileptr, const char *converted, int
 	    if (paintlen > 0)
 		paintlen = actual_x(converted + index, paintlen);
 
-	    wattron(edit, reverse_attr);
+	    wattron(edit, hilite_attribute);
 	    mvwaddnstr(edit, line, x_start, converted + index,
 		paintlen);
-	    wattroff(edit, reverse_attr);
+	    wattroff(edit, hilite_attribute);
 	}
     }
 #endif /* !NANO_TINY */
@@ -2827,26 +2854,27 @@ void edit_draw(filestruct *fileptr, const char *converted, int
 /* Just update one line in the edit buffer.  This is basically a wrapper
  * for edit_draw().  The line will be displayed starting with
  * fileptr->data[index].  Likely arguments are current_x or zero.
- * Returns: Number of additiona lines consumed (needed for SOFTWRAP)
- */
+ * Returns: Number of additional lines consumed (needed for SOFTWRAP). */
 int update_line(filestruct *fileptr, size_t index)
 {
     int line = 0;
-    int extralinesused = 0;
 	/* The line in the edit window that we want to update. */
+    int extralinesused = 0;
     char *converted;
 	/* fileptr->data converted to have tabs and control characters
 	 * expanded. */
     size_t page_start;
-    filestruct *tmp;
 
     assert(fileptr != NULL);
 
+#ifndef NANO_TINY
     if (ISSET(SOFTWRAP)) {
-	for (tmp = openfile->edittop; tmp && tmp != fileptr; tmp = tmp->next) {
-	    line += 1 + (strlenpt(tmp->data) / COLS);
-	}
+	filestruct *tmp;
+
+	for (tmp = openfile->edittop; tmp && tmp != fileptr; tmp = tmp->next)
+	    line += (strlenpt(tmp->data) / COLS) + 1;
     } else
+#endif
 	line = fileptr->lineno - openfile->edittop->lineno;
 
     if (line < 0 || line >= editwinrows)
@@ -2857,42 +2885,49 @@ int update_line(filestruct *fileptr, size_t index)
 
     /* Next, convert variables that index the line to their equivalent
      * positions in the expanded line. */
+#ifndef NANO_TINY
     if (ISSET(SOFTWRAP))
 	index = 0;
     else
+#endif
 	index = strnlenpt(fileptr->data, index);
     page_start = get_page_start(index);
 
     /* Expand the line, replacing tabs with spaces, and control
      * characters with their displayed forms. */
+#ifdef NANO_TINY
+    converted = display_string(fileptr->data, page_start, COLS, TRUE);
+#else
     converted = display_string(fileptr->data, page_start, COLS, !ISSET(SOFTWRAP));
-
 #ifdef DEBUG
     if (ISSET(SOFTWRAP) && strlen(converted) >= COLS - 2)
-	    fprintf(stderr, "update_line(): converted(1) line = %s\n", converted);
+	fprintf(stderr, "update_line(): converted(1) line = %s\n", converted);
 #endif
-
+#endif /* !NANO_TINY */
 
     /* Paint the line. */
     edit_draw(fileptr, converted, line, page_start);
     free(converted);
 
+#ifndef NANO_TINY
     if (!ISSET(SOFTWRAP)) {
+#endif
 	if (page_start > 0)
 	    mvwaddch(edit, line, 0, '$');
 	if (strlenpt(fileptr->data) > page_start + COLS)
 	    mvwaddch(edit, line, COLS - 1, '$');
+#ifndef NANO_TINY
     } else {
-        int full_length = strlenpt(fileptr->data);
+	size_t full_length = strlenpt(fileptr->data);
 	for (index += COLS; index <= full_length && line < editwinrows; index += COLS) {
 	    line++;
 #ifdef DEBUG
-	    fprintf(stderr, "update_line(): Softwrap code, moving to %d index %lu\n", line, (unsigned long) index);
+	    fprintf(stderr, "update_line(): softwrap code, moving to %d index %lu\n", line, (unsigned long)index);
 #endif
- 	    blank_line(edit, line, 0, COLS);
+	    blank_line(edit, line, 0, COLS);
 
 	    /* Expand the line, replacing tabs with spaces, and control
- 	     * characters with their displayed forms. */
+	     * characters with their displayed forms. */
 	    converted = display_string(fileptr->data, index, COLS, !ISSET(SOFTWRAP));
 #ifdef DEBUG
 	    if (ISSET(SOFTWRAP) && strlen(converted) >= COLS - 2)
@@ -2901,10 +2936,11 @@ int update_line(filestruct *fileptr, size_t index)
 
 	    /* Paint the line. */
 	    edit_draw(fileptr, converted, line, index);
- 	    free(converted);
+	    free(converted);
 	    extralinesused++;
 	}
     }
+#endif /* !NANO_TINY */
     return extralinesused;
 }
 
@@ -2935,8 +2971,7 @@ bool need_vertical_update(size_t pww_save)
 }
 
 /* When edittop changes, try and figure out how many lines
- * we really have to work with (i.e. set maxrows)
- */
+ * we really have to work with (i.e. set maxrows). */
 void compute_maxrows(void)
 {
     int n;
@@ -2949,7 +2984,7 @@ void compute_maxrows(void)
 
     maxrows = 0;
     for (n = 0; n < editwinrows && foo; n++) {
-	maxrows ++;
+	maxrows++;
 	n += strlenpt(foo->data) / COLS;
 	foo = foo->next;
     }
@@ -2958,20 +2993,20 @@ void compute_maxrows(void)
 	maxrows += editwinrows - n;
 
 #ifdef DEBUG
-    fprintf(stderr, "compute_maxrows(): maxrows = %ld\n", maxrows);
+    fprintf(stderr, "compute_maxrows(): maxrows = %d\n", maxrows);
 #endif
 }
 
 /* Scroll the edit window in the given direction and the given number
  * of lines, and draw new lines on the blank lines left after the
- * scrolling.  direction is the direction to scroll, either UP_DIR or
- * DOWN_DIR, and nlines is the number of lines to scroll.  We change
+ * scrolling.  direction is the direction to scroll, either UPWARD or
+ * DOWNWARD, and nlines is the number of lines to scroll.  We change
  * edittop, and assume that current and current_x are up to date.  We
  * also assume that scrollok(edit) is FALSE. */
 void edit_scroll(scroll_dir direction, ssize_t nlines)
 {
+    ssize_t i;
     filestruct *foo;
-    ssize_t i, extracuzsoft = 0;
     bool do_redraw = FALSE;
 
     /* Don't bother scrolling less than one line. */
@@ -2981,36 +3016,6 @@ void edit_scroll(scroll_dir direction, ssize_t nlines)
     if (need_vertical_update(0))
 	do_redraw = TRUE;
 
-
-    /* If using soft wrapping, we want to scroll down enough to display the entire next
-        line, if possible... */
-    if (ISSET(SOFTWRAP) && direction == DOWN_DIR) {
-#ifdef DEBUG
-	   fprintf(stderr, "Softwrap: Entering check for extracuzsoft\n");
-#endif
-	for (i = maxrows, foo = openfile->edittop; foo && i > 0; i--, foo = foo->next)
-	    ;
-
-	if (foo) {
-	   extracuzsoft += strlenpt(foo->data) / COLS;
-#ifdef DEBUG
-	   fprintf(stderr, "Setting extracuzsoft to %lu due to strlen %lu of line %lu\n", (unsigned long) extracuzsoft,
-		(unsigned long) strlenpt(foo->data), (unsigned long) foo->lineno);
-#endif
-
-	    /* Now account for whether the edittop line itself is >COLS, if scrolling down */
-	   for (foo = openfile->edittop; foo && extracuzsoft > 0; nlines++) {
-		extracuzsoft -= 1 + strlenpt(foo->data) / COLS;
-#ifdef DEBUG
- 		fprintf(stderr, "Edittop adjustment, setting nlines to %lu\n", (unsigned long) nlines);
-#endif
-		if (foo == openfile->filebot)
-		    break;
-		foo = foo->next;
-	    }
-	}
-    }
-
     /* Part 1: nlines is the number of lines we're going to scroll the
      * text of the edit window. */
 
@@ -3018,7 +3023,7 @@ void edit_scroll(scroll_dir direction, ssize_t nlines)
      * value of direction) nlines lines, or as many lines as we can if
      * there are fewer than nlines lines available. */
     for (i = nlines; i > 0; i--) {
-	if (direction == UP_DIR) {
+	if (direction == UPWARD) {
 	    if (openfile->edittop == openfile->fileage)
 		break;
 	    openfile->edittop = openfile->edittop->prev;
@@ -3027,13 +3032,16 @@ void edit_scroll(scroll_dir direction, ssize_t nlines)
 		break;
 	    openfile->edittop = openfile->edittop->next;
 	}
-	/* Don't over-scroll on long lines */
-	if (ISSET(SOFTWRAP)) {
+
+#ifndef NANO_TINY
+	/* Don't over-scroll on long lines. */
+	if (ISSET(SOFTWRAP) && direction == UPWARD) {
 	    ssize_t len = strlenpt(openfile->edittop->data) / COLS;
-	    i -=  len;
+	    i -= len;
 	    if (len > 0)
 		do_redraw = TRUE;
 	}
+#endif
     }
 
     /* Limit nlines to the number of lines we could scroll. */
@@ -3051,7 +3059,7 @@ void edit_scroll(scroll_dir direction, ssize_t nlines)
     /* Scroll the text of the edit window up or down nlines lines,
      * depending on the value of direction. */
     scrollok(edit, TRUE);
-    wscrl(edit, (direction == UP_DIR) ? -nlines : nlines);
+    wscrl(edit, (direction == UPWARD) ? -nlines : nlines);
     scrollok(edit, FALSE);
 
     /* Part 2: nlines is the number of lines in the scrolled region of
@@ -3059,8 +3067,8 @@ void edit_scroll(scroll_dir direction, ssize_t nlines)
 
     /* If the top or bottom line of the file is now visible in the edit
      * window, we need to draw the entire edit window. */
-    if ((direction == UP_DIR && openfile->edittop ==
-	openfile->fileage) || (direction == DOWN_DIR &&
+    if ((direction == UPWARD && openfile->edittop ==
+	openfile->fileage) || (direction == DOWNWARD &&
 	openfile->edittop->lineno + editwinrows - 1 >=
 	openfile->filebot->lineno))
 	nlines = editwinrows;
@@ -3081,7 +3089,7 @@ void edit_scroll(scroll_dir direction, ssize_t nlines)
 
     /* If we scrolled down, move down to the line before the scrolled
      * region. */
-    if (direction == DOWN_DIR) {
+    if (direction == DOWNWARD) {
 	for (i = editwinrows - nlines; i > 0 && foo != NULL; i--)
 	    foo = foo->next;
     }
@@ -3092,8 +3100,8 @@ void edit_scroll(scroll_dir direction, ssize_t nlines)
      * blank, so we don't need to draw it unless the mark is on or we're
      * not on the first page. */
     for (i = nlines; i > 0 && foo != NULL; i--) {
-	if ((i == nlines && direction == DOWN_DIR) || (i == 1 &&
-		direction == UP_DIR)) {
+	if ((i == nlines && direction == DOWNWARD) || (i == 1 &&
+		direction == UPWARD)) {
 	    if (do_redraw)
 		update_line(foo, (foo == openfile->current) ?
 			openfile->current_x : 0);
@@ -3102,6 +3110,7 @@ void edit_scroll(scroll_dir direction, ssize_t nlines)
 		openfile->current_x : 0);
 	foo = foo->next;
     }
+    compute_maxrows();
 }
 
 /* Update any lines between old_current and current that need to be
@@ -3119,13 +3128,10 @@ void edit_redraw(filestruct *old_current, size_t pww_save)
 	maxrows || openfile->current->lineno <
 	openfile->edittop->lineno || openfile->current->lineno >=
 	openfile->edittop->lineno + maxrows) {
-
 #ifdef DEBUG
-    fprintf(stderr, "edit_redraw(): line %lu was offscreen, oldcurrent = %lu edittop = %lu", openfile->current->lineno,
-                    old_current->lineno, openfile->edittop->lineno);
+	fprintf(stderr, "edit_redraw(): line %ld was offscreen, oldcurrent = %ld edittop = %ld",
+		(long)openfile->current->lineno, (long)old_current->lineno, (long)openfile->edittop->lineno);
 #endif
-	filestruct *old_edittop = openfile->edittop;
-	ssize_t nlines;
 
 #ifndef NANO_TINY
 	/* If the mark is on, update all the lines between old_current
@@ -3133,6 +3139,7 @@ void edit_redraw(filestruct *old_current, size_t pww_save)
 	 * whether we've scrolled up or down) of the edit window. */
 	if (openfile->mark_set) {
 	    ssize_t old_lineno;
+	    filestruct *old_edittop = openfile->edittop;
 
 	    if (old_edittop->lineno < openfile->edittop->lineno)
 		old_lineno = old_edittop->lineno;
@@ -3153,10 +3160,11 @@ void edit_redraw(filestruct *old_current, size_t pww_save)
 	}
 #endif /* !NANO_TINY */
 
-	/* Put edittop in range of current, get the difference in lines
-	 * between the original edittop and the current edittop, and
-	 * then restore the original edittop. */
-	edit_update(CENTER);
+	/* Make sure the current line is on the screen. */
+	if (ISSET(SMOOTH_SCROLL))
+	    edit_update(NONE);
+	else
+	    edit_update(CENTER);
 
 	/* Update old_current if we're not on the same page as
 	 * before. */
@@ -3211,19 +3219,18 @@ void edit_refresh(void)
     filestruct *foo;
     int nlines;
 
-    /* Figure out what maxrows should really be */
+    /* Figure out what maxrows should really be. */
     compute_maxrows();
 
     if (openfile->current->lineno < openfile->edittop->lineno ||
 	openfile->current->lineno >= openfile->edittop->lineno +
 	maxrows) {
-
 #ifdef DEBUG
-    fprintf(stderr, "edit_refresh(): line = %d, edittop %d + maxrows %d\n", openfile->current->lineno, openfile->edittop->lineno, maxrows);
+	fprintf(stderr, "edit_refresh(): line = %ld, edittop %ld + maxrows %d\n",
+		(long)openfile->current->lineno, (long)openfile->edittop->lineno, maxrows);
 #endif
 
-	/* Put the top line of the edit window in range of the current
-	 * line. */
+	/* Make sure the current line is on the screen. */
 	edit_update(CENTER);
     }
 
@@ -3275,12 +3282,14 @@ void edit_update(update_type location)
 
     for (; goal > 0 && foo->prev != NULL; goal--) {
 	foo = foo->prev;
+#ifndef NANO_TINY
 	if (ISSET(SOFTWRAP) && foo)
 	    goal -= strlenpt(foo->data) / COLS;
+#endif
     }
     openfile->edittop = foo;
 #ifdef DEBUG
-    fprintf(stderr, "edit_udpate(), setting edittop to lineno %d\n", openfile->edittop->lineno);
+    fprintf(stderr, "edit_update(): setting edittop to lineno %ld\n", (long)openfile->edittop->lineno);
 #endif
     compute_maxrows();
     edit_refresh_needed = TRUE;
@@ -3313,6 +3322,14 @@ void total_refresh(void)
  * portion of the window. */
 void display_main_list(void)
 {
+#ifndef DISABLE_COLOR
+    if (openfile->syntax
+	  && (openfile->syntax->formatter || openfile->syntax->linter))
+	set_lint_or_format_shortcuts();
+    else
+	set_spell_shortcuts();
+#endif
+
     bottombars(MMAIN);
 }
 
@@ -3374,17 +3391,16 @@ void do_cursorpos_void(void)
 
 void enable_nodelay(void)
 {
-   nodelay_mode = TRUE;
-   nodelay(edit, TRUE);
+    nodelay_mode = TRUE;
+    nodelay(edit, TRUE);
 }
 
 void disable_nodelay(void)
 {
-   nodelay_mode = FALSE;
-   nodelay(edit, FALSE);
+    nodelay_mode = FALSE;
+    nodelay(edit, FALSE);
 }
 
-
 /* Highlight the current word being replaced or spell checked.  We
  * expect word to have tabs and control characters expanded. */
 void do_replace_highlight(bool highlight, const char *word)
@@ -3404,7 +3420,7 @@ void do_replace_highlight(bool highlight, const char *word)
     wnoutrefresh(edit);
 
     if (highlight)
-	wattron(edit, reverse_attr);
+	wattron(edit, hilite_attribute);
 
     /* This is so we can show zero-length matches. */
     if (word_len == 0)
@@ -3416,12 +3432,12 @@ void do_replace_highlight(bool highlight, const char *word)
 	waddch(edit, '$');
 
     if (highlight)
-	wattroff(edit, reverse_attr);
+	wattroff(edit, hilite_attribute);
 }
 
-#ifdef NANO_EXTRA
-#define CREDIT_LEN 55
-#define XLCREDIT_LEN 8
+#ifndef DISABLE_EXTRA
+#define CREDIT_LEN 54
+#define XLCREDIT_LEN 9
 
 /* Easter egg: Display credits.  Assume nodelay(edit) and scrollok(edit)
  * are FALSE. */
@@ -3443,14 +3459,11 @@ void do_credits(void)
 	"Rocco Corsi",
 	"David Lawrence Ramsey",
 	"David Benbennick",
+	"Mark Majeres",
 	"Mike Frysinger",
+	"Benno Schulenberg",
 	"Ken Tyler",
 	"Sven Guckes",
-	NULL,				/* credits[15], handled below. */
-	"Pauli Virtanen",
-	"Daniele Medri",
-	"Clement Laforet",
-	"Tedi Heriyanto",
 	"Bill Soudan",
 	"Christian Weisgerber",
 	"Erik Andersen",
@@ -3460,6 +3473,7 @@ void do_credits(void)
 	"Albert Chin",
 	"",
 	NULL,				/* "Special thanks to:" */
+	"Monique, Brielle & Joseph",
 	"Plattsburgh State University",
 	"Benet Laboratories",
 	"Amy Allegretta",
@@ -3468,6 +3482,7 @@ void do_credits(void)
 	"Richard Kolb II",
 	NULL,				/* "The Free Software Foundation" */
 	"Linus Torvalds",
+	NULL,				/* "the many translators and the TP" */
 	NULL,				/* "For ncurses:" */
 	"Thomas Dickey",
 	"Pavel Curtis",
@@ -3479,7 +3494,7 @@ void do_credits(void)
 	"",
 	"",
 	"",
-	"(C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007",
+	"(C) 1999 - 2015",
 	"Free Software Foundation, Inc.",
 	"",
 	"",
@@ -3494,20 +3509,12 @@ void do_credits(void)
 	N_("Brought to you by:"),
 	N_("Special thanks to:"),
 	N_("The Free Software Foundation"),
+	N_("the many translators and the TP"),
 	N_("For ncurses:"),
 	N_("and anyone else we forgot..."),
 	N_("Thank you for using nano!")
     };
 
-    /* credits[15]: Make sure this name is displayed properly, since we
-     * can't dynamically assign it above, using Unicode 00F6 (Latin
-     * Small Letter O with Diaresis) if applicable. */
-    credits[15] =
-#ifdef ENABLE_UTF8
-	 using_utf8() ? "Florian K\xC3\xB6nig" :
-#endif
-	"Florian K\xF6nig";
-
     if (!old_more_space || !old_no_help) {
 	SET(MORE_SPACE);
 	SET(NO_HELP);
@@ -3584,4 +3591,4 @@ void do_credits(void)
 
     total_refresh();
 }
-#endif /* NANO_EXTRA */
+#endif /* !DISABLE_EXTRA */